Changeset 13455 for trunk

Timestamp:

04/26/12 10:54:49 (13 years ago)

Author:

tbretz

Message:

Make sure that the same time is distributed with the voltage and current service; send a flag which tells if the nominal and current values are identical as QoS

File:

• trunk/FACT++/src/biasctrl.cc (modified) (4 diffs)

trunk/FACT++/src/biasctrl.cc

@@ -69 +69 @@
     vector<int16_t>  fCurrent;     // Current in ADC units (12bit = 5mA)
 
-    virtual void UpdateA()
-    {
-    }
-
-    virtual void UpdateV()
+    virtual void UpdateAV()
+    {
+    }
+
+    virtual void UpdateV(const Time = Time())
     {
     }
@@ -373 +373 @@
         // Check if new values have been received
         if (cmd==kCmdRead || cmd==kCmdChannelSet || cmd==kExpertChannelSet)
-        {
-            UpdateV();
-            UpdateA();
-        }
+            UpdateAV();
 
         // ----- Take action depending on what is going on -----
@@ -1492 +1489 @@
     DimDescribedService fDimGapd;
 
-    void UpdateA()
-    {
+    void UpdateAV()
+    {
+        const Time now;
+        fDimCurrent.setTime(now);
         fDimCurrent.Update(fCurrent);
-    }
-
-    void UpdateV()
-    {
+
+        UpdateV(now);
+    }
+
+    void UpdateV(const Time now=Time())
+    {
+        const bool rc = !memcmp(fDacActual.data(), fDacTarget.data(), kNumChannels*2);
+
         vector<uint16_t> val(2*kNumChannels);
         memcpy(val.data(),              fDacActual.data(), kNumChannels*2);
         memcpy(val.data()+kNumChannels, fDacTarget.data(), kNumChannels*2);
+        fDimDac.setTime(now);
+        fDimDac.setQuality(rc);
         fDimDac.Update(val);
 
@@ -1507 +1512 @@
         for (float ch=0; ch<kNumChannels; ch++)
             volt[ch] = fDacActual[ch]*90./4096 - fChannelCalibration[ch];
+        fDimVolt.setTime(now);
+        fDimVolt.setQuality(rc);
         fDimVolt.Update(volt);
     }