Index: firmware/App/Modes/ModeTreatment.c =================================================================== diff -u -rd42ac7ac0eabedbb7b1c721a18419df3ed8cc9fb -r89f4c7f0995e2094b3f26fc7e7e12371e847abac --- firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision d42ac7ac0eabedbb7b1c721a18419df3ed8cc9fb) +++ firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision 89f4c7f0995e2094b3f26fc7e7e12371e847abac) @@ -610,12 +610,6 @@ { TREATMENT_STATE_T result = TREATMENT_RINSEBACK_STATE; - // Handle alarm stoppage - if ( TRUE == doesAlarmStatusIndicateStop() ) - { - signalStopRinseback(); - } - // Execute treatment re-circ sub-mode execRinseback(); @@ -651,12 +645,6 @@ { TREATMENT_STATE_T result = TREATMENT_RECIRC_STATE; - // Handle alarm stoppage - if ( TRUE == doesAlarmStatusIndicateStop() ) - { - signalStopTreatmentRecirc(); - } - // Execute treatment re-circ sub-mode execTreatmentRecirc(); @@ -687,23 +675,16 @@ { TREATMENT_STATE_T result = TREATMENT_END_STATE; - // Handle alarm stoppage - if ( TRUE == doesAlarmStatusIndicateStop() ) + // Handle final rinseback alarm response from user + if ( TRUE == initiateRinsebackAlarmResponseRequest ) { - signalStopTreatmentEnd(); - } - else if ( TRUE == initiateRinsebackAlarmResponseRequest ) - { signalTreatmentEndAlarmRinsebackUserAction(); } + // Handle alarm response from user to end treatment w/o rinseback else if ( TRUE == endTreatmentAlarmResponseRequest ) { signalTreatmentEndAlarmEndTxUserAction(); } - else if ( TRUE == resumeTreatmentAlarmResponseRequest ) - { - signalTreatmentEndAlarmResumeUserAction(); - } // Execute treatment end sub-mode execTreatmentEnd(); Index: firmware/App/Modes/Rinseback.c =================================================================== diff -u -r52362c924eb6233f0a23f6978ea3ce6a2b1b9376 -r89f4c7f0995e2094b3f26fc7e7e12371e847abac --- firmware/App/Modes/Rinseback.c (.../Rinseback.c) (revision 52362c924eb6233f0a23f6978ea3ce6a2b1b9376) +++ firmware/App/Modes/Rinseback.c (.../Rinseback.c) (revision 89f4c7f0995e2094b3f26fc7e7e12371e847abac) @@ -72,7 +72,6 @@ static U32 rinsebackAdditionalTimerCtr; ///< Timer counter for duration of an additional rinseback delivery. static U32 rinsebackPublishTimerCtr; ///< Timer counter for determining interval for rinseback status to be published. -static BOOL rinsebackStopRequested; ///< Flag indicates alarm requesting to stop rinseback. static BOOL startRinsebackRequested; ///< Flag indicates user requesting rinseback start (confirming saline bag move to arterial line end). static BOOL incrRinsebackFlowRateRequested; ///< Flag indicates user requesting rinseback flow rate be increased. static BOOL decrRinsebackFlowRateRequested; ///< Flag indicates user requesting rinseback flow rate be decreased. @@ -142,7 +141,6 @@ *************************************************************************/ static void resetRinsebackFlags( void ) { - rinsebackStopRequested = FALSE; startRinsebackRequested = FALSE; incrRinsebackFlowRateRequested = FALSE; decrRinsebackFlowRateRequested = FALSE; @@ -381,7 +379,7 @@ result = RINSEBACK_PAUSED_STATE; } // Has user or alarm requested rinseback pause? - else if ( ( TRUE == pauseRinsebackRequested ) || ( TRUE == rinsebackStopRequested ) ) + else if ( ( TRUE == pauseRinsebackRequested ) || ( TRUE == doesAlarmStatusIndicateStop() ) ) { setupForRinsebackStopOrPause(); result = RINSEBACK_PAUSED_STATE; @@ -542,7 +540,7 @@ result = RINSEBACK_STOP_STATE; } // Has alarm requested stop? - else if( TRUE == rinsebackStopRequested ) + else if ( TRUE == doesAlarmStatusIndicateStop() ) { setupForRinsebackStopOrPause(); result = RINSEBACK_STOP_STATE; @@ -553,19 +551,6 @@ /*********************************************************************//** * @brief - * The signalStopRinseback function signals the rinseback sub-mode - * to stop per an active alarm. - * @details Inputs: none - * @details Outputs: rinsebackStopRequested - * @return none - *************************************************************************/ -void signalStopRinseback( void ) -{ - rinsebackStopRequested = TRUE; -} - -/*********************************************************************//** - * @brief * The signalRinsebackUserAction function signals a rinseback user action * has been requested. The request is handled and responded to. * @details Inputs: none Index: firmware/App/Modes/Rinseback.h =================================================================== diff -u -rf66a94fdd645d2146e828fd760960849d1ac05c6 -r89f4c7f0995e2094b3f26fc7e7e12371e847abac --- firmware/App/Modes/Rinseback.h (.../Rinseback.h) (revision f66a94fdd645d2146e828fd760960849d1ac05c6) +++ firmware/App/Modes/Rinseback.h (.../Rinseback.h) (revision 89f4c7f0995e2094b3f26fc7e7e12371e847abac) @@ -54,7 +54,6 @@ void transitionToRinseback( void ); void execRinseback( void ); -void signalStopRinseback( void ); // from alarm void signalRinsebackUserAction( REQUESTED_RINSEBACK_USER_ACTIONS_T action ); // from user RINSEBACK_STATE_T getCurrentRinsebackState( void ); Index: firmware/App/Modes/TreatmentEnd.c =================================================================== diff -u -r4151ee46ace3cc66b6b7c0f276040889fe0d75e6 -r89f4c7f0995e2094b3f26fc7e7e12371e847abac --- firmware/App/Modes/TreatmentEnd.c (.../TreatmentEnd.c) (revision 4151ee46ace3cc66b6b7c0f276040889fe0d75e6) +++ firmware/App/Modes/TreatmentEnd.c (.../TreatmentEnd.c) (revision 89f4c7f0995e2094b3f26fc7e7e12371e847abac) @@ -45,7 +45,6 @@ static U32 txEndTimerCtr; ///< Timer counter (in GP task intervals) counts time spent waiting for user to initiate final rinseback. -static BOOL txEndStopRequested; ///< Flag indicates alarm requesting to stop slow blood flow. static BOOL txEndAlarmResumeRequested; ///< Flag indicates user requesting resume from alarm. static BOOL txEndAlarmRinsebackRequested; ///< Flag indicates user requesting rinseback from alarm. static BOOL txEndAlarmEndTreatmentRequested; ///< Flag indicates user requesting end treatment from alarm. @@ -87,7 +86,6 @@ *************************************************************************/ static void resetTreatmentEndFlags( void ) { - txEndStopRequested = FALSE; txEndAlarmResumeRequested = FALSE; txEndAlarmRinsebackRequested = FALSE; txEndAlarmEndTreatmentRequested = FALSE; @@ -120,7 +118,7 @@ startAirTrapControl(); // Set user alarm recovery actions allowed in this sub-mode - setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE ); + setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE ); setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, TRUE ); setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE ); } @@ -209,7 +207,7 @@ TREATMENT_END_STATE_T result = TREATMENT_END_WAIT_FOR_RINSEBACK_STATE; // Is alarm stop or user reconnect requested? - if ( TRUE == txEndStopRequested ) + if ( TRUE == doesAlarmStatusIndicateStop() ) { setupForTxEndPausedState(); result = TREATMENT_END_PAUSED_STATE; @@ -262,19 +260,6 @@ /*********************************************************************//** * @brief - * The signalStopTreatmentEnd function signals the treatment end - * sub-mode to stop per an active alarm. - * @details Inputs: none - * @details Outputs: txEndStopRequested - * @return none - *************************************************************************/ -void signalStopTreatmentEnd( void ) -{ - txEndStopRequested = TRUE; -} - -/*********************************************************************//** - * @brief * The signalTreatmentEndAlarmResumeUserAction function signals the treatment end * sub-mode to stop per an active alarm. * @details Inputs: none Index: firmware/App/Modes/TreatmentEnd.h =================================================================== diff -u -r1942c708bc95f57e87b0bf6a472ebe824a3f38ed -r89f4c7f0995e2094b3f26fc7e7e12371e847abac --- firmware/App/Modes/TreatmentEnd.h (.../TreatmentEnd.h) (revision 1942c708bc95f57e87b0bf6a472ebe824a3f38ed) +++ firmware/App/Modes/TreatmentEnd.h (.../TreatmentEnd.h) (revision 89f4c7f0995e2094b3f26fc7e7e12371e847abac) @@ -40,7 +40,6 @@ void transitionToTreatmentEnd( void ); void execTreatmentEnd( void ); -void signalStopTreatmentEnd( void ); // from alarm void signalTreatmentEndAlarmResumeUserAction( void ); // from user for alarm void signalTreatmentEndAlarmRinsebackUserAction( void ); // from user for alarm void signalTreatmentEndAlarmEndTxUserAction( void ); // from user for alarm Index: firmware/App/Modes/TreatmentRecirc.c =================================================================== diff -u -r92a6afc17ff42b5e8028d5a7fcbae02459e39dba -r89f4c7f0995e2094b3f26fc7e7e12371e847abac --- firmware/App/Modes/TreatmentRecirc.c (.../TreatmentRecirc.c) (revision 92a6afc17ff42b5e8028d5a7fcbae02459e39dba) +++ firmware/App/Modes/TreatmentRecirc.c (.../TreatmentRecirc.c) (revision 89f4c7f0995e2094b3f26fc7e7e12371e847abac) @@ -48,7 +48,6 @@ static U32 recircTimerCtr; ///< Timer counter (in GP task intervals) counts time spent in re-circulation sub-mode. static U32 recircPublishTimerCtr; ///< Timer counter (in GP task intervals) counts time to next status broadcast. -static BOOL recircStopRequested; ///< Flag indicates alarm requesting to stop rinseback. static BOOL recircReconnectRequested; ///< Flag indicates user requesting re-circulate stop so they can re-connect. static BOOL recircBackToTreatmenRequested; ///< Flag indicates user requesting to go back to treatment (confirming re-connected). static BOOL recircResumeRequested; ///< Flag indicates user requesting resumption of re-circulating. @@ -96,7 +95,6 @@ *************************************************************************/ static void resetTreatmentRecircFlags( void ) { - recircStopRequested = FALSE; recircReconnectRequested = FALSE; recircBackToTreatmenRequested = FALSE; recircResumeRequested = FALSE; @@ -221,7 +219,7 @@ TREATMENT_RECIRC_STATE_T result = TREATMENT_RECIRC_RECIRC_STATE; // Is alarm stop or user reconnect requested? - if ( ( TRUE == recircStopRequested ) || ( TRUE == recircReconnectRequested ) ) + if ( ( TRUE == recircReconnectRequested ) || ( TRUE == doesAlarmStatusIndicateStop() ) ) { setupForRecirculationStopState(); result = TREATMENT_RECIRC_STOPPED_STATE; @@ -282,19 +280,6 @@ /*********************************************************************//** * @brief - * The signalStopTreatmentRecirc function signals the treatment re-circulate - * sub-mode to stop per an active alarm. - * @details Inputs: none - * @details Outputs: recircStopRequested - * @return none - *************************************************************************/ -void signalStopTreatmentRecirc( void ) -{ - recircStopRequested = TRUE; -} - -/*********************************************************************//** - * @brief * The signalTreatmentRecircUserAction function signals a re-circ user action * has been requested. The request is handled and responded to. * @details Inputs: none Index: firmware/App/Modes/TreatmentRecirc.h =================================================================== diff -u -r1942c708bc95f57e87b0bf6a472ebe824a3f38ed -r89f4c7f0995e2094b3f26fc7e7e12371e847abac --- firmware/App/Modes/TreatmentRecirc.h (.../TreatmentRecirc.h) (revision 1942c708bc95f57e87b0bf6a472ebe824a3f38ed) +++ firmware/App/Modes/TreatmentRecirc.h (.../TreatmentRecirc.h) (revision 89f4c7f0995e2094b3f26fc7e7e12371e847abac) @@ -37,7 +37,6 @@ void transitionToTreatmentRecirc( void ); void execTreatmentRecirc( void ); -void signalStopTreatmentRecirc( void ); // from alarm void signalTreatmentRecircUserAction( REQUESTED_TREATMENT_RECIRC_USER_ACTIONS_T action ); // from user TREATMENT_RECIRC_STATE_T getCurrentTreatmentRecircState( void );