Changeset 11196

Timestamp:

06/27/11 15:03:03 (13 years ago)

Author:

tbretz

Message:

Changed the FAD Led status to support also an 'all diconnected but switched on' state.

File:

• trunk/FACT++/gui/FactGui.h (modified) (3 diffs)

trunk/FACT++/gui/FactGui.h

@@ -1054 +1054 @@
         for (int i=0; i<40; i++)
         {
-            switch (ptr[i])
+            const uint8_t stat1 = ptr[i]&3;
+            const uint8_t stat2 = ptr[i]>>3;
+
+            if (stat1==0 && stat2==0)
             {
-            case 0:  SetLedColor(fFadLED[i], kLedGray,   d.time); break;
-            case 9:  SetLedColor(fFadLED[i], kLedGreen,  d.time); break;
-            default: SetLedColor(fFadLED[i], kLedOrange, d.time);
+                SetLedColor(fFadLED[i], kLedGray,   d.time);
+                continue;
             }
+            if (stat1==2 && stat2==8)
+            {
+                SetLedColor(fFadLED[i], kLedGreen,  d.time);
+                continue;
+            }
+
+            if (stat1==1 && stat2==1)
+                SetLedColor(fFadLED[i], kLedRed, d.time);
+            else
+                SetLedColor(fFadLED[i], kLedOrange, d.time);
         }
 
@@ -1066 +1078 @@
         fFadConnections.assign(ptr, ptr+40);
     }
-
+/*
     template<typename T>
         bool CheckConsistency(const T *v)
     {
         for (int i=1; i<40; i++)
-            if (fFadConnections[i]==9 && v[i]!=v[0])
+            if (fFadConnections[i]==10 && v[i]!=v[0])
                 return false;
 
@@ -1086 +1098 @@
         return T();
     }
-
+  */
     void handleFadFwVersion(const DimData &d)
     {