Index: firmware/App/Modes/ModeTreatment.c =================================================================== diff -u -r526e890e4e35fac0a622af538bf611ea15a30609 -r6a26a0122d20ec075c3f719d5379583359500d8a --- firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision 526e890e4e35fac0a622af538bf611ea15a30609) +++ firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision 6a26a0122d20ec075c3f719d5379583359500d8a) @@ -980,11 +980,7 @@ { signalTreatmentEndAlarmEndTxUserAction(); } - // Handle alarm response from user to resume slow blood flow while waiting for rinseback request - else if ( TRUE == resumeTreatmentAlarmResponseRequest ) - { - signalTreatmentEndAlarmResumeUserAction(); - } + // End treatment state does not allow resume // Execute treatment end sub-mode execTreatmentEnd(); Index: firmware/App/Modes/TreatmentEnd.c =================================================================== diff -u -rb550cc9943259159415b6dfafb3231e85e40b485 -r6a26a0122d20ec075c3f719d5379583359500d8a --- firmware/App/Modes/TreatmentEnd.c (.../TreatmentEnd.c) (revision b550cc9943259159415b6dfafb3231e85e40b485) +++ firmware/App/Modes/TreatmentEnd.c (.../TreatmentEnd.c) (revision 6a26a0122d20ec075c3f719d5379583359500d8a) @@ -49,7 +49,6 @@ static U32 txEndTimerCtr; ///< Timer counter (in GP task intervals) counts time spent waiting for user to initiate final rinseback. static U32 bloodSittingTimerCtr; ///< Timer counter tracks time in paused state while blood is sitting. -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. static BOOL txEndRinsebackRequested; ///< Flag indicates user requesting final rinseback. @@ -96,7 +95,6 @@ *************************************************************************/ static void resetTreatmentEndFlags( void ) { - txEndAlarmResumeRequested = FALSE; txEndAlarmRinsebackRequested = FALSE; txEndAlarmEndTreatmentRequested = FALSE; txEndRinsebackRequested = FALSE; @@ -118,6 +116,7 @@ cmdStopDGFill(); // Set user alarm recovery actions allowed in this sub-mode + setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE ); setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, TRUE ); setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE ); setCurrentSubState( (U32)treatmentEndState ); @@ -146,8 +145,6 @@ static void setupForTxEndWait4RinsebackState( void ) { doorClosedRequired( TRUE, TRUE ); - // No resume alarm action allowed - setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE ); // Resume in this sub-mode indicates resume wait for user rinseback request (not resume treatment) // Open VBA and VBV valves to allow flow from/to patient setValvePosition( VBA, VALVE_POSITION_B_OPEN ); setValvePosition( VBV, VALVE_POSITION_B_OPEN ); @@ -170,8 +167,6 @@ static void setupForTxEndPausedState( void ) { doorClosedRequired( FALSE, FALSE ); - // Resume alarm action will take us back to TxEndWait4RinsebackState - setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE ); // Stop blood pump signalBloodPumpHardStop(); // Close arterial and venous lines @@ -299,12 +294,6 @@ { signalGoToRinseback(); } - // Is slow blood flow resume requested? - else if ( TRUE == txEndAlarmResumeRequested ) - { - setupForTxEndWait4RinsebackState(); - result = TREATMENT_END_WAIT_FOR_RINSEBACK_STATE; - } // Is treatment end requested? else if ( TRUE == txEndAlarmEndTreatmentRequested ) { @@ -332,19 +321,6 @@ /*********************************************************************//** * @brief - * The signalTreatmentEndAlarmResumeUserAction function signals the treatment end - * sub-mode to resume per user alarm action. - * @details Inputs: none - * @details Outputs: txEndAlarmResumeRequested - * @return none - *************************************************************************/ -void signalTreatmentEndAlarmResumeUserAction( void ) -{ - txEndAlarmResumeRequested = TRUE; -} - -/*********************************************************************//** - * @brief * The signalTreatmentEndAlarmRinsebackUserAction function signals the treatment end * sub-mode to start rinseback per user alarm action. * @details Inputs: none Index: firmware/App/Modes/TreatmentEnd.h =================================================================== diff -u -r0a4dcd288d4347b85baaa0b07da568b6add5eac7 -r6a26a0122d20ec075c3f719d5379583359500d8a --- firmware/App/Modes/TreatmentEnd.h (.../TreatmentEnd.h) (revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7) +++ firmware/App/Modes/TreatmentEnd.h (.../TreatmentEnd.h) (revision 6a26a0122d20ec075c3f719d5379583359500d8a) @@ -40,7 +40,6 @@ void transitionToTreatmentEnd( void ); void execTreatmentEnd( void ); -void signalTreatmentEndAlarmResumeUserAction( void ); // from user for alarm void signalTreatmentEndAlarmRinsebackUserAction( void ); // from user for alarm void signalTreatmentEndAlarmEndTxUserAction( void ); // from user for alarm void signalTreatmentEndUserAction( REQUESTED_TREATMENT_END_USER_ACTIONS_T action ); // from user