Changeset 14680

Timestamp:

11/21/12 22:43:38 (12 years ago)

Author:

tbretz

Message:

Fixed the timing around the movement; a conditional sign in Execute was wrong; added descriptions for OPEN and CLOSE

File:

• trunk/FACT++/src/lidctrl.cc (modified) (7 diffs)

trunk/FACT++/src/lidctrl.cc

@@ -328 +328 @@
     {
         fNextCommand = post;
+
+        fLid1.status = "";
+        fLid2.status = "";
         //PostRequest("POST", post);
     }
@@ -335 +338 @@
         PostRequest("POST", fNextCommand);
         fNextCommand = "";
-
-        fLid1.status = "";
-        fLid2.status = "";
 
         fKeepAlive.expires_from_now(boost::posix_time::seconds(fInterval));
@@ -441 +441 @@
     Time fLastCommand;
 
+    uint16_t fTimeToMove;
+
     bool CheckEventSize(size_t has, const char *name, size_t size)
     {
@@ -513 +515 @@
         if (T::GetCurrentState()==Lid::State::kMoving &&
             (rc==Lid::State::kConnected || rc==Lid::State::kDisconnected) &&
-            fLastCommand+boost::posix_time::seconds(6*fLid.GetInterval()) < Time())
+            fLastCommand+boost::posix_time::seconds(fTimeToMove+fLid.GetInterval()) > Time())
+        {
             return Lid::State::kMoving;
+        }
 
         return rc==Lid::State::kConnected ? T::GetCurrentState() : rc;
@@ -562 +566 @@
 
         T::AddEvent("OPEN", Lid::State::kInconsistent, Lid::State::kClosed)
-            (bind(&StateMachineLidControl::Open, this));
+            (bind(&StateMachineLidControl::Open, this))
+            ("Open the lids");
 
         T::AddEvent("CLOSE", Lid::State::kInconsistent, Lid::State::kOpen)
-            (bind(&StateMachineLidControl::Close, this));
+            (bind(&StateMachineLidControl::Close, this))
+            ("Close the lids");
 
         T::AddEvent("POST", "C")
@@ -581 +587 @@
         fLid.SetEndpoint(conf.Get<string>("addr"));
         fLid.StartConnect();
+
+        fTimeToMove = conf.Get<uint16_t>("time-to-move");
 
         return -1;
@@ -606 +614 @@
         ("quiet,q",    po_bool(true),  "Disable printing contents of all received messages (except dynamic data) in clear text.")
         ("interval,i", var<uint16_t>(5), "Interval between two updates on the server in seconds")
+        ("time-to-move", var<uint16_t>(20), "Expected minimum time the lid taks to open/close")
         ("debug-tx",   po_bool(), "Enable debugging of ethernet transmission.")
         ;