Index: firmware/App/Drivers/SafetyShutdown.c
===================================================================
diff -u -r256d5cb05f1ef09e19e2f2733a111f600c73a7ee -rf192234d80556802fa42e62f8c1b20d1474f82f1
--- firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision 256d5cb05f1ef09e19e2f2733a111f600c73a7ee)
+++ firmware/App/Drivers/SafetyShutdown.c	(.../SafetyShutdown.c)	(revision f192234d80556802fa42e62f8c1b20d1474f82f1)
@@ -33,30 +33,29 @@
 #define SET_SAFETY_SHUTDOWN()       {mibspiREG1->PC3 |= SAFETY_SPI1_PORT_MASK;}     ///< Set safety shutdown GPIO macro.
 #define CLR_SAFETY_SHUTDOWN()       {mibspiREG1->PC3 &= ~SAFETY_SPI1_PORT_MASK;}    ///< Clear safety shutdown GPIO macro.
 
-#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 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.
 
 /// 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
@@ -148,13 +147,13 @@
                 F32 v24 = getIntADCVoltageConverted( INT_ADC_SECONDARY_HEATER_24_VOLTS );
 
                 // Verify 24V is down when w.d. recovered
-//                if ( v24 < MIN_24V_LEVEL_ON_SAFETY_RECOVER )   // TODO - talk with systems why 24V does not recover fully.
-//                {
-//                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED, 2.0, v24 );
-//                    safetyShutdownSelfTestStatus = SELF_TEST_STATUS_FAILED;
-//                }
-//                else
+                if ( v24 < MIN_24V_LEVEL_ON_SAFETY_RECOVER )   // TODO - If issue persisted talk with systems why 24V does not recover fully.
                 {
+                    SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED, 2.0, v24 );
+                    safetyShutdownSelfTestStatus = SELF_TEST_STATUS_FAILED;
+                }
+                else
+                {
                     safetyShutdownSelfTestStatus = SELF_TEST_STATUS_PASSED;
                 }
                 safetyShutdownSelfTestState = SAFETY_SHUTDOWN_SELF_TEST_STATE_COMPLETE;