Changeset 19381 for trunk/FACT++

Timestamp:

11/11/18 19:23:40 (6 years ago)

Author:

tbretz

Message:

Added PRINT command and --client option. No need anymore to skip the TM channel.

File:

• trunk/FACT++/src/evtserver.cc (modified) (8 diffs)

trunk/FACT++/src/evtserver.cc

@@ -33 +33 @@
 class StateMachineEventServer : public StateMachineDim
 {
+public:
+    static bool fIsServer;
+
+private:
+
     DimDescribedState fDimFadControl;
 
@@ -53 +58 @@
 
     Time fTimer;
-
-private:
 
     int Execute()
@@ -154 +157 @@
                 fMax[i] /= 1000;
 
-            for (int i=8; i<1440; i+=9)
-                fMax[i] = fMax[i-2];
+            //for (int i=8; i<1440; i+=9)
+            //    fMax[i] = fMax[i-2];
 
             // construct output
@@ -240 +243 @@
     }
 
+    int Print() const
+    {
+        Out() << fDimFadControl << endl;
+        return GetCurrentState();
+    }
+
 
 public:
-    StateMachineEventServer(ostream &out=cout) : StateMachineDim(out, "EVENT_SERVER"),
+    StateMachineEventServer(ostream &out=cout) : StateMachineDim(out, fIsServer?"EVENT_SERVER":""),
         fDimFadControl("FAD_CONTROL"), fStartDate(0), fNight(0), fIn(0), fMax(1440)
 
@@ -269 +278 @@
             (bind(&StateMachineEventServer::StopServer, this))
             ("Stop serving the smartfact camera file");
+
+        AddEvent("PRINT")
+            (bind(&StateMachineEventServer::Print, this))
+            ("Print current status");
     }
     ~StateMachineEventServer()
@@ -285 +298 @@
 };
 
+bool StateMachineEventServer::fIsServer = false;
+
 // ------------------------------------------------------------------------
 
@@ -292 +307 @@
 int RunShell(Configuration &conf)
 {
+    StateMachineEventServer::fIsServer = !conf.Get<bool>("client");
     return Main::execute<T, StateMachineEventServer>(conf);
 }
@@ -302 +318 @@
         ("out-path", var<string>("www/smartfact/data"), "Path where the output camera file should be written.")
         ("interval", var<uint32_t>(5000), "Interval of updates in milliseconds.")
+        ("client",   po_bool(false), "For a standalone client choose this option.")
         ;