Changeset 18352 for trunk

Timestamp:

11/07/15 17:22:12 (9 years ago)

Author:

tbretz

Message:

Updated states to meet extended ones of the new drivectrl.

File:

• trunk/FACT++/src/HeadersDrive.h (modified) (4 diffs)

trunk/FACT++/src/HeadersDrive.h

@@ -11 +11 @@
             kConnected,
             kLocked,
-            kNotReady,
-            kReady,
-            kArmed,
+            kUnavailable,    // IndraDrives not connected
+            kAvailable,      // IndraDrives connected, but not in Af
+            kBlocked,        // Drive blocked by manual operation of emergency button
+            kArmed,          // IndraDrives Af, not yet initialized
+            kInitialized,    // IndraDrives Af, initialized
+            kStopping,
+            kParking,
             kMoving,
             kTracking,
             kOnTrack,
+
+            kInvalidCoordinates = /*StateMachineImp::kSM_Error*/0x100+1,
+            kPositioningFailed,
+            kAllowedRangeExceeded,
+            kSpeedLimitExceeded,
         };
     };
@@ -27 +36 @@
     {
     } __attribute__((__packed__));
-
+/*
     struct DimStarguider
     {
@@ -47 +56 @@
 
     } __attribute__((__packed__));
-
+*/
     struct DimTPoint
     {
@@ -73 +82 @@
         double fStarMag;
 
+        double fRotation;
+
+        double fDx;
+        double fDy;
+
         double fRealMag;