Index: firmware/App/Drivers/SafetyShutdown.c =================================================================== diff -u -r090cfb22a7c0b4738299c3fb411ca77aaba8d968 -rf7c714a1a09b10d85a8b013712532d37b4d7b97a --- firmware/App/Drivers/SafetyShutdown.c (.../SafetyShutdown.c) (revision 090cfb22a7c0b4738299c3fb411ca77aaba8d968) +++ firmware/App/Drivers/SafetyShutdown.c (.../SafetyShutdown.c) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) @@ -17,7 +17,7 @@ #include "mibspi.h" -//#include "InternalADC.h" +#include "InternalADC.h" #include "Messaging.h" #include "SafetyShutdown.h" #include "Timers.h" @@ -57,8 +57,8 @@ /*********************************************************************//** * @brief - * The initSafetyShutdown function initializes the safety shutdown module. - * The safety shutdown module is to cut down the 24v DC supply to majority of actuators + * The initSafetyShutdown function initializes the safety shutdown unit. + * The safety shutdown unit is to cut down the 24v DC supply to majority of actuators * when system detects critical faulty conditions. * @details \b Inputs: none * @details \b Outputs: safetyShutdownActivated, safetyShutdownOverrideResetState, @@ -135,13 +135,13 @@ // // Verify 24V is down when w.d. expired // if ( ( v24 > MAX_24V_LEVEL_ON_SAFETY_SHUTDOWN ) || ( isolatedV24 > MAX_ISOLATED_24V_LEVEL_ON_SS_EXPIRED ) ) // { -// SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_SAFETY_SHUTDOWN_POST_TEST_FAILED, 1.0, v24 ); +// //SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_SAFETY_SHUTDOWN_POST_TEST_FAILED, 1.0, v24 ); // safetyShutdownSelfTestStatus = SELF_TEST_STATUS_FAILED; // } - safetyShutdownSelfTestTimerCount = getMSTimerCount(); - clear_saftety_shutdown(); - safetyShutdownActivated = FALSE; - safetyShutdownSelfTestState = SAFETY_SHUTDOWN_SELF_TEST_STATE_RECOVER; +// safetyShutdownSelfTestTimerCount = getMSTimerCount(); +// clear_saftety_shutdown(); +// safetyShutdownActivated = FALSE; +// safetyShutdownSelfTestState = SAFETY_SHUTDOWN_SELF_TEST_STATE_RECOVER; } break; @@ -155,15 +155,15 @@ // if ( ( v24 < MIN_24V_LEVEL_ON_SAFETY_RECOVER ) || ( isolatedV24 < MAX_ISOLATED_24V_LEVEL_ON_SS_EXPIRED ) ) // { // // TODO - If issue persisted talk with systems why 24V does not recover fully. -// SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_SAFETY_SHUTDOWN_POST_TEST_FAILED, 2.0, v24 ); +// //SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_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; - result = safetyShutdownSelfTestStatus; +// safetyShutdownSelfTestState = SAFETY_SHUTDOWN_SELF_TEST_STATE_COMPLETE; +// result = safetyShutdownSelfTestStatus; } break;