Index: firmware/App/Modes/ModeFault.c =================================================================== diff -u -rc67def50892f9a7c2f1f22985b5351465a8f6773 -rf6888c7e4e05cb84b11fceb4340458d8af543ce8 --- firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision c67def50892f9a7c2f1f22985b5351465a8f6773) +++ firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision f6888c7e4e05cb84b11fceb4340458d8af543ce8) @@ -137,4 +137,18 @@ return 0; // TODO - return current state } +/*********************************************************************//** + * @brief + * The signalAlarmActionToFaultMode function executes the given alarm action + * as appropriate while in Fault Mode. + * @details Inputs: none + * @details Outputs: given alarm action executed + * @param action ID of alarm action to execute + * @return none + *************************************************************************/ +void signalAlarmActionToFaultMode( ALARM_ACTION_T action ) +{ + +} + /**@}*/ Index: firmware/App/Modes/ModeFault.h =================================================================== diff -u -rde5a0d43bdef611d963d11855bc958a8d8899a09 -rf6888c7e4e05cb84b11fceb4340458d8af543ce8 --- firmware/App/Modes/ModeFault.h (.../ModeFault.h) (revision de5a0d43bdef611d963d11855bc958a8d8899a09) +++ firmware/App/Modes/ModeFault.h (.../ModeFault.h) (revision f6888c7e4e05cb84b11fceb4340458d8af543ce8) @@ -31,9 +31,10 @@ // ********** private function prototypes ********** -void initFaultMode( void ); // initialize this module -void transitionToFaultMode( void ); // prepares for transition to fault mode -U32 execFaultMode( void ); // execute the fault mode state machine (call from OperationModes) +void initFaultMode( void ); // initialize this module +void transitionToFaultMode( void ); // prepares for transition to fault mode +U32 execFaultMode( void ); // execute the fault mode state machine (call from OperationModes) +void signalAlarmActionToFaultMode( ALARM_ACTION_T action ); // execute alarm action as appropriate for fault mode /**@}*/ Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -r933a18d740285e70be9d00696ed0f5a5381bc8e4 -rf6888c7e4e05cb84b11fceb4340458d8af543ce8 --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 933a18d740285e70be9d00696ed0f5a5381bc8e4) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision f6888c7e4e05cb84b11fceb4340458d8af543ce8) @@ -192,6 +192,20 @@ /*********************************************************************//** * @brief + * The signalAlarmActionToInitAndPOSTMode function executes the given alarm action + * as appropriate while in InitAndPOST Mode. + * @details Inputs: none + * @details Outputs: given alarm action executed + * @param action ID of alarm action to execute + * @return none + *************************************************************************/ +void signalAlarmActionToInitAndPOSTMode( ALARM_ACTION_T action ) +{ + +} + +/*********************************************************************//** + * @brief * The isPOSTCompleted function determines whether all HD POST have * been run and completed. If true, call the isPOSTPassed() to see final * result (pass/fail). Index: firmware/App/Modes/ModeInitPOST.h =================================================================== diff -u -rde5a0d43bdef611d963d11855bc958a8d8899a09 -rf6888c7e4e05cb84b11fceb4340458d8af543ce8 --- firmware/App/Modes/ModeInitPOST.h (.../ModeInitPOST.h) (revision de5a0d43bdef611d963d11855bc958a8d8899a09) +++ firmware/App/Modes/ModeInitPOST.h (.../ModeInitPOST.h) (revision f6888c7e4e05cb84b11fceb4340458d8af543ce8) @@ -31,11 +31,12 @@ // ********** private function prototypes ********** -void initInitAndPOSTMode( void ); // initialize this module -void transitionToInitAndPOSTMode( void ); // prepares for transition to init. & POST mode -U32 execInitAndPOSTMode( void ); // execute the init. & POST mode state machine (call from OperationModes) -BOOL isPOSTCompleted( void ); -BOOL isPOSTPassed( void ); +void initInitAndPOSTMode( void ); // initialize this module +void transitionToInitAndPOSTMode( void ); // prepares for transition to init. & POST mode +U32 execInitAndPOSTMode( void ); // execute the init. & POST mode state machine (call from OperationModes) +BOOL isPOSTCompleted( void ); // determine whether POST has completed yet +BOOL isPOSTPassed( void ); // determine whether POST has passed +void signalAlarmActionToInitAndPOSTMode( ALARM_ACTION_T action ); // execute alarm action as appropriate for fault mode /**@}*/ Index: firmware/App/Modes/ModePostTreat.c =================================================================== diff -u -r1a685471524555a374854c0c9ec8e208e71fe2df -rf6888c7e4e05cb84b11fceb4340458d8af543ce8 --- firmware/App/Modes/ModePostTreat.c (.../ModePostTreat.c) (revision 1a685471524555a374854c0c9ec8e208e71fe2df) +++ firmware/App/Modes/ModePostTreat.c (.../ModePostTreat.c) (revision f6888c7e4e05cb84b11fceb4340458d8af543ce8) @@ -64,7 +64,7 @@ /*********************************************************************//** * @brief - * The execFaultMode function executes the Post-Treatment Mode state machine. + * The execPostTreatmentMode function executes the Post-Treatment Mode state machine. * @details Inputs: none * @details Outputs: none * @return current state (sub-mode) @@ -89,4 +89,18 @@ return 0; // TODO - return current state } +/*********************************************************************//** + * @brief + * The signalAlarmActionToPostTreatmentMode function executes the given alarm action + * as appropriate while in PostTreatment Mode. + * @details Inputs: none + * @details Outputs: given alarm action executed + * @param action ID of alarm action to execute + * @return none + *************************************************************************/ +void signalAlarmActionToPostTreatmentMode( ALARM_ACTION_T action ) +{ + +} + /**@}*/ Index: firmware/App/Modes/ModePostTreat.h =================================================================== diff -u -rde5a0d43bdef611d963d11855bc958a8d8899a09 -rf6888c7e4e05cb84b11fceb4340458d8af543ce8 --- firmware/App/Modes/ModePostTreat.h (.../ModePostTreat.h) (revision de5a0d43bdef611d963d11855bc958a8d8899a09) +++ firmware/App/Modes/ModePostTreat.h (.../ModePostTreat.h) (revision f6888c7e4e05cb84b11fceb4340458d8af543ce8) @@ -31,9 +31,10 @@ // ********** private function prototypes ********** -void initPostTreatmentMode( void ); // initialize this module -void transitionToPostTreatmentMode( void ); // prepares for transition to post-treatment mode -U32 execPostTreatmentMode( void ); // execute the post-treatment mode state machine (call from OperationModes) +void initPostTreatmentMode( void ); // initialize this module +void transitionToPostTreatmentMode( void ); // prepares for transition to post-treatment mode +U32 execPostTreatmentMode( void ); // execute the post-treatment mode state machine (call from OperationModes) +void signalAlarmActionToPostTreatmentMode( ALARM_ACTION_T action ); // execute alarm action as appropriate for post-treatment mode /**@}*/ Index: firmware/App/Modes/ModePreTreat.c =================================================================== diff -u -r1a685471524555a374854c0c9ec8e208e71fe2df -rf6888c7e4e05cb84b11fceb4340458d8af543ce8 --- firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision 1a685471524555a374854c0c9ec8e208e71fe2df) +++ firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision f6888c7e4e05cb84b11fceb4340458d8af543ce8) @@ -71,7 +71,7 @@ /*********************************************************************//** * @brief - * The execFaultMode function executes the Pre-Treatment Mode state machine. + * The execPreTreatmentMode function executes the Pre-Treatment Mode state machine. * @details Inputs: none * @details Outputs: none * @return current state (sub-mode) @@ -118,4 +118,18 @@ return result; } +/*********************************************************************//** + * @brief + * The signalAlarmActionToPreTreatmentMode function executes the given alarm action + * as appropriate while in PreTreatment Mode. + * @details Inputs: none + * @details Outputs: given alarm action executed + * @param action ID of alarm action to execute + * @return none + *************************************************************************/ +void signalAlarmActionToPreTreatmentMode( ALARM_ACTION_T action ) +{ + +} + /**@}*/ Index: firmware/App/Modes/ModePreTreat.h =================================================================== diff -u -rc67def50892f9a7c2f1f22985b5351465a8f6773 -rf6888c7e4e05cb84b11fceb4340458d8af543ce8 --- firmware/App/Modes/ModePreTreat.h (.../ModePreTreat.h) (revision c67def50892f9a7c2f1f22985b5351465a8f6773) +++ firmware/App/Modes/ModePreTreat.h (.../ModePreTreat.h) (revision f6888c7e4e05cb84b11fceb4340458d8af543ce8) @@ -31,10 +31,11 @@ // ********** private function prototypes ********** -void initPreTreatmentMode( void ); // initialize this module -void transitionToPreTreatmentMode( void ); // prepares for transition to pre-treatment mode -U32 execPreTreatmentMode( void ); // execute the pre-treatment mode state machine (call from OperationModes) -BOOL signalUserBeginningTreatment( void ); // signal that user requests treatment begin +void initPreTreatmentMode( void ); // initialize this module +void transitionToPreTreatmentMode( void ); // prepares for transition to pre-treatment mode +U32 execPreTreatmentMode( void ); // execute the pre-treatment mode state machine (call from OperationModes) +BOOL signalUserBeginningTreatment( void ); // signal that user requests treatment begin +void signalAlarmActionToPreTreatmentMode( ALARM_ACTION_T action ); // execute alarm action as appropriate for pre-treatment mode /**@}*/ Index: firmware/App/Modes/ModeService.c =================================================================== diff -u -rc67def50892f9a7c2f1f22985b5351465a8f6773 -rf6888c7e4e05cb84b11fceb4340458d8af543ce8 --- firmware/App/Modes/ModeService.c (.../ModeService.c) (revision c67def50892f9a7c2f1f22985b5351465a8f6773) +++ firmware/App/Modes/ModeService.c (.../ModeService.c) (revision f6888c7e4e05cb84b11fceb4340458d8af543ce8) @@ -62,4 +62,18 @@ return 0; // TODO - return current state } +/*********************************************************************//** + * @brief + * The signalAlarmActionToServiceMode function executes the given alarm action + * as appropriate while in Service Mode. + * @details Inputs: none + * @details Outputs: given alarm action executed + * @param action ID of alarm action to execute + * @return none + *************************************************************************/ +void signalAlarmActionToServiceMode( ALARM_ACTION_T action ) +{ + +} + /**@}*/ Index: firmware/App/Modes/ModeService.h =================================================================== diff -u -rde5a0d43bdef611d963d11855bc958a8d8899a09 -rf6888c7e4e05cb84b11fceb4340458d8af543ce8 --- firmware/App/Modes/ModeService.h (.../ModeService.h) (revision de5a0d43bdef611d963d11855bc958a8d8899a09) +++ firmware/App/Modes/ModeService.h (.../ModeService.h) (revision f6888c7e4e05cb84b11fceb4340458d8af543ce8) @@ -31,9 +31,10 @@ // ********** private function prototypes ********** -void initServiceMode( void ); // initialize this module -void transitionToServiceMode( void ); // prepares for transition to service mode -U32 execServiceMode( void ); // execute the service mode state machine (call from OperationModes) +void initServiceMode( void ); // initialize this module +void transitionToServiceMode( void ); // prepares for transition to service mode +U32 execServiceMode( void ); // execute the service mode state machine (call from OperationModes) +void signalAlarmActionToServiceMode( ALARM_ACTION_T action ); // execute alarm action as appropriate for Service mode /**@}*/ Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -r1a685471524555a374854c0c9ec8e208e71fe2df -rf6888c7e4e05cb84b11fceb4340458d8af543ce8 --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 1a685471524555a374854c0c9ec8e208e71fe2df) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision f6888c7e4e05cb84b11fceb4340458d8af543ce8) @@ -326,4 +326,18 @@ return result; } +/*********************************************************************//** + * @brief + * The signalAlarmActionToStandbyMode function executes the given alarm action + * as appropriate while in Standby Mode. + * @details Inputs: none + * @details Outputs: given alarm action executed + * @param action ID of alarm action to execute + * @return none + *************************************************************************/ +void signalAlarmActionToStandbyMode( ALARM_ACTION_T action ) +{ + +} + /**@}*/ Index: firmware/App/Modes/ModeStandby.h =================================================================== diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -rf6888c7e4e05cb84b11fceb4340458d8af543ce8 --- firmware/App/Modes/ModeStandby.h (.../ModeStandby.h) (revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8) +++ firmware/App/Modes/ModeStandby.h (.../ModeStandby.h) (revision f6888c7e4e05cb84b11fceb4340458d8af543ce8) @@ -31,11 +31,12 @@ // ********** public function prototypes ********** -void initStandbyMode( void ); // initialize this module -void transitionToStandbyMode( void ); // prepares for transition to standby mode -U32 execStandbyMode( void ); // execute the standby mode state machine (call from OperationModes) +void initStandbyMode( void ); // initialize this module +void transitionToStandbyMode( void ); // prepares for transition to standby mode +U32 execStandbyMode( void ); // execute the standby mode state machine (call from OperationModes) -BOOL signalUserStartingTreatment( void ); // User has initiated a treatment - go to treatment parameters mode +BOOL signalUserStartingTreatment( void ); // User has initiated a treatment - go to treatment parameters mode +void signalAlarmActionToStandbyMode( ALARM_ACTION_T action ); // execute alarm action as appropriate for Standby mode /**@}*/ Index: firmware/App/Modes/ModeTreatment.c =================================================================== diff -u -rd2f3df2002ecc87795b8bdeefda63c4805d78146 -rf6888c7e4e05cb84b11fceb4340458d8af543ce8 --- firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision d2f3df2002ecc87795b8bdeefda63c4805d78146) +++ firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision f6888c7e4e05cb84b11fceb4340458d8af543ce8) @@ -181,6 +181,20 @@ /*********************************************************************//** * @brief + * The signalAlarmActionToTreatmentMode function executes the given alarm action + * as appropriate while in Treatment Mode. + * @details Inputs: none + * @details Outputs: given alarm action executed + * @param action ID of alarm action to execute + * @return none + *************************************************************************/ +void signalAlarmActionToTreatmentMode( ALARM_ACTION_T action ) +{ + +} + +/*********************************************************************//** + * @brief * The execTreatmentMode function executes the Treatment Mode state machine. * @details Inputs: currentTreatmentState * @details Outputs: currentTreatmentState Index: firmware/App/Modes/ModeTreatment.h =================================================================== diff -u -r933a18d740285e70be9d00696ed0f5a5381bc8e4 -rf6888c7e4e05cb84b11fceb4340458d8af543ce8 --- firmware/App/Modes/ModeTreatment.h (.../ModeTreatment.h) (revision 933a18d740285e70be9d00696ed0f5a5381bc8e4) +++ firmware/App/Modes/ModeTreatment.h (.../ModeTreatment.h) (revision f6888c7e4e05cb84b11fceb4340458d8af543ce8) @@ -77,14 +77,15 @@ // ********** private function prototypes ********** -void initTreatmentMode( void ); // initialize this module -void transitionToTreatmentMode( void ); // prepares for transition to treatment mode -U32 execTreatmentMode( void ); // execute the treatment mode state machine (call from OperationModes) +void initTreatmentMode( void ); // initialize this module +void transitionToTreatmentMode( void ); // prepares for transition to treatment mode +U32 execTreatmentMode( void ); // execute the treatment mode state machine (call from OperationModes) +void signalAlarmActionToTreatmentode( ALARM_ACTION_T action ); // execute alarm action as appropriate for Treatment mode -TREATMENT_STATE_T getTreatmentState( void ); +TREATMENT_STATE_T getTreatmentState( void ); // determine the current treatment sub-mode (state) -BOOL userRequestEndTreatment( void ); -void broadcastTreatmentTimeAndState( void ); +BOOL userRequestEndTreatment( void ); // user has requested to ????? +void broadcastTreatmentTimeAndState( void ); // broadcast the times and states of this treatment BOOL verifyTreatmentDurationSettingChange( U32 treatmentTime ); BOOL verifyUFSettingsChange( F32 uFVolume ); Index: firmware/App/Modes/ModeTreatmentParams.c =================================================================== diff -u -r933a18d740285e70be9d00696ed0f5a5381bc8e4 -rf6888c7e4e05cb84b11fceb4340458d8af543ce8 --- firmware/App/Modes/ModeTreatmentParams.c (.../ModeTreatmentParams.c) (revision 933a18d740285e70be9d00696ed0f5a5381bc8e4) +++ firmware/App/Modes/ModeTreatmentParams.c (.../ModeTreatmentParams.c) (revision f6888c7e4e05cb84b11fceb4340458d8af543ce8) @@ -241,7 +241,21 @@ /*********************************************************************//** * @brief - * The execFaultMode function executes the Operating Parameters Mode state machine. + * The signalAlarmActionToTreatParamsMode function executes the given alarm action + * as appropriate while in Treatment Parameters Mode. + * @details Inputs: none + * @details Outputs: given alarm action executed + * @param action ID of alarm action to execute + * @return none + *************************************************************************/ +void signalAlarmActionToTreatParamsMode( ALARM_ACTION_T action ) +{ + +} + +/*********************************************************************//** + * @brief + * The execTreatParamsMode function executes the Operating Parameters Mode state machine. * @details Inputs: treatParamsState * @details Outputs: treatParamsState * @return current state (sub-mode) Index: firmware/App/Modes/ModeTreatmentParams.h =================================================================== diff -u -rb01542f8e4ef5a29e9b08fc0d465478de516bf02 -rf6888c7e4e05cb84b11fceb4340458d8af543ce8 --- firmware/App/Modes/ModeTreatmentParams.h (.../ModeTreatmentParams.h) (revision b01542f8e4ef5a29e9b08fc0d465478de516bf02) +++ firmware/App/Modes/ModeTreatmentParams.h (.../ModeTreatmentParams.h) (revision f6888c7e4e05cb84b11fceb4340458d8af543ce8) @@ -79,6 +79,7 @@ BOOL signalUserConfirmationOfTreatmentParameters( void ); // User has confirmed treatment parameters BOOL signalUserRejectionOfTreatmentParameters( void ); // User has rejected treatment parameters BOOL signalUserCancelTreatment( void ); // User has cancelled treatment +void signalAlarmActionToTreatParamsMode( ALARM_ACTION_T action ); // execute alarm action as appropriate for treatment parameters mode BOOL setTreatmentParameterU32( TREATMENT_PARAM_T param, U32 value ); // Set a specified unsigned integer treatment parameter value BOOL setTreatmentParameterS32( TREATMENT_PARAM_T param, S32 value ); // Set a specified signed integer treatment parameter value Index: firmware/App/Modes/OperationModes.c =================================================================== diff -u -rb01542f8e4ef5a29e9b08fc0d465478de516bf02 -rf6888c7e4e05cb84b11fceb4340458d8af543ce8 --- firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision b01542f8e4ef5a29e9b08fc0d465478de516bf02) +++ firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision f6888c7e4e05cb84b11fceb4340458d8af543ce8) @@ -212,6 +212,50 @@ /*********************************************************************//** * @brief + * The initiateAlarmAction function initiate an alarm or alarm recovery + * action according to the current operation mode. + * @details Inputs: currentMode + * @details Outputs: given action forwarded to current operation mode for execution + * @param action ID of action to be initiated + * @return none + *************************************************************************/ +void initiateAlarmAction( ALARM_ACTION_T action ) +{ + // forward request to the current operation mode + switch ( currentMode ) + { + case MODE_FAUL: + signalAlarmActionToFaultMode( action ); + break; + case MODE_SERV: + signalAlarmActionToServiceMode( action ); + break; + case MODE_INIT: + signalAlarmActionToInitAndPOSTMode( action ); + break; + case MODE_STAN: + signalAlarmActionToStandbyMode( action ); + break; + case MODE_TPAR: + signalAlarmActionToTreatParamsMode( action ); + break; + case MODE_PRET: + signalAlarmActionToPreTreatmentMode( action ); + break; + case MODE_TREA: + signalAlarmActionToTreatmentMode( action ); + break; + case MODE_POST: + signalAlarmActionToPostTreatmentMode( action ); + break; + default: + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_SIGNAL_ACTION, currentMode ) + break; + } +} + +/*********************************************************************//** + * @brief * The arbitrateModeRequest function arbitrates any pending mode transition * requests. * @details Inputs: modeRequest[] Index: firmware/App/Modes/OperationModes.h =================================================================== diff -u -r794e32744dade6f664237cb7610ec327687a8da5 -rf6888c7e4e05cb84b11fceb4340458d8af543ce8 --- firmware/App/Modes/OperationModes.h (.../OperationModes.h) (revision 794e32744dade6f664237cb7610ec327687a8da5) +++ firmware/App/Modes/OperationModes.h (.../OperationModes.h) (revision f6888c7e4e05cb84b11fceb4340458d8af543ce8) @@ -33,10 +33,11 @@ // ********** public function prototypes ********** -void initOperationModes( void ); // initialize this module -void execOperationModes( void ); // execute the operation modes state machine (scheduled periodic call) -void requestNewOperationMode( HD_OP_MODE_T newMode ); // request a transition to a new operation mode -HD_OP_MODE_T getCurrentOperationMode( void ); // get the current operation mode +void initOperationModes( void ); // initialize this module +void execOperationModes( void ); // execute the operation modes state machine (scheduled periodic call) +void requestNewOperationMode( HD_OP_MODE_T newMode ); // request a transition to a new operation mode +HD_OP_MODE_T getCurrentOperationMode( void ); // get the current operation mode +void initiateAlarmAction( ALARM_ACTION_T action ); // initiate an alarm or alarm recovery action according to current op mode /**@}*/ Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -rd13534495f6b9ea565c38ea88e9bc658c3325636 -rf6888c7e4e05cb84b11fceb4340458d8af543ce8 --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision d13534495f6b9ea565c38ea88e9bc658c3325636) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision f6888c7e4e05cb84b11fceb4340458d8af543ce8) @@ -356,28 +356,32 @@ // inactivate (clear) all active recoverable alarms for ( a = ALARM_ID_NO_ALARM; a < NUM_OF_ALARM_IDS; a++ ) { - clearAlarm( a ); + // is alarm recoverable? + if ( FALSE == ALARM_TABLE[ a ].alarmNoClear ) + { + clearAlarm( a ); + } } - } - // initiate user selected action - switch ( action ) - { - case ALARM_USER_ACTION_RESUME: - // TODO - break; + // initiate user selected action + switch ( action ) + { + case ALARM_USER_ACTION_RESUME: + // TODO + break; - case ALARM_USER_ACTION_RINSEBACK: - // TODO - break; + case ALARM_USER_ACTION_RINSEBACK: + // TODO + break; - case ALARM_USER_ACTION_END_TREATMENT: - // TODO - break; + case ALARM_USER_ACTION_END_TREATMENT: + // TODO + break; - default: - // TODO - s/w fault? - break; + default: + // TODO - s/w fault? + break; + } } } Index: firmware/App/Services/AlarmMgmt.h =================================================================== diff -u -rc672f41061bcd500d6593655641cb27ce3ae58fc -rf6888c7e4e05cb84b11fceb4340458d8af543ce8 --- firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision c672f41061bcd500d6593655641cb27ce3ae58fc) +++ firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision f6888c7e4e05cb84b11fceb4340458d8af543ce8) @@ -39,6 +39,17 @@ #define MAX_ALARM_VOLUME_LEVEL 7 +/// Enumeration of alarm actions. +typedef enum Alarm_Actions +{ + ALARM_ACTION_STOP = 0, ///< Alarm state requests HD in safe state (pumps stopped, heater off, valves in safe state) + ALARM_ACTION_BYPASS_DIALYZER, ///< Alarm state requests dialysate re-circ while bypassing dialyzer + ALARM_ACTION_RESUME, ///< User selected resume from alarm recovery options + ALARM_ACTION_RINSEBACK, ///< User selected rinseback from alarm recovery options + ALARM_ACTION_END_TREATMENT, ///< User selected end treatment from alarm recovery options + NUMBER_OF_ALARM_ACTIONS ///< Number of alarm actions +} ALARM_ACTION_T; + /// Alarm data types list. typedef enum Alarm_Data_Types { @@ -177,13 +188,13 @@ SW_FAULT_ID_RTC_SELF_TEST_INVALID_STATE, // 45 SW_FAULT_ID_RTC_TRANSACTION_SERVICE_INVALID_STATE, SW_FAULT_ID_PRES_OCCL_INVALID_STATE, - SW_FAULT_ID____AVAILABLE_3, - SW_FAULT_ID____AVAILABLE_4, + SW_FAULT_ID_OP_MODES_INVALID_MODE_TO_SIGNAL_ACTION, + SW_FAULT_ID____AVAILABLE_1, SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL, // 50 SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, SW_FAULT_ID_PI_CTRL_INVALID_SIGNAL, - SW_FAULT_ID____AVAILABLE_5, - SW_FAULT_ID____AVAILABLE_6, + SW_FAULT_ID____AVAILABLE_2, + SW_FAULT_ID____AVAILABLE_3, SW_FAULT_ID_DIALYSIS_INVALID_STATE, // 55 SW_FAULT_ID_DIALYSIS_INVALID_UF_STATE, SW_FAULT_ID_NVDATAMGMT_INVALID_SELF_TEST_STATE,