Changeset 12279

Timestamp:

10/26/11 19:42:19 (13 years ago)

Author:

tbretz

Message:

Added some more output in case the previous answer was not yet recived; reset the ramping state when a new connection was established; do not reset voltages if we were previously connected.

File:

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

trunk/FACT++/src/biasctrl.cc

@@ -60 +60 @@
     bool fIsInitializing;
     bool fIsRamping;
-    bool fWaitingForAnswer;
+    int  fWaitingForAnswer;
 
     vector<uint64_t> fCounter;
@@ -505 +505 @@
         case kCmdRead:
             HandleReceivedData(fBuffer, bytes_received, command, send_counter);
-            fWaitingForAnswer = false;
+            fWaitingForAnswer = -1;
             return;
 
@@ -578 +578 @@
     void ConnectionEstablished()
     {
+        // We connect for the first time or haven't received
+        // a valid warp counter yet... this procedure also sets
+        // our volatges to 0 if we have connected but never received
+        // any answer.
+        if (fWrapCounter<0)
+        {
+            fVolt.assign(   kNumChannels, 0);
+            fVoltRef.assign(kNumChannels, 0);
+            fVoltCmd.assign(kNumChannels, 0);
+        }
+
         // Reset everything....
         fSendCounter    = -1;
@@ -583 +594 @@
         fGlobalVoltCmd  = -1;
         fIsInitializing = true;
-
-        fVolt.assign(   kNumChannels, 0);
-        fVoltRef.assign(kNumChannels, 0);
-        fVoltCmd.assign(kNumChannels, 0);
+        fIsRamping      = false;
 
         // Send a single 0 (and possible two consecutive 0's
@@ -592 +600 @@
         PostMessage("\0", 1);
         AsyncRead(ba::buffer(fBuffer, 3), kSynchronize, 0);//++fSendCounter);
-        fWaitingForAnswer = true;
+        fWaitingForAnswer = kSynchronize;
 
         // Wait for some time before sending the next 0
@@ -660 +668 @@
 
         if (special)
-            fWaitingForAnswer = true;
+            fWaitingForAnswer = special ? kResetChannels : kCmdChannelSet;
     }
 
@@ -764 +772 @@
         //fRefCurrent(kNumChannels),
         fPresent(kNumBoards),
+        fWrapCounter(-1),
         fRampStep(-1),
         fRampTime(-1),
@@ -769 +778 @@
         fSyncTime(333),
         fIsRamping(false),
-        fWaitingForAnswer(false),
+        fWaitingForAnswer(-1),
         fCounter(8),
         fVolt(kNumChannels),
@@ -781 +790 @@
     void OverCurrentReset()
     {
-        if (fWaitingForAnswer)
-        {
-            Error("Answer on last command not yet received.");
+        if (fWaitingForAnswer>=0)
+        {
+            ostringstream msg;
+            msg << "Answer on last command (id=" << fWaitingForAnswer << ") not yet received.";
+            Error(msg);
             return;
         }
@@ -803 +814 @@
     void ReadAllChannels(bool special = false)
     {
-        if (!special && fWaitingForAnswer)
-        {
-            Error("Answer on last command not yet received.");
+        if (!special && fWaitingForAnswer>=0)
+        {
+            ostringstream msg;
+            msg << "Answer on last command (id=" << fWaitingForAnswer << ") not yet received.";
+            Error(msg);
             return;
         }
@@ -825 +838 @@
 
         if (!special)
-            fWaitingForAnswer = true;
+            fWaitingForAnswer = special ? kUpdate : kCmdRead;
     }
 
@@ -1107 +1120 @@
     void ExpertReset(bool expert_mode=true)
     {
-        if (fWaitingForAnswer)
-        {
-            Error("Answer on last command not yet received.");
+        if (fWaitingForAnswer>=0)
+        {
+            ostringstream msg;
+            msg << "Answer on last command (id=" << fWaitingForAnswer << ") not yet received.";
+            Error(msg);
             return;
         }
@@ -1118 +1133 @@
         PostMessage(GetCmd(kCmdReset));
         AsyncRead(ba::buffer(fBuffer, 3), kCmdReset, ++fSendCounter);
-        fWaitingForAnswer = true;
+        fWaitingForAnswer = kCmdReset;
     }
 
@@ -1124 +1139 @@
     bool ExpertChannelSetDac(uint16_t ch, uint16_t dac)
     {
-        if (fWaitingForAnswer)
-        {
-            Error("Answer on last command not yet received.");
+        if (fWaitingForAnswer>=0)
+        {
+            ostringstream msg;
+            msg << "Answer on last command (id=" << fWaitingForAnswer << ") not yet received.";
+            Error(msg);
             return false;
         }
@@ -1142 +1159 @@
         PostMessage(GetCmd(kCmdChannelSet, ch, dac));
         AsyncRead(ba::buffer(fBuffer, 3), kExpertChannelSet|(ch<<8), ++fSendCounter);
-        fWaitingForAnswer = true;
+        fWaitingForAnswer = kExpertChannelSet|(ch<<8);
 
         return true;
@@ -1154 +1171 @@
     bool ExpertGlobalSetDac(uint16_t dac)
     {
-        if (fWaitingForAnswer)
-        {
-            Error("Answer on last command not yet received.");
+        if (fWaitingForAnswer>=0)
+        {
+            ostringstream msg;
+            msg << "Answer on last command (id=" << fWaitingForAnswer << ") not yet received.";
+            Error(msg);
             return false;
         }
@@ -1177 +1196 @@
         PostMessage(GetCmd(kCmdGlobalSet, 0, dac));
         AsyncRead(ba::buffer(fBuffer, 3), kCmdGlobalSet, ++fSendCounter);
-        fWaitingForAnswer = true;
+        fWaitingForAnswer = kCmdGlobalSet;
 
         return true;