Changeset 15103

Timestamp:

03/18/13 14:56:33 (12 years ago)

Author:

tbretz

Message:

Handle the 'Power Problem' a bit more accurate.

Location:

trunk/FACT++/src

Files:

• HeadersLid.h (modified) (1 diff)
• lidctrl.cc (modified) (9 diffs)

trunk/FACT++/src/HeadersLid.h

@@ -10 +10 @@
             kDisconnected = 1,
             kConnected,
+            kUnidentified,
             kInconsistent,
             kUnknown,
+            kPowerProblem,
             kClosed,
             kOpen,

trunk/FACT++/src/lidctrl.cc

@@ -166 +166 @@
         fRdfData = "";
 
-        if ((fLid1.status!="Open" && fLid1.status!="Closed" && fLid1.status!="Unknown") ||
-            (fLid2.status!="Open" && fLid2.status!="Closed" && fLid2.status!="Unknown"))
-        {
-            Warn("Lid status unknown ("+fLid1.status+"/"+fLid2.status+")");
-            PostClose(false);
-            return;
-        }
+        if ((fLid1.status!="Open" && fLid1.status!="Closed" && fLid1.status!="Power Problem" && fLid1.status!="Unknown") ||
+            (fLid2.status!="Open" && fLid2.status!="Closed" && fLid2.status!="Power Problem" && fLid2.status!="Unknown"))
+            Warn("Lid reported status unknown by lidctrl ("+fLid1.status+"/"+fLid2.status+")");
 
         fLastReport = Time();
@@ -358 +354 @@
             return State::kDisconnected;
 
+        // Unidentified state detected
+        if ((fLid1.status!="Open" && fLid1.status!="Closed" && fLid1.status!="Power Problem" && fLid1.status!="Unknown") ||
+            (fLid2.status!="Open" && fLid2.status!="Closed" && fLid2.status!="Power Problem" && fLid2.status!="Unknown"))
+            return State::kUnidentified;
+
+        // This is an assumption, but the best we have...
+        if (fLid1.status=="Closed" && fLid2.status=="Power Problem")
+            return State::kClosed;
+        if (fLid2.status=="Closed" && fLid1.status=="Power Problem")
+            return State::kClosed;
+        if (fLid1.status=="Open" && fLid2.status=="Power Problem")
+            return State::kOpen;
+        if (fLid2.status=="Open" && fLid1.status=="Power Problem")
+            return State::kOpen;
+
         // Inconsistency
         if (fLid1.status!=fLid2.status)
@@ -365 +376 @@
         if (fLid1.status=="Unknown")
             return State::kUnknown;
+
+        // Power Problem
+        if (fLid1.status=="Power Problem")
+            return State::kPowerProblem;
 
         // Closed
@@ -413 +428 @@
         DimData data;
 
+        if (l1.status=="Unknown")
+            data.status[0] = 3;
+        if (l1.status=="Power Problem")
+            data.status[0] = 2;
         if (l1.status=="Open")
             data.status[0] = 1;
@@ -418 +437 @@
             data.status[0] = 0;
 
+        if (l2.status=="Unknown")
+            data.status[1] = 3;
+        if (l2.status=="Power Problem")
+            data.status[1] = 2;
         if (l2.status=="Open")
             data.status[1] = 1;
@@ -429 +452 @@
         data.position[1] = l2.position;
 
+        fDim.setQuality(GetState());
         fDim.Update(data);
     }
@@ -544 +568 @@
                      "Connection established, but status still not known");
 
+        T::AddStateName(Lid::State::kUnidentified, "Unidentified",
+                     "At least one lid reported a state which could not be identified by lidctrl");
+
         T::AddStateName(Lid::State::kInconsistent, "Inconsistent",
                      "Both lids show different states");
@@ -549 +576 @@
         T::AddStateName(Lid::State::kUnknown, "Unknown",
                      "Arduino reports at least one lids in an unknown status");
+
+        T::AddStateName(Lid::State::kPowerProblem, "PowerProblem",
+                     "Arduino reports both lids to have a power problem (might also be that both are at the end switches)");
 
         T::AddStateName(Lid::State::kClosed, "Closed",
@@ -566 +596 @@
              "|verbosity[bool]:disable or enable verbosity for received data (yes/no), except dynamic data");
 
-        T::AddEvent("OPEN", Lid::State::kInconsistent, Lid::State::kUnknown, Lid::State::kClosed)
+        T::AddEvent("OPEN", Lid::State::kUnidentified, Lid::State::kInconsistent, Lid::State::kUnknown, Lid::State::kPowerProblem, Lid::State::kClosed)
             (bind(&StateMachineLidControl::Open, this))
             ("Open the lids");
 
-        T::AddEvent("CLOSE", Lid::State::kInconsistent, Lid::State::kUnknown, Lid::State::kOpen)
+        T::AddEvent("CLOSE", Lid::State::kUnidentified, Lid::State::kInconsistent, Lid::State::kUnknown, Lid::State::kPowerProblem, Lid::State::kOpen)
             (bind(&StateMachineLidControl::Close, this))
             ("Close the lids");