Changeset 10033

Timestamp:

10/22/10 11:11:49 (14 years ago)

Author:

tbretz

Message:

Get drive status from pdo3 and fixed a parenthesis problem in a boolean expression in MCosy.cc

File:

• trunk/Cosy/main/MCosy.cc (modified) (2 diffs)

trunk/Cosy/main/MCosy.cc

@@ -870 +870 @@
     armed &= fMac2 && fMac2->IsArmed();
 
-    if (HasError())
-        SetStatus(MDriveCom::kError);
+    if (fMac1 && fMac2)
+    {
+        SetStatus(MDriveCom::kStopped);
+        if (fMac1->IsPositioning() || fMac2->IsPositioning())
+            SetStatus(MDriveCom::kMoving);
+        if (fMac1->IsRpmActive() || fMac2->IsRpmActive())
+            SetStatus(MDriveCom::kTracking);
+    }
+
+     if (HasError())
+         SetStatus(MDriveCom::kError);
+ 
+     gLog.UpdateGui();
+ 
 
     const TString stataz = fMac1 ? fMac1->GetStatusDKC() : "";
@@ -893 +905 @@
     fWin->UpdateWeather(*fCom);
     fWin->Update(bendist, fTrackingError, /*fVelocity, fOffset,*/
-                 fRaDec, fZdAzSoll, fStatus, (stat1&0xff<<8)|(stat2&0xff), HasConnection(), armed, statzd, stataz);
+                 fRaDec, fZdAzSoll, fStatus, ((stat1&0xff)<<8)|(stat2&0xff), HasConnection(), armed, statzd, stataz);
 
     gLog.UpdateGui();