Changeset 13189 for trunk

Timestamp:

03/23/12 09:01:05 (13 years ago)

Author:

tbretz

Message:

Delay setting new volatges during current requests.

File:

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

trunk/FACT++/src/biasctrl.cc

@@ -664 +664 @@
         fSendCounter += kNumChannels;
 
-        if (fWaitingForAnswer>=0)
-        {
-            ostringstream msg;
-            msg << "SetAllChannels while waiting for answer to last command (id=" << fWaitingForAnswer << ")";
-            Warn(msg);
-        }
-
         PostMessage(data);
         AsyncRead(ba::buffer(special ? fBuffer : fBufferRamp, kNumChannels*3),
@@ -714 +707 @@
 
         if (identical)
+        {
             Info("Ramping: target values reached.");
-        else
+            return false;
+        }
+
+        if (fWaitingForAnswer<0)
+        {
             SetAllChannels(dac);
-
-        return !identical;
+            return true;
+        }
+
+        ostringstream msg;
+        msg << "RampOneStep while waiting for answer to last command (id=" << fWaitingForAnswer << ")... ramp step delayed.";
+        Warn(msg);
+
+        // Delay ramping
+        ScheduleRampStep();
+        return true;
     }
 
@@ -737 +743 @@
 
             PostClose(false);
+            fIsRamping = false;
             return;
         }
@@ -743 +750 @@
         {
             Warn("Ramping in progress, but disconnected.");
+            fIsRamping = false;
             return;
         }