Index: firmware/App/Modes/ModeGenIdle.c =================================================================== diff -u -r3a007e014c41538a1256ce5f42093763db82e84d -r7d0fd5ed6b9db0479af90477e5108f6d3fa8df17 --- firmware/App/Modes/ModeGenIdle.c (.../ModeGenIdle.c) (revision 3a007e014c41538a1256ce5f42093763db82e84d) +++ firmware/App/Modes/ModeGenIdle.c (.../ModeGenIdle.c) (revision 7d0fd5ed6b9db0479af90477e5108f6d3fa8df17) @@ -8,8 +8,8 @@ * * @file ModeGenIdle.c * -* @author (last) Sean Nash -* @date (last) 11-Oct-2023 +* @author (last) Dara Navaei +* @date (last) 09-Apr-2024 * * @author (original) Quang Nguyen * @date (original) 06-Aug-2021 @@ -107,6 +107,9 @@ *************************************************************************/ U32 transitionToGenIdleMode( void ) { + BOOL cp1parkStatus = ( getConcPumpIsParked( CONCENTRATEPUMPS_CP1_ACID ) != TRUE ? PARK_CONC_PUMPS : NO_PARK_CONC_PUMPS ); + BOOL cp2parkStatus = ( getConcPumpIsParked( CONCENTRATEPUMPS_CP2_BICARB ) != TRUE ? PARK_CONC_PUMPS : NO_PARK_CONC_PUMPS ); + // Re-initialize each time we transition to generation idle mode initGenIdleMode(); setCurrentSubState( NO_SUB_STATE ); @@ -124,8 +127,8 @@ setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD2_SENSOR, CAL_DATA_CD2_COND_SENSOR ); signalDrainPumpHardStop(); - requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); - requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, cp1parkStatus ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, cp2parkStatus ); // UV reactors on turnOnUVReactor( INLET_UV_REACTOR ); @@ -496,9 +499,8 @@ // Check for unwanted filling unless a transfer is in progress if ( ( FALSE == isReservoirTransferInProgress() ) && ( reservoirWeight > ( initialReservoirWeight + MAX_IDLE_RSVR_WEIGHT_GAIN_ML ) ) ) { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_INACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE, initialReservoirWeight, reservoirWeight ); + SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_INACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE, initialReservoirWeight, reservoirWeight ); } - } /*********************************************************************//**