Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -r949b386b5f58ab8bc534bd7e913ecb9f2c084c17 -r99ec83eff4683ad69a249f935d74cb9226984d21 --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 949b386b5f58ab8bc534bd7e913ecb9f2c084c17) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 99ec83eff4683ad69a249f935d74cb9226984d21) @@ -7,8 +7,8 @@ * * @file ModeStandby.c * -* @author (last) Dara Navaei -* @date (last) 03-Jan-2023 +* @author (last) Sean Nash +* @date (last) 13-Mar-2023 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 @@ -134,6 +134,7 @@ resetAirTrap(); resetBloodPumpRotorCount(); resetDialInPumpRotorCount(); + resetPreLoadStatus(); // Set user alarm recovery actions allowed in this mode setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE ); @@ -185,7 +186,6 @@ handleDisinfectCancel( stop ); -#ifndef RUN_WITHOUT_DG // State machine to get DG to prep a reservoir so we can start a treatment switch ( currentStandbyState ) { @@ -242,33 +242,7 @@ currentStandbyState = STANDBY_START_STATE; break; } -#else - // State machine to get DG to prep a reservoir so we can start a treatment - switch ( currentStandbyState ) - { - case STANDBY_START_STATE: - currentStandbyState = STANDBY_WAIT_FOR_TREATMENT_STATE; - // Temporary test code - TODO - remove later - homeBloodPump(); - homeDialInPump(); - homeDialOutPump(); - break; - case STANDBY_WAIT_FOR_TREATMENT_STATE: - if ( TRUE == treatStartReqReceived ) - { - requestNewOperationMode( MODE_TPAR ); - treatStartReqReceived = FALSE; - } - break; - - default: - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_STANDBY_INVALID_STATE, currentStandbyState ); - currentStandbyState = STANDBY_START_STATE; - break; - } -#endif - return currentStandbyState; }