Changeset 13137 for trunk

Timestamp:

03/18/12 22:59:13 (13 years ago)

Author:

tbretz

Message:

Ensure that the calibration starts now that the biasctrl doesn't sent a voltage set request (which would return the currents) anymore when the voltage is already set.

File:

• trunk/FACT++/src/feedback.cc (modified) (5 diffs)

trunk/FACT++/src/feedback.cc

@@ -105 +105 @@
      int64_t fCursorCur;
     uint64_t fCursorAmpl;
+    uint64_t fCursorTemp;
 
     Time fBiasLast;
@@ -204 +205 @@
             return;
 
+        // Trigger calibration
+        if (GetCurrentState()==kStateCalibrating && fCursorTemp==1)
+        {
+            DimClient::sendCommandNB("BIAS_CONTROL/REQUEST_STATUS", NULL, 0);
+            return;
+        }
+
         ostringstream msg;
         msg << setprecision(4) << "Sending new absolute offset (" << diff << "V+" << avg << "V) to biasctrl.";
@@ -210 +218 @@
         DimClient::sendCommandNB((char*)"BIAS_CONTROL/SET_GAPD_REFERENCE_OFFSET",
                                  (void*)&diff, sizeof(float));
+
+        fCursorTemp++;
     }
 
@@ -753 +763 @@
         fCursorAmpl = 0;
         fCursorCur  = 0;
+        fCursorTemp = 0;
 
         fStartTime = Time();
@@ -912 +923 @@
         fControlType = kTemp;
         fCursorCur = -10;
+        fCursorTemp = 0;
         fCurrentsAvg.assign(416, 0);
         fCurrentsRms.assign(416, 0);