Index: firmware/App/Drivers/SafetyShutdown.c
===================================================================
diff -u -rf760ffc4b10556e5186e9ceb90294262063440ca -r981435be2da7681bb62c7412b3c19c30458c55a7
--- firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision f760ffc4b10556e5186e9ceb90294262063440ca)
+++ firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision 981435be2da7681bb62c7412b3c19c30458c55a7)
@@ -38,36 +38,35 @@
 #define SET_SAFETY_SHUTDOWN()               gioSetBit( gioPORTB, SAFETY_GIO_PORT_PIN, PIN_SIGNAL_HIGH )
 #define CLR_SAFETY_SHUTDOWN()               gioSetBit( gioPORTB, SAFETY_GIO_PORT_PIN, PIN_SIGNAL_LOW )
 
-#define SAFETY_SHUTDOWN_POST_TIMEOUT_MS     500                   ///< Safety shutdown POST test timeout (in ms).
-#define SAFETY_SHUTDOWN_RECOVERY_TIME_MS    500                   ///< After safety shutdown POST test, wait this long (in ms) to recover before moving on.
+#define SAFETY_SHUTDOWN_POST_TIMEOUT_MS     500                         ///< Safety shutdown POST test timeout (in ms).
+#define SAFETY_SHUTDOWN_RECOVERY_TIME_MS    500                         ///< After safety shutdown POST test, wait this long (in ms) to recover before moving on.
 
-#define MAX_24V_LEVEL_ON_SAFETY_SHUTDOWN    5.0F                  ///< Maximum voltage on 24V line when safety shutdown asserted.
-#define MIN_24V_LEVEL_ON_SAFETY_RECOVER     22.6F                 ///< Minimum voltage on 24V line when safety shutdown is recovered.
-#define MIN_BACKUP_ALARM_CURRENT_MA         200.0F                ///< Minimum backup alarm audio current (in mA) detected when safety shutdown asserted.
-#define MAX_BACKUP_ALARM_CURRENT_MA         10.0F                 ///< Maximum backup alarm audio current (in mA) detected when safety shutdown is recovered.
+#define MAX_24V_LEVEL_ON_SAFETY_SHUTDOWN    5.0F                        ///< Maximum voltage on 24V line when safety shutdown asserted.
+#define MIN_24V_LEVEL_ON_SAFETY_RECOVER     22.6F                       ///< Minimum voltage on 24V line when safety shutdown is recovered.
+#define MIN_BACKUP_ALARM_CURRENT_MA         200.0F                      ///< Minimum backup alarm audio current (in mA) detected when safety shutdown asserted.
+#define MAX_BACKUP_ALARM_CURRENT_MA         10.0F                       ///< Maximum backup alarm audio current (in mA) detected when safety shutdown is recovered.
 
-#define SAFETY_POST_24V_INITIAL             0                     ///< Safety shutdown POST failed because 24V was out before safety line pulled.
-#define SAFETY_POST_24V_NOT_CUT             1                     ///< Safety shutdown POST failed because 24V was not cut when safety line pulled.
-#define SAFETY_POST_NO_24V_RESTORE          2                     ///< Safety shutdown POST failed because 24V was not restored when safety line reset.
+#define SAFETY_POST_24V_INITIAL             0                           ///< Safety shutdown POST failed because 24V was out before safety line pulled.
+#define SAFETY_POST_24V_NOT_CUT             1                           ///< Safety shutdown POST failed because 24V was not cut when safety line pulled.
+#define SAFETY_POST_NO_24V_RESTORE          2                           ///< Safety shutdown POST failed because 24V was not restored when safety line reset.
 
 /// Enumeration of safety shutdown self-test states.
 typedef enum Safety_Shutdown_Self_Test_States
 {
-    SAFETY_SHUTDOWN_SELF_TEST_STATE_START = 0,                    ///< Safety shutdown self-test start state
-    SAFETY_SHUTDOWN_SELF_TEST_STATE_IN_PROGRESS,                  ///< Safety shutdown self-test in progress state
-    SAFETY_SHUTDOWN_SELF_TEST_STATE_RECOVER,                      ///< Safety shutdown self-test recovery state
-    SAFETY_SHUTDOWN_SELF_TEST_STATE_COMPLETE,                     ///< Safety shutdown self-test completed state
-    NUM_OF_SAFETY_SHUTDOWN_SELF_TEST_STATES                       ///< Number of safety shutdown self-test states
+    SAFETY_SHUTDOWN_SELF_TEST_STATE_START = 0,                          ///< Safety shutdown self-test start state
+    SAFETY_SHUTDOWN_SELF_TEST_STATE_IN_PROGRESS,                        ///< Safety shutdown self-test in progress state
+    SAFETY_SHUTDOWN_SELF_TEST_STATE_RECOVER,                            ///< Safety shutdown self-test recovery state
+    SAFETY_SHUTDOWN_SELF_TEST_STATE_COMPLETE,                           ///< Safety shutdown self-test completed state
+    NUM_OF_SAFETY_SHUTDOWN_SELF_TEST_STATES                             ///< Number of safety shutdown self-test states
 } SAFETY_SHUTDOWN_SELF_TEST_STATE_T;
 
 // ********** private data **********
 
-static BOOL safetyShutdownActivated;                    ///< Status of safety shutdown signal.
-static BOOL safetyShutdownOverrideResetState;           ///< Natural status of safety shutdown signal.  Used to restore state on override reset.
-/// Current safety shutdown self-test state.
-static SAFETY_SHUTDOWN_SELF_TEST_STATE_T safetyShutdownSelfTestState;
-static SELF_TEST_STATUS_T safetyShutdownSelfTestStatus; ///< Safety shutdown self-test preliminary status.
-static U32 safetyShutdownSelfTestTimerCount;            ///< Safety shutdown self-test state timer counter.
+static BOOL safetyShutdownActivated;                                    ///< Status of safety shutdown signal.
+static BOOL safetyShutdownOverrideResetState;                           ///< Natural status of safety shutdown signal.  Used to restore state on override reset.
+static SAFETY_SHUTDOWN_SELF_TEST_STATE_T safetyShutdownSelfTestState;   ///< Current safety shutdown self-test state.
+static SELF_TEST_STATUS_T safetyShutdownSelfTestStatus;                 ///< Safety shutdown self-test preliminary status.
+static U32 safetyShutdownSelfTestTimerCount;                            ///< Safety shutdown self-test state timer counter.
 
 /*********************************************************************//**
  * @brief