Index: firmware/App/Modes/StatePreTxHeparinSetup.c =================================================================== diff -u -r26697e83bb707f1627e0707036d1bbc5b876fd6e -r18c3483e0b479ef408885b5edb71f2ccd118a6bb --- firmware/App/Modes/StatePreTxHeparinSetup.c (.../StatePreTxHeparinSetup.c) (revision 26697e83bb707f1627e0707036d1bbc5b876fd6e) +++ firmware/App/Modes/StatePreTxHeparinSetup.c (.../StatePreTxHeparinSetup.c) (revision 18c3483e0b479ef408885b5edb71f2ccd118a6bb) @@ -100,8 +100,6 @@ *************************************************************************/ void transitionToPreTxHeparinSetup( void ) { - setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE ); - setCurrentSubState( (U32)currentPreTxHeparinSetupState ); } @@ -307,6 +305,7 @@ } else if ( TRUE == isSyringePumpPreLoaded() ) { + setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE ); activateAlarmNoData( ALARM_ID_TD_PRE_TX_HEPARIN_LOAD_SYRINGE ); state = PRE_TX_HEPARIN_SETUP_AWAIT_SYRINGE_LOAD_CONFIRMATION_STATE; } @@ -548,9 +547,11 @@ state = PRE_TX_HEPARIN_SETUP_PRELOAD_STATE; break; - // Return to waiting for syringe load confirmation. + // Resume confirms syringe loading and continues to Seek. case PRE_TX_HEPARIN_SETUP_AWAIT_SYRINGE_LOAD_CONFIRMATION_STATE: - state = PRE_TX_HEPARIN_SETUP_AWAIT_SYRINGE_LOAD_CONFIRMATION_STATE; + setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE ); + setupPreTxHeparinState( PRE_TX_HEPARIN_SETUP_SEEK_STATE ); + state = PRE_TX_HEPARIN_SETUP_SEEK_STATE; break; // If interrupted after Seek is complete, resume the prior state.