Changeset 13136 for trunk

Timestamp:

03/18/12 21:55:05 (13 years ago)

Author:

tbretz

Message:

Made sure that the first automatic status request at connection also happens when the automatic updates are switched off; do not send a voltage set command when the voltages are already set.

File:

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

trunk/FACT++/src/biasctrl.cc

@@ -58 +58 @@
     uint16_t fSyncTime;
 
-    bool fIsInitializing;
+    int  fIsInitializing;
     bool fIsRamping;
     int  fWaitingForAnswer;
@@ -355 +355 @@
         {
             Message("Stream successfully synchronized.");
-            fIsInitializing = false;
+            fIsInitializing = 2;
 
             // Cancel sending of the next 0
@@ -524 +524 @@
         if (error==ba::error::basic_errors::operation_aborted)
         {
-            if (fIsInitializing)
+            if (fIsInitializing==1)
                 Warn("Synchronization aborted...");
-            else
-                Info("Synchronization successfull.");
+            // case 0 and 2 should not happen
             return;
         }
@@ -593 +592 @@
         fWrapCounter    = -1;
         fGlobalDacCmd   = -1;
-        fIsInitializing = true;
+        fIsInitializing =  1;
         fIsRamping      = false;
 
@@ -630 +629 @@
             return;
 
-        if (fUpdateTime==0)
+        if (fUpdateTime==0 && fIsInitializing!=2)
             return;
 
@@ -637 +636 @@
         else
             ReadAllChannels(true);
+
+        fIsInitializing = 0;
     }
 
@@ -712 +713 @@
         }
 
-        SetAllChannels(dac);
-
         if (identical)
             Info("Ramping: target values reached.");
+        else
+            SetAllChannels(dac);
 
         return !identical;