Changeset 13914 for trunk

Timestamp:

05/26/12 14:33:13 (12 years ago)

Author:

tbretz

Message:

Moved stated to namespace FSC::State

Location:

trunk/FACT++/src

Files:

• HeadersFSC.h (added)
• fscctrl.cc (modified) (7 diffs)

trunk/FACT++/src/fscctrl.cc

@@ -13 +13 @@
 #include "tools.h"
 
+#include "HeadersState.h"
+
 namespace ba    = boost::asio;
 namespace bs    = boost::system;
@@ -18 +20 @@
 
 using namespace std;
+using namespace FSC;
 
 // ------------------------------------------------------------------------
@@ -672 +675 @@
                     "|T_sens[deg C]:Sensor compartment temperatures"
                     "|T_crate[deg C]:Temperatures crate 0 (back/front), 1 (b/f), 2 (b/f), 3 (b/f)"
-                     "|T_ps[deg C]:Temp power supplies crate 0 (back/front), 1, 2, 3"
+                    "|T_ps[deg C]:Temp power supplies crate 0 (back/front), 1, 2, 3"
                     "|T_aux[deg C]:Auxiliary power supply temperatures FTM (top/bottom), FSC (t/b)"
                     "|T_back[deg C]:FTM backpanel temperatures FTM (top/bottom), FSC (top/bottom)"
@@ -715 +718 @@
 class StateMachineFSC : public T, public ba::io_service, public ba::io_service::work
 {
-    int Wrap(boost::function<void()> f)
-    {
-        f();
-        return T::GetCurrentState();
-    }
-
-    function<int(const EventImp &)> Wrapper(function<void()> func)
-    {
-        return bind(&StateMachineFSC::Wrap, this, func);
-    }
-
 private:
     S fFSC;
-
-    enum states_t
-    {
-        kStateDisconnected = 1,
-        kStateConnected    = 2,
-    };
 
     int Disconnect()
@@ -776 +762 @@
         poll_one();
 
-        return fFSC.IsConnected() ? kStateConnected : kStateDisconnected;
+        return fFSC.IsConnected() ? State::kConnected : State::kDisconnected;
     }
 
@@ -823 +809 @@
 
         // State names
-        AddStateName(kStateDisconnected, "Disconnected",
+        T::AddStateName(State::kDisconnected, "Disconnected",
                      "FSC board not connected via ethernet.");
 
-        AddStateName(kStateConnected, "Connected",
+        T::AddStateName(State::kConnected, "Connected",
                      "Ethernet connection to FSC established.");
 
@@ -841 +827 @@
 
         // Conenction commands
-        AddEvent("DISCONNECT", kStateConnected)
+        T::AddEvent("DISCONNECT", State::kConnected)
             (bind(&StateMachineFSC::Disconnect, this))
             ("disconnect from ethernet");
 
-        AddEvent("RECONNECT", "O", kStateDisconnected, kStateConnected)
+        T::AddEvent("RECONNECT", "O", State::kDisconnected, State::kConnected)
             (bind(&StateMachineFSC::Reconnect, this, placeholders::_1))
             ("(Re)connect ethernet connection to FTM, a new address can be given"