Index: firmware/App/Modes/ModePreTreat.c =================================================================== diff -u -r5413ebeb2cb61163574550c7b2ca212ae3e307a3 -rd16609f215cf5ba8e08b902cf12a9492b40ed2cc --- firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision 5413ebeb2cb61163574550c7b2ca212ae3e307a3) +++ firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision d16609f215cf5ba8e08b902cf12a9492b40ed2cc) @@ -127,10 +127,6 @@ currentPreTreatmentState = handlePrimeState(); break; - case HD_PRE_TREATMENT_RECIRCULATE_START_STATE: - currentPreTreatmentState = handleRecirculateStartState(); - break; - case HD_PRE_TREATMENT_RECIRCULATE_STATE: currentPreTreatmentState = handleRecirculateState(); break; @@ -139,10 +135,6 @@ currentPreTreatmentState = handlePatientConnectionState(); break; - case HD_PRE_TREATMENT_PAUSE_STATE: - currentPreTreatmentState = handlePretreatmentPauseState(); - break; - default: currentPreTreatmentState = HD_PRE_TREATMENT_START_STATE; SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_PRE_TREATMENT_INVALID_STATE, (U32)currentPreTreatmentState ); @@ -272,10 +264,6 @@ // do nothing break; - case HD_PRE_TREATMENT_PAUSE_STATE: - alarmActionResumeReceived = TRUE; - break; - default: SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_PRE_TREATMENT_INVALID_STATE, (U32)currentPreTreatmentState ); break; @@ -344,7 +332,7 @@ if ( TRUE == isWetSelfTestsPassed() ) { - state = HD_PRE_TREATMENT_RECIRCULATE_START_STATE; + state = HD_PRE_TREATMENT_RECIRCULATE_STATE; activateAlarmNoData( ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY ); } @@ -402,9 +390,6 @@ signalDialInPumpHardStop(); signalBloodPumpHardStop(); cmdStopDGTrimmerHeater(); - - state = HD_PRE_TREATMENT_PAUSE_STATE; - resumePreTreatmentState = HD_PRE_TREATMENT_RECIRCULATE_START_STATE; } return state; @@ -428,24 +413,4 @@ return HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE; } -/*********************************************************************//** - * @brief - * The handlePretreatmentPauseState function handles pre-treatment pause state. - * @details Inputs: previousPrimeState - * @details Outputs: primeStartTime, primeResumeReqReceived - * @return current state - *************************************************************************/ -static HD_PRE_TREATMENT_MODE_STATE_T handlePretreatmentPauseState( void ) -{ - HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_PAUSE_STATE; - - if ( TRUE == alarmActionResumeReceived ) - { - alarmActionResumeReceived = FALSE; - state = resumePreTreatmentState; - } - - return state; -} - /**@}*/