Changeset 16837

Timestamp:

06/14/13 11:06:18 (11 years ago)

Author:

tbretz

Message:

Added 'Overcurrent' as possible status.

Location:

trunk/FACT++/src

Files:

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

trunk/FACT++/src/HeadersLid.h

@@ -14 +14 @@
             kUnknown,
             kPowerProblem,
+            kOvercurrent,
             kClosed,
             kOpen,

trunk/FACT++/src/lidctrl.cc

@@ -166 +166 @@
         fRdfData = "";
 
-        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"))
+        if ((fLid1.status!="Open" && fLid1.status!="Closed" && fLid1.status!="Power Problem" && fLid1.status!="Unknown" && fLid1.status!="Overcurrent") ||
+            (fLid2.status!="Open" && fLid2.status!="Closed" && fLid2.status!="Power Problem" && fLid2.status!="Unknown" && fLid1.status!="Overcurrent"))
             Warn("Lid reported status unknown by lidctrl ("+fLid1.status+"/"+fLid2.status+")");
 
@@ -355 +355 @@
 
         // Unidentified state detected
-        if ((!fLid1.status.empty() && fLid1.status!="Open" && fLid1.status!="Closed" && fLid1.status!="Power Problem" && fLid1.status!="Unknown") ||
-            (!fLid2.status.empty() && fLid2.status!="Open" && fLid2.status!="Closed" && fLid2.status!="Power Problem" && fLid2.status!="Unknown"))
+        if ((!fLid1.status.empty() && fLid1.status!="Open" && fLid1.status!="Closed" && fLid1.status!="Power Problem" && fLid1.status!="Unknown" && fLid1.status!="Overcurrent") ||
+            (!fLid2.status.empty() && fLid2.status!="Open" && fLid2.status!="Closed" && fLid2.status!="Power Problem" && fLid2.status!="Unknown" && fLid2.status!="Overcurrent"))
             return State::kUnidentified;
 
@@ -380 +380 @@
         if (fLid1.status=="Power Problem")
             return State::kPowerProblem;
+
+        // Overcurrent
+        if (fLid1.status=="Overcurrent")
+            return State::kOvercurrent;
 
         // Closed