Changeset 12590

Timestamp:

11/21/11 11:33:24 (13 years ago)

Author:

tbretz

Message:

Removed special fact status -- unified already in MCosy.cc

File:

• trunk/Cosy/gui/MGCosy.cc (modified) (2 diffs)

trunk/Cosy/gui/MGCosy.cc

@@ -1133 +1133 @@
     // 400 UPS charging
 
-#ifdef FACT
     SetLabelColor(fDkcReady1,     pdo3&0x00000001);
     SetLabelColor(fDkcReady2,     pdo3&0x00010000);
@@ -1142 +1141 @@
     SetLabelColor(fDkcBrake,     (pdo3&0x00400040)==0x00400040);
     SetLabelColor(fDkcPower,     (pdo3&0x00800080)==0x00800080);
-#else
-    SetLabelColor(fDkcReady1,       pdo3&0x0001);
-    SetLabelColor(fDkcReady2,       pdo3&0x0100);
-    SetLabelColor(fDkcEmergency,   (pdo3&0x0404)==0x0404);
-    SetLabelColor(fDkcPcMode,      (pdo3&0x1010)!=0x1010 && pdo3);
-    SetLabelColor(fDkcRF1,          pdo3&0x0020);
-    SetLabelColor(fDkcRF2,          pdo3&0x2000);
-    SetLabelColor(fDkcBrake,       (pdo3&0x4040)==0x4040);
-    SetLabelColor(fDkcPower,       (pdo3&0x8080)==0x8080);
-#endif
 
     EnableLabel(fArmed, armed);