Changeset 17644 for trunk

Timestamp:

04/03/14 16:07:02 (10 years ago)

Author:

tbretz

Message:

Implemented the auto pause command, the pause and resume command and a Paused state.

Location:

trunk/FACT++/src

Files:

• HeadersRateScan.h (modified) (1 diff)
• ratescan.cc (modified) (9 diffs)

trunk/FACT++/src/HeadersRateScan.h

@@ -14 +14 @@
             kConfiguring,
             kInProgress,
+            kPaused,
         };
     }

trunk/FACT++/src/ratescan.cc

@@ -37 +37 @@
     DimDescribedService fDimProc;
 
+    bool fAutoPause;
+
     int fCounter;
     int fCounterMax;
@@ -93 +95 @@
             return GetCurrentState();
 
-        if (GetCurrentState()!=RateScan::State::kInProgress)
+        if (GetCurrentState()<RateScan::State::kInProgress)
             return GetCurrentState();
 
@@ -100 +102 @@
         if (++fCounter<0)
             return GetCurrentState();
+
+        if (GetCurrentState()==RateScan::State::kPaused)
+            fCounter=0;
 
         if (fCounter==0)
@@ -285 +290 @@
         Message(msg);
 
-        return RateScan::State::kInProgress;
+        if (!fAutoPause)
+            return RateScan::State::kInProgress;
+
+        fAutoPause = false;
+
+        return RateScan::State::kPaused;
     }
 
     int StopRateScan()
     {
-        if (GetCurrentState()!=RateScan::State::kConfiguring && GetCurrentState()!=RateScan::State::kInProgress)
+        if (GetCurrentState()<RateScan::State::kConfiguring)
             return GetCurrentState();
 
@@ -364 +374 @@
 
         return GetCurrentState();
+    }
+
+    int TriggerAutoPause(const EventImp &evt)
+    {
+        fAutoPause = true;
+        return GetCurrentState();
+    }
+
+    int Pause()
+    {
+        return RateScan::State::kPaused;
+    }
+
+    int Resume()
+    {
+        return RateScan::State::kInProgress;
     }
 
@@ -398 +424 @@
                  "|max[DAC]:Value at which scan will end"
                  "|step[DAC]:Step size for scan"),
-        fThreshold(-1), fReference(kCamera), fReferenceIdx(0)
+        fAutoPause(false), fThreshold(-1), fReference(kCamera), fReferenceIdx(0)
     {
         // ba::io_service::work is a kind of keep_alive for the loop.
@@ -430 +456 @@
                      "Rate scan in progress.");
 
+        AddStateName(RateScan::State::kPaused, "Paused",
+                     "Rate scan in progress but paused.");
+
         AddEvent("START_THRESHOLD_SCAN", "I:3", RateScan::State::kConnected)
             (bind(&StateMachineRateScan::StartRateScan, this, placeholders::_1, "SET_THRESHOLD"))
@@ -444 +473 @@
              "|step[int]:Single step in DAC counts");
 
-        AddEvent("CHANGE_STEP_SIZE", "I:1", RateScan::State::kInProgress)
+        AddEvent("CHANGE_STEP_SIZE", "I:1", RateScan::State::kPaused, RateScan::State::kInProgress)
             (bind(&StateMachineRateScan::ChangeStepSize, this, placeholders::_1))
             ("Change the step size during a ratescan in progress"
              "|step[int]:Single step in DAC counts");
 
-        AddEvent("CHANGE_MAXIMUM", "I:1", RateScan::State::kInProgress)
+        AddEvent("CHANGE_MAXIMUM", "I:1", RateScan::State::kPaused, RateScan::State::kInProgress)
             (bind(&StateMachineRateScan::ChangeMaximum, this, placeholders::_1))
             ("Change the maximum limit during a ratescan in progress"
              "|max[int]:Limiting value in DAC counts");
 
-        AddEvent("STOP", RateScan::State::kConfiguring, RateScan::State::kInProgress)
+        AddEvent("STOP", RateScan::State::kConfiguring, RateScan::State::kPaused, RateScan::State::kInProgress)
             (bind(&StateMachineRateScan::StopRateScan, this))
             ("Stop a ratescan in progress");
@@ -469 +498 @@
             ("Use the given patch trigger-rate as reference for the reolution"
              "|patch[idx]:Index of the patch (360*crate+36*board+patch)");
+
+        AddEvent("TRIGGER_AUTO_PAUSE", RateScan::State::kDimNetworkNA, RateScan::State::kDisconnected, RateScan::State::kConnected)
+            (bind(&StateMachineRateScan::TriggerAutoPause, this, placeholders::_1))
+            ("Enable an automatic pause for the next ratescan, after it got configured.");
+
+        AddEvent("PAUSE", RateScan::State::kInProgress)
+            (bind(&StateMachineRateScan::Pause, this))
+            ("Pause a ratescan in progress");
+        AddEvent("RESUME", RateScan::State::kPaused)
+            (bind(&StateMachineRateScan::Resume, this))
+            ("Resume a paused ratescan");
 
         AddEvent("PRINT")