Changeset 13915

Timestamp:

05/26/12 14:45:53 (12 years ago)

Author:

tbretz

Message:

Moved state definition to HeadersrateControl.h

Location:

trunk/FACT++/src

Files:

• HeadersRateControl.h (added)
• ratecontrol.cc (modified) (7 diffs)

trunk/FACT++/src/ratecontrol.cc

@@ -16 +16 @@
 
 #include "HeadersFTM.h"
+#include "HeadersRateControl.h"
 
 namespace ba    = boost::asio;
@@ -33 +34 @@
 {
 private:
-    enum states_t
-    {
-        kStateDimNetworkNA = 1,
-        kStateDisconnected,
-        kStateConnecting,
-        kStateConnected,
-
-        kStateSettingGlobalThreshold,
-        kStateGlobalThresholdSet,
-
-        kStateInProgress,
-    };
-
     bool fTriggerOn;
 
@@ -351 +339 @@
         const FTM::DimTriggerRates &sdata = *static_cast<const FTM::DimTriggerRates*>(evt.GetData());
 
-        if (GetCurrentState()==kStateSettingGlobalThreshold)
+        if (GetCurrentState()==RateControl::State::kSettingGlobalThreshold)
             ProcessCamera(sdata);
 
-        if (GetCurrentState()==kStateInProgress)
+        if (GetCurrentState()==RateControl::State::kInProgress)
             ProcessPatches(sdata);
 
@@ -365 +353 @@
         {
             Info("Trigger not switched on... CALIBRATE command ignored.");
-            return kStateGlobalThresholdSet;
+            return RateControl::State::kGlobalThresholdSet;
         }
 
@@ -382 +370 @@
         Info(out);
 
-        return kStateSettingGlobalThreshold;
+        return RateControl::State::kSettingGlobalThreshold;
     }
 
@@ -458 +446 @@
 
         if (!fDim.online())
-            return kStateDimNetworkNA;
+            return RateControl::State::kDimNetworkNA;
 
         // All subsystems are not connected
-        if (fDimFTM.state()<FTM::kConnected)
-            return kStateDisconnected;
-
-        if (GetCurrentState()==kStateSettingGlobalThreshold)
+        if (fDimFTM.state()<FTM::State::kConnected)
+            return RateControl::State::kDisconnected;
+
+        if (GetCurrentState()==RateControl::State::kSettingGlobalThreshold)
         {
             if (fTriggerRate<0 || fTriggerRate>fTargetRate)
-                return kStateSettingGlobalThreshold;
-
-            return kStateGlobalThresholdSet;
-        }
-
-        if (GetCurrentState()==kStateGlobalThresholdSet)
+                return RateControl::State::kSettingGlobalThreshold;
+
+            return RateControl::State::kGlobalThresholdSet;
+        }
+
+        if (GetCurrentState()==RateControl::State::kGlobalThresholdSet)
         {
             if (!fTriggerOn)
-                return kStateGlobalThresholdSet;
-            //return kStateInProgress;
+                return RateControl::State::kGlobalThresholdSet;
+            //return RateControl::State::kInProgress;
         }
 
         // At least one subsystem is not connected
         //        if (fDimFTM.state()>=FTM::kConnected)
-        return fTriggerOn && fEnabled && fDimRS.state()<5 ? kStateInProgress : kStateConnected;
+        return fTriggerOn && fEnabled && fDimRS.state()<5 ? RateControl::State::kInProgress : RateControl::State::kConnected;
     }
 
@@ -507 +495 @@
 
         // State names
-        AddStateName(kStateDimNetworkNA, "DimNetworkNotAvailable",
+        AddStateName(RateControl::State::kDimNetworkNA, "DimNetworkNotAvailable",
                      "The Dim DNS is not reachable.");
 
-        AddStateName(kStateDisconnected, "Disconnected",
+        AddStateName(RateControl::State::kDisconnected, "Disconnected",
                      "The Dim DNS is reachable, but the required subsystems are not available.");
 
-        AddStateName(kStateConnected, "Connected",
+        AddStateName(RateControl::State::kConnected, "Connected",
                      "All needed subsystems are connected to their hardware, no action is performed.");
 
-        AddStateName(kStateSettingGlobalThreshold, "Calibrating", "");
-        AddStateName(kStateGlobalThresholdSet, "GlobalThresholdSet", "");
-
-        AddStateName(kStateInProgress, "InProgress",
+        AddStateName(RateControl::State::kSettingGlobalThreshold, "Calibrating", "");
+        AddStateName(RateControl::State::kGlobalThresholdSet, "GlobalThresholdSet", "");
+
+        AddStateName(RateControl::State::kInProgress, "InProgress",
                      "Rate scan in progress.");