Index: firmware/App/Drivers/SafetyShutdown.c =================================================================== diff -u -r6ddc5298786a4b5055f75330c49b62c6ae7adeb0 -r85ee38d93c39f64d5933afd647e53918b80cf03a --- firmware/App/Drivers/SafetyShutdown.c (.../SafetyShutdown.c) (revision 6ddc5298786a4b5055f75330c49b62c6ae7adeb0) +++ firmware/App/Drivers/SafetyShutdown.c (.../SafetyShutdown.c) (revision 85ee38d93c39f64d5933afd647e53918b80cf03a) @@ -47,9 +47,7 @@ #define MAX_BACKUP_ALARM_CURRENT_MA 10.0 ///< Maximum backup alarm audio current (in mA) detected when safety shutdown is recovered. #define SAFETY_POST_24V_NOT_CUT 1 ///< Safety shutdown POST failed because 24V was not cut when safety line pulled. -#define SAFETY_POST_NO_BUZZER 2 ///< Safety shutdown POST failed because buzzer was not detected when safety line pulled. -#define SAFETY_POST_NO_24V_RESTORE 3 ///< Safety shutdown POST failed because 24V was not restored when safety line reset. -#define SAFETY_POST_NO_BUZZER_OFF 4 ///< Safety shutdown POST failed because buzzer was not turned off when safety line reset. +#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 @@ -146,12 +144,6 @@ SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED, (F32)SAFETY_POST_24V_NOT_CUT, v24 ); safetyShutdownSelfTestStatus = SELF_TEST_STATUS_FAILED; } - // Verify backup alarm audio is on when w.d. expired - else if ( audioCurrent < MIN_BACKUP_ALARM_CURRENT_MA ) - { - SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED, (F32)SAFETY_POST_NO_BUZZER, audioCurrent ); - safetyShutdownSelfTestStatus = SELF_TEST_STATUS_FAILED; - } safetyShutdownSelfTestTimerCount = getMSTimerCount(); CLR_SAFETY_SHUTDOWN(); safetyShutdownActivated = FALSE; @@ -171,12 +163,6 @@ SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED, (F32)SAFETY_POST_NO_24V_RESTORE, v24 ); safetyShutdownSelfTestStatus = SELF_TEST_STATUS_FAILED; } - // Verify backup alarm audio is on when w.d. recovered - else if ( audioCurrent > MAX_BACKUP_ALARM_CURRENT_MA ) - { - SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED, (F32)SAFETY_POST_NO_BUZZER_OFF, audioCurrent ); - safetyShutdownSelfTestStatus = SELF_TEST_STATUS_FAILED; - } else { safetyShutdownSelfTestStatus = SELF_TEST_STATUS_PASSED;