Index: firmware/App/Modes/ModePreTreat.c =================================================================== diff -u -r104bd9ab84f7619fe04670a5cee37638e30f5a39 -rcfa825a18b02440d9be8b0da68980a669ac42682 --- firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision 104bd9ab84f7619fe04670a5cee37638e30f5a39) +++ firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision cfa825a18b02440d9be8b0da68980a669ac42682) @@ -465,24 +465,24 @@ } else if ( TD_PRE_TREATMENT_HEPARIN_SETUP_STATE == currentPreTreatmentState ) { - // Treat the Load Syringe alarm acknowledgment as syringe load - // confirmation only while awaiting user confirmation. Otherwise, - // resume the interrupted Heparin Setup state. - if ( TRUE == isPreTxHeparinAwaitingSyringeLoadConfirmation() ) - { - signalPreTxHeparinSyringeLoadConfirmed(); - } - else - { - signalResumePreTxHeparinSetup(); - } + signalResumePreTxHeparinSetup(); } else { // No action required. } break; + case ALARM_ACTION_ACK: + if ( ( TD_PRE_TREATMENT_HEPARIN_SETUP_STATE == currentPreTreatmentState ) && + ( TRUE == isPreTxHeparinAwaitingSyringeLoadConfirmation() ) ) + { + // OK on the Load Syringe clear-only alarm confirms that + // the syringe was loaded and resumes the paused state. + signalResumePreTxHeparinSetup(); + } + break; + default: // Do not handle other actions in Pre-Treatment mode. break;