Changeset 14139 for trunk

Timestamp:

06/09/12 22:01:53 (12 years ago)

Author:

tbretz

Message:

Display a drive error not just by a red background; replaced rc.index by state(); fixed a problem with the line break after the drive informations

File:

• trunk/FACT++/src/smartfact.cc (modified) (4 diffs)

trunk/FACT++/src/smartfact.cc

@@ -2119 +2119 @@
             const State rc = fDimDriveControl.description();
             string col = HTML::kGreen;
-            if (rc.index==Drive::State::kMoving) // Moving
+            if (fDimDriveControl.state()==Drive::State::kMoving) // Moving
                 col = HTML::kBlue;
-            if (rc.index==Drive::State::kArmed) // Armed
+            if (fDimDriveControl.state()==Drive::State::kArmed) // Armed
                 col = HTML::kWhite;
-            if (rc.index==Drive::State::kTracking) // Tracking
+            if (fDimDriveControl.state()==Drive::State::kTracking) // Tracking
             {
                 if (dev>60)   // ~1.5mm
@@ -2130 +2130 @@
                     col = HTML::kRed;
             }
-            if (rc.index==0x100)
+            if (fDimDriveControl.state()==0x100)
                 col = HTML::kRed;
             out << col << '\t';
@@ -2150 +2150 @@
         else
             out << HTML::kWhite << '\t';
+
         if (fSun.time.IsValid() && fMoon.time.IsValid())
         {
@@ -2165 +2166 @@
                         out << " [" << fMoon.disk << "%]";
                 }
-            out << '\n';
-        }
+        }
+
+        if (fDimDNS.online() && fDimDriveControl.state()==0x100)   // Armed, Moving, Tracking
+            out << " [ERR]";
+        out << '\n';
 
         // ------------------- FSC ------------------