Changeset 18805 for trunk

Timestamp:

04/06/17 19:56:16 (8 years ago)

Author:

tbretz

Message:

Fixed some typo in the state names. For the time being added HardwareWarning to RESET.

File:

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

trunk/FACT++/src/drivectrl.cc

@@ -2742 +2742 @@
                         "Tracking coordinates out of range");
 
-        T::AddStateName(State::kHardwareWarning, "HwardwareWarning",
+        T::AddStateName(State::kHardwareWarning, "HardwareWarning",
                         "At least one IndraDrive in a warning condition... check carefully!");
-        T::AddStateName(State::kHardwareError, "HwardwareError",
+        T::AddStateName(State::kHardwareError, "HardwareError",
                         "At least one IndraDrive in an error condition... this is a serious incident!");
 
@@ -2843 +2843 @@
             ("Stop any kind of movement.");
 
-        T::AddEvent("RESET", State::kPositioningFailed, State::kAllowedRangeExceeded, State::kInvalidCoordinates)
+        T::AddEvent("RESET", State::kPositioningFailed, State::kAllowedRangeExceeded, State::kInvalidCoordinates, State::kHardwareWarning)
             (bind(&StateMachineDrive::ResetError, this))
             ("Acknowledge an internal drivectrl error (PositioningFailed, AllowedRangeExceeded, InvalidCoordinates)");