Changeset 14352

Timestamp:

08/13/12 09:52:43 (12 years ago)

Author:

tbretz

Message:

The subscription to the nominal bias voltage was missing. Make sure that in case of a bias crate calibration the first step is setting the correct voltage.

File:

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

trunk/FACT++/src/feedback.cc

@@ -266 +266 @@
         fDimDeviation.Update(vec);
 
-        if (!fOutputEnabled || fDimBias.state()!=BIAS::State::kVoltageOn)
-            return GetCurrentState();
-
-        // Trigger calibration
-        if (GetCurrentState()==Feedback::State::kCalibrating && fCursorTemp==2)
-        {
-            DimClient::sendCommandNB("BIAS_CONTROL/REQUEST_STATUS", NULL, 0);
-            return GetCurrentState();
+        // Warning: Here it is assumed that the ramp up and down is done properly
+        // within the time between two new temperatures and that the calibration
+        // is finished within that time.
+        if (!(GetCurrentState()==Feedback::State::kCalibrating && fCursorTemp==1 && fOutputEnabled && fDimBias.state()==BIAS::State::kVoltageOff))
+        {
+            if (!fOutputEnabled || fDimBias.state()!=BIAS::State::kVoltageOn)
+                return GetCurrentState();
+
+            // Trigger calibration
+            if (GetCurrentState()==Feedback::State::kCalibrating && fCursorTemp==2)
+            {
+                DimClient::sendCommandNB("BIAS_CONTROL/REQUEST_STATUS", NULL, 0);
+                return GetCurrentState();
+            }
         }
 
@@ -1217 +1223 @@
         Subscribe("BIAS_CONTROL/FEEDBACK_DATA")
             (bind(&StateMachineFeedback::HandleBiasData,    this, placeholders::_1));
+        Subscribe("BIAS_CONTROL/NOMINAL")
+            (bind(&StateMachineFeedback::HandleBiasNom,     this, placeholders::_1));
         Subscribe("FSC_CONTROL/TEMPERATURE")
             (bind(&StateMachineFeedback::HandleCameraTemp,  this, placeholders::_1));