Index: firmware/App/Controllers/ConcentratePumps.h =================================================================== diff -u -reae0635792a827b7cf9197cf6f6e253f2a094260 -r335d28f954aed9522d5cc71863cd8dc253070758 --- firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision eae0635792a827b7cf9197cf6f6e253f2a094260) +++ firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision 335d28f954aed9522d5cc71863cd8dc253070758) @@ -33,6 +33,9 @@ #define CONCENTRATE_PUMP_MAX_SPEED 48.0F ///< Maximum speed for concentrate pump in mL/min +#define PARK_CONC_PUMPS TRUE ///< For park parameter to requestConcentratePumpOff(). +#define NO_PARK_CONC_PUMPS FALSE ///< For park parameter to requestConcentratePumpOff(). + /// Enumeration of concentrate pumps. typedef enum ConcentratePumps { Index: firmware/App/Modes/ModeChemicalDisinfect.c =================================================================== diff -u -rd48e02f028dbd430bedda41be0173fbfc45116d7 -r335d28f954aed9522d5cc71863cd8dc253070758 --- firmware/App/Modes/ModeChemicalDisinfect.c (.../ModeChemicalDisinfect.c) (revision d48e02f028dbd430bedda41be0173fbfc45116d7) +++ firmware/App/Modes/ModeChemicalDisinfect.c (.../ModeChemicalDisinfect.c) (revision 335d28f954aed9522d5cc71863cd8dc253070758) @@ -732,7 +732,7 @@ rsrvr2Status = DG_RESERVOIR_BELOW_TARGET; // Turn off the concentrate pumps - requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, FALSE ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); setValveState( VPO, VALVE_STATE_FILL_C_TO_NC ); setValveState( VRF, VALVE_STATE_R1_C_TO_NC ); @@ -1028,7 +1028,7 @@ { // Turn off the concentrate pump for now until there is sufficient RO flow to turn it // back for mixing - requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, FALSE ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); // Prepare for filling the reservoirs and heating the water setValveState( VPI, VALVE_STATE_OPEN ); @@ -1120,7 +1120,7 @@ setValveState( VRC, VALVE_STATE_RECIRC_C_TO_NC ); // Done with mixing acid - requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, FALSE ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); // Set the drain pump to control mode setDrainPumpTargetOutletPressure( CHEM_DISINFECT_TARGET_DRAIN_PRES_PSI ); @@ -1207,7 +1207,7 @@ case CHEM_DISINFECT_COMPLETE: // Turn off the concentrate pumps - requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, FALSE ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); // Set the valves to transfer hot water from R1 to R2 and fill up R2. setValveState( VRO, VALVE_STATE_R2_C_TO_NC ); Index: firmware/App/Modes/ModeDrain.c =================================================================== diff -u -reae0635792a827b7cf9197cf6f6e253f2a094260 -r335d28f954aed9522d5cc71863cd8dc253070758 --- firmware/App/Modes/ModeDrain.c (.../ModeDrain.c) (revision eae0635792a827b7cf9197cf6f6e253f2a094260) +++ firmware/App/Modes/ModeDrain.c (.../ModeDrain.c) (revision 335d28f954aed9522d5cc71863cd8dc253070758) @@ -346,8 +346,8 @@ if ( ++rinseConcentrateLinesTimerCtr > RINSE_CONCENTRATE_LINES_WAIT ) { rinseConcentrateLinesTimerCtr = 0; - requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, FALSE ); - requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, FALSE ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); requestNewOperationMode( DG_MODE_GENE ); } } Index: firmware/App/Modes/ModeFault.h =================================================================== diff -u -rd48e02f028dbd430bedda41be0173fbfc45116d7 -r335d28f954aed9522d5cc71863cd8dc253070758 --- firmware/App/Modes/ModeFault.h (.../ModeFault.h) (revision d48e02f028dbd430bedda41be0173fbfc45116d7) +++ firmware/App/Modes/ModeFault.h (.../ModeFault.h) (revision 335d28f954aed9522d5cc71863cd8dc253070758) @@ -31,9 +31,6 @@ // ********** public definitions ********** -#define PARK_CONC_PUMPS TRUE -#define NO_PARK_CONC_PUMPS FALSE - // ********** public function prototypes ********** void initFaultMode( void ); // initialize this module Index: firmware/App/Modes/ModeFill.c =================================================================== diff -u -r0b121a7c92a8d86f8369b7094b0bce21389f3747 -r335d28f954aed9522d5cc71863cd8dc253070758 --- firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision 0b121a7c92a8d86f8369b7094b0bce21389f3747) +++ firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision 335d28f954aed9522d5cc71863cd8dc253070758) @@ -491,8 +491,8 @@ if ( TRUE == didTimeout( concentratePrimingStartTime, PRIME_CONCENTRATE_LINES_TIME_OUT_MS ) ) { - requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, FALSE ); - requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, FALSE ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); // Set the RO pump flow rate in according to the roPumpFlushBubblesSpeed table to flush bubbles pumpSpeedIndex = 0; @@ -585,7 +585,7 @@ if ( TRUE == isConductivityInRange ) { // Initialization - requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, FALSE ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); totalBicarbConductivity = 0.0F; totalAcidConductivity = 0.0F; bicarbConductivitySampleCount = 0; @@ -866,8 +866,8 @@ { setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO ); setROPumpTargetFlowRateLPM( TARGET_RO_FLOW_RATE_IN_PAUSE_L, TARGET_RO_PRESSURE_PSI ); - requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, FALSE ); - requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, FALSE ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); havePauseActuatorsBeenSet = TRUE; } Index: firmware/App/Modes/ModeFlush.c =================================================================== diff -u -r022c733838d8c06b1562dbafa64f1643cb1bb8c8 -r335d28f954aed9522d5cc71863cd8dc253070758 --- firmware/App/Modes/ModeFlush.c (.../ModeFlush.c) (revision 022c733838d8c06b1562dbafa64f1643cb1bb8c8) +++ firmware/App/Modes/ModeFlush.c (.../ModeFlush.c) (revision 335d28f954aed9522d5cc71863cd8dc253070758) @@ -537,8 +537,8 @@ if ( TRUE == didTimeout( stateTimerStart, FLUSH_CONCENTRATE_STRAWS_TIME_MS ) ) { // Done with flushing the concentrate pumps line - requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, FALSE ); - requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, FALSE ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); setValveState( VPO, VALVE_STATE_FILL_C_TO_NC ); setValveState( VRF, VALVE_STATE_R1_C_TO_NC ); Index: firmware/App/Modes/ModeGenIdle.c =================================================================== diff -u -reae0635792a827b7cf9197cf6f6e253f2a094260 -r335d28f954aed9522d5cc71863cd8dc253070758 --- firmware/App/Modes/ModeGenIdle.c (.../ModeGenIdle.c) (revision eae0635792a827b7cf9197cf6f6e253f2a094260) +++ firmware/App/Modes/ModeGenIdle.c (.../ModeGenIdle.c) (revision 335d28f954aed9522d5cc71863cd8dc253070758) @@ -115,8 +115,8 @@ setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO ); signalDrainPumpHardStop(); - requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, FALSE ); - requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, FALSE ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); // UV reactors on turnOnUVReactor( INLET_UV_REACTOR ); Index: firmware/App/Modes/ModeHeatDisinfect.c =================================================================== diff -u -r329409d63c11fd7d7fc8c3d3dd1d96e4e5a109dc -r335d28f954aed9522d5cc71863cd8dc253070758 --- firmware/App/Modes/ModeHeatDisinfect.c (.../ModeHeatDisinfect.c) (revision 329409d63c11fd7d7fc8c3d3dd1d96e4e5a109dc) +++ firmware/App/Modes/ModeHeatDisinfect.c (.../ModeHeatDisinfect.c) (revision 335d28f954aed9522d5cc71863cd8dc253070758) @@ -661,8 +661,8 @@ rsrvr2Status = DG_RESERVOIR_BELOW_TARGET; // Done with flushing the concentrate pumps line - requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, FALSE ); - requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, FALSE ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); setValveState( VPO, VALVE_STATE_FILL_C_TO_NC ); setValveState( VRF, VALVE_STATE_R1_C_TO_NC ); @@ -1045,8 +1045,8 @@ case HEAT_DISINFECT_COMPLETE: - requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, FALSE ); - requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, FALSE ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); // Set the valves to transfer hot water from R1 to R2 and fill up R2. setValveState( VRO, VALVE_STATE_R2_C_TO_NC ); setValveState( VRD1, VALVE_STATE_OPEN ); @@ -1172,8 +1172,8 @@ break; case HEAT_DISINFECT_COMPLETE: - requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, FALSE ); - requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, FALSE ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS ); + requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS ); // Turn off the heaters stopHeater( DG_PRIMARY_HEATER ); stopHeater( DG_TRIMMER_HEATER ); Index: firmware/App/Modes/ModeHeatDisinfectActiveCool.c =================================================================== diff -u -rf2ac7396ceab9a8c0a995c58a49be54ba66eda4f -r335d28f954aed9522d5cc71863cd8dc253070758 --- firmware/App/Modes/ModeHeatDisinfectActiveCool.c (.../ModeHeatDisinfectActiveCool.c) (revision f2ac7396ceab9a8c0a995c58a49be54ba66eda4f) +++ firmware/App/Modes/ModeHeatDisinfectActiveCool.c (.../ModeHeatDisinfectActiveCool.c) (revision 335d28f954aed9522d5cc71863cd8dc253070758) @@ -1,4 +1,5 @@ +#include "ConcentratePumps.h" #include "CPLD.h" #include "MessageSupport.h" #include "ModeFault.h" Index: firmware/App/Modes/ModeService.c =================================================================== diff -u -rd48e02f028dbd430bedda41be0173fbfc45116d7 -r335d28f954aed9522d5cc71863cd8dc253070758 --- firmware/App/Modes/ModeService.c (.../ModeService.c) (revision d48e02f028dbd430bedda41be0173fbfc45116d7) +++ firmware/App/Modes/ModeService.c (.../ModeService.c) (revision 335d28f954aed9522d5cc71863cd8dc253070758) @@ -15,9 +15,10 @@ * ***************************************************************************/ -#include "OperationModes.h" -#include "ModeService.h" +#include "ConcentratePumps.h" #include "CPLD.h" +#include "ModeService.h" +#include "OperationModes.h" /** * @addtogroup DGServiceMode Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r5d3e28c19ae10a99a5ce1fc5c010ac944975a6a1 -r335d28f954aed9522d5cc71863cd8dc253070758 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 5d3e28c19ae10a99a5ce1fc5c010ac944975a6a1) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 335d28f954aed9522d5cc71863cd8dc253070758) @@ -2805,7 +2805,7 @@ } else { - requestConcentratePumpOff( ( CONCENTRATE_PUMPS_T )payload.index, FALSE ); + requestConcentratePumpOff( ( CONCENTRATE_PUMPS_T )payload.index, NO_PARK_CONC_PUMPS ); } }