Changeset 18803 for trunk

Timestamp:

04/05/17 15:26:16 (8 years ago)

Author:

tbretz

Message:

Split Errors and Warning into to error states. Allow to park in warning state. Allow to reset in InvalidCoorsinate state.

File:

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

trunk/FACT++/src/drivectrl.cc

@@ -1308 +1308 @@
     }
 
-    bool HasError() const
+    bool HasWarning() const
     {
         const uint8_t typ0 = fErrCode[0]>>16;
         const uint8_t typ1 = fErrCode[1]>>16;
-        return typ0==0xe || typ0==0xf || typ1==0xe || typ1==0xf;
+        return typ0==0xe || typ1==0xe;
+    }
+
+    bool HasError() const
+    {
+        const uint8_t typ0 = fErrCode[0]>>16;
+        const uint8_t typ1 = fErrCode[1]>>16;
+        return typ0==0xf || typ1==0xf;
     }
 
@@ -2511 +2518 @@
         // FIXME: This can prevent parking in case e.g.
         // of e8029 Position limit exceeded
-        if (fDrive.HasError())
+        if (fDrive.HasWarning() || fDrive.HasError())
         {
             if (T::GetCurrentState()==State::kOnTrack  ||
@@ -2521 +2528 @@
             if (T::GetCurrentState()==State::kStopping && fDrive.IsMoving())
                 return State::kStopping;
+
+            if (fDrive.HasError())
+                return State::kHardwareError;
+
+            if (fDrive.HasWarning())
+                return State::kHardwareWarning;
 
             return StateMachineImp::kSM_Error;
@@ -2728 +2741 @@
         T::AddStateName(State::kInvalidCoordinates, "InvalidCoordinates",
                         "Tracking coordinates out of range");
+
+        T::AddStateName(State::kHardwareWarning, "HwardwareWarning",
+                        "At least one IndraDrive in a warning condition... check carefully!");
+        T::AddStateName(State::kHardwareError, "HwardwareError",
+                        "At least one IndraDrive in an error condition... this is a serious incident!");
 
 
@@ -2817 +2835 @@
 
         // FIXME: What to do in error state?
-        T::AddEvent("PARK", State::kInitialized, State::kMoving, State::kTracking, State::kOnTrack)
+        T::AddEvent("PARK", State::kInitialized, State::kMoving, State::kTracking, State::kOnTrack, State::kHardwareWarning)
             (bind(&StateMachineDrive::Park, this))
             ("Park the telescope");
@@ -2825 +2843 @@
             ("Stop any kind of movement.");
 
-        T::AddEvent("RESET", State::kPositioningFailed, State::kAllowedRangeExceeded)
+        T::AddEvent("RESET", State::kPositioningFailed, State::kAllowedRangeExceeded, State::kInvalidCoordinates)
             (bind(&StateMachineDrive::ResetError, this))
-            ("Acknoledge an internal error (PositioningFailed, AllowedRangeExceeded)");
+            ("Acknowledge an internal drivectrl error (PositioningFailed, AllowedRangeExceeded, InvalidCoordinates)");
 
         T::AddEvent("TPOINT", State::kOnTrack)