Index: firmware/App/Modes/PreTreatmentRecirc.c =================================================================== diff -u -r4add377f60d45effbdc064b110a59c1b8afd0ab8 -r08aa1ee4a1cc79526979153fa4759e1df3892203 --- firmware/App/Modes/PreTreatmentRecirc.c (.../PreTreatmentRecirc.c) (revision 4add377f60d45effbdc064b110a59c1b8afd0ab8) +++ firmware/App/Modes/PreTreatmentRecirc.c (.../PreTreatmentRecirc.c) (revision 08aa1ee4a1cc79526979153fa4759e1df3892203) @@ -44,7 +44,6 @@ // ********** private data ********** static PRE_TREATMENT_RECIRC_STATE_T currentPreTreatmentRecircState; ///< Current state of the pre-treatment recirculate state machine. -static BOOL recircStopRequested; ///< Flag indicates alarm requesting to stop pre-treatment recirculate. static BOOL recircResumeRequested; ///< Flag indicates alarm requesting to resume pre-treatment recirculate. // ********** private function prototypes ********** @@ -130,19 +129,6 @@ /*********************************************************************//** * @brief - * The signalStopPreTreatmentRecirc function signals the pre-treatment - * recirculate sub-mode to stop when an alarm with stop property has been triggered. - * @details Inputs: none - * @details Outputs: recircStopRequested - * @return none - *************************************************************************/ -void signalStopPreTreatmentRecirc( void ) -{ - recircStopRequested = TRUE; -} - -/*********************************************************************//** - * @brief * The resetPreTreatmentRecircFlags function resets all pre-treatment recirculate * signal flags. * @details Inputs: none @@ -151,7 +137,6 @@ *************************************************************************/ static void resetPreTreatmentRecircFlags( void ) { - recircStopRequested = FALSE; recircResumeRequested = FALSE; } @@ -192,14 +177,13 @@ { PRE_TREATMENT_RECIRC_STATE_T state = PRE_TREATMENT_RECIRC_STATE; - if ( TRUE == recircStopRequested ) + if ( TRUE == doesAlarmStatusIndicateStop() ) { signalDialOutPumpHardStop(); signalDialInPumpHardStop(); signalBloodPumpHardStop(); cmdStopDGTrimmerHeater(); - recircStopRequested = FALSE; state = PRE_TREATMENT_RECIRC_STOPPED_STATE; }