Changeset 18364 for trunk/FACT++

Timestamp:

11/07/15 18:42:15 (9 years ago)

Author:

tbretz

Message:

Updated handling of drive states.

File:

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

trunk/FACT++/src/smartfact.cc

@@ -2740 +2740 @@
 
         // ------------------ Drive -----------------
-        if (fDimDNS.online() && fDimDriveControl.state()>=Drive::State::kArmed)   // Armed, Moving, Tracking, OnTrack, Error
+        if (fDimDNS.online() && fDimDriveControl.state()>=Drive::State::kInitialized)   // Armed, Moving, Tracking, OnTrack, Error
         {
             const uint32_t dev = !fDriveControlTrackingDevHist.empty() ? round(fDriveControlTrackingDevHist.back()) : 0;
             const State rc = fDimDriveControl.description();
             string col = HTML::kGreen;
-            if (fDimDriveControl.state()==Drive::State::kMoving) // Moving
+            if (fDimDriveControl.state()==Drive::State::kInitialized)  // Armed
+                col = HTML::kWhite;
+            if (fDimDriveControl.state()>Drive::State::kInitialized && // Moving
+                fDimDriveControl.state()<Drive::State::kTracking)
                 col = HTML::kBlue;
-            if (fDimDriveControl.state()==Drive::State::kArmed) // Armed
-                col = HTML::kWhite;
-            if (fDimDriveControl.state()==Drive::State::kTracking || fDimDriveControl.state()==Drive::State::kOnTrack) // Tracking
+            if (fDimDriveControl.state()==Drive::State::kTracking ||   // Tracking
+                fDimDriveControl.state()==Drive::State::kOnTrack) 
             {
                 if (dev>60)   // ~1.5mm
@@ -2756 +2758 @@
                     col = HTML::kRed;
             }
-            if (fDimDriveControl.state()==0x100)
+            if (fDimDriveControl.state()>0xff)
                 col = HTML::kRed;
             out << col << '\t';
@@ -2764 +2766 @@
             out << fDriveControlPointingZd  << "&deg;";
             out << setprecision(2);
-            if (fDimDriveControl.state()==Drive::State::kTracking || fDimDriveControl.state()==Drive::State::kOnTrack)
+            if (fDimDriveControl.state()==Drive::State::kTracking ||
+                fDimDriveControl.state()==Drive::State::kOnTrack)      // Tracking
             {
                 out << " &plusmn; " << dev << '"';
@@ -2770 +2773 @@
                     out << " [" << fDriveControlSourceName  << ']';
             }
-            if (fDimDriveControl.state()==Drive::State::kMoving)
+            if (fDimDriveControl.state()>Drive::State::kInitialized && // Moving
+                fDimDriveControl.state()<Drive::State::kTracking)
                 out << " &#10227;";
             out << setprecision(3);
@@ -2782 +2786 @@
             {
                 out << " &#9788;";
-                if (fDimDriveControl.state()<Drive::State::kArmed)
+                if (fDimDriveControl.state()<Drive::State::kInitialized)
                     out << " [" << fSun.fSetCivil.MinutesTo() << "&darr;]";
             }
@@ -2789 +2793 @@
                 {
                     out << " &#9790;";
-                    if (fDimDriveControl.state()<Drive::State::kArmed)
+                    if (fDimDriveControl.state()<Drive::State::kInitialized)
                         out << " [" << fMoon.disk << "%]";
                 }
         }
-        if (fDimDNS.online() && fDimDriveControl.state()==0x100)
+        if (fDimDNS.online() && fDimDriveControl.state()>0xff)
             out << " <ERR>";
         if (fDimDNS.online() && fDimDriveControl.state()==Drive::State::kLocked)