Index: firmware/App/Modes/ModeChemicalDisinfect.c =================================================================== diff -u -rcea079b61dbd17b2ddaec99b1124248147d14e72 -rba0335ef18c7859109251f130178acc785c1d39e --- firmware/App/Modes/ModeChemicalDisinfect.c (.../ModeChemicalDisinfect.c) (revision cea079b61dbd17b2ddaec99b1124248147d14e72) +++ firmware/App/Modes/ModeChemicalDisinfect.c (.../ModeChemicalDisinfect.c) (revision ba0335ef18c7859109251f130178acc785c1d39e) @@ -937,12 +937,12 @@ // Done with draining the reservoirs signalDrainPumpHardStop(); - // The bicarb line is used to inject the acid into the fluid path during chemical disinfect - requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2_BICARB ); - // Set the concentrate pump to run at a constant speed during priming setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, CONC_PUMP_PRIME_SPEED_ML_PER_MIN ); + // The bicarb line is used to inject the acid into the fluid path during chemical disinfect + requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2_BICARB ); + // Start the timer for drain timeout stateTimer = getMSTimerCount(); state = DG_CHEM_DISINFECT_STATE_PRIME_ACID_LINE; Index: firmware/App/Modes/ModeHeatDisinfect.c =================================================================== diff -u -rcea079b61dbd17b2ddaec99b1124248147d14e72 -rba0335ef18c7859109251f130178acc785c1d39e --- firmware/App/Modes/ModeHeatDisinfect.c (.../ModeHeatDisinfect.c) (revision cea079b61dbd17b2ddaec99b1124248147d14e72) +++ firmware/App/Modes/ModeHeatDisinfect.c (.../ModeHeatDisinfect.c) (revision ba0335ef18c7859109251f130178acc785c1d39e) @@ -699,13 +699,13 @@ { areTempSensorsInRange = TRUE; #ifndef IGNORE_CONC_PUMP_IN_HEAT_DISINFECT - // Turn on the concentrate pumps - requestConcentratePumpsOn( CONCENTRATEPUMPS_CP1_ACID ); - requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2_BICARB ); - // Turn the pumps on in reverse setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, CONC_PUMPS_REVERSE_SPEED_ML_PER_MIN ); setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, CONC_PUMPS_REVERSE_SPEED_ML_PER_MIN ); + + // Turn on the concentrate pumps + requestConcentratePumpsOn( CONCENTRATEPUMPS_CP1_ACID ); + requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2_BICARB ); #endif concentratePumpsPrimeTimer = getMSTimerCount(); } @@ -1627,13 +1627,13 @@ // Turn on the drain pump to drain R2 setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM ); #ifndef IGNORE_CONC_PUMP_IN_HEAT_DISINFECT - // Turn on the concentrate pumps - requestConcentratePumpsOn( CONCENTRATEPUMPS_CP1_ACID ); - requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2_BICARB ); - // Turn the pumps on in reverse setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, CONC_PUMPS_REVERSE_SPEED_ML_PER_MIN ); setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, CONC_PUMPS_REVERSE_SPEED_ML_PER_MIN ); + + // Turn on the concentrate pumps + requestConcentratePumpsOn( CONCENTRATEPUMPS_CP1_ACID ); + requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2_BICARB ); #endif // This is the last drain of heat disinfect cycle @@ -2022,14 +2022,14 @@ { heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_DISINFECT_RESERVOIR_1; #ifndef IGNORE_CONC_PUMP_IN_HEAT_DISINFECT + // Turn the pumps on in reverse + setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, CONC_PUMPS_REVERSE_SPEED_ML_PER_MIN ); + setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, CONC_PUMPS_REVERSE_SPEED_ML_PER_MIN ); + // During R1 to R2 disinfect, concentrate pump is run // Turn on the concentrate pumps requestConcentratePumpsOn( CONCENTRATEPUMPS_CP1_ACID ); requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2_BICARB ); - - // Turn the pumps on in reverse - setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, CONC_PUMPS_REVERSE_SPEED_ML_PER_MIN ); - setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, CONC_PUMPS_REVERSE_SPEED_ML_PER_MIN ); #endif } else Index: firmware/DG.dil =================================================================== diff -u -rcea079b61dbd17b2ddaec99b1124248147d14e72 -rba0335ef18c7859109251f130178acc785c1d39e --- firmware/DG.dil (.../DG.dil) (revision cea079b61dbd17b2ddaec99b1124248147d14e72) +++ firmware/DG.dil (.../DG.dil) (revision ba0335ef18c7859109251f130178acc785c1d39e) @@ -1,4 +1,4 @@ -# RM46L852PGE 06/16/21 11:12:38 +# RM46L852PGE 06/17/21 10:51:22 # ARCH=RM46L852PGE # @@ -6171,7 +6171,7 @@ DRIVER.HET.VAR.HET2_PWM1_DUTY.VALUE=50 DRIVER.HET.VAR.HET1_PWM7_POLARITY.VALUE=3 DRIVER.HET.VAR.HET1_PWM3_ENA.VALUE=0 -DRIVER.HET.VAR.HET1_BIT24_HRSHARE.VALUE=0x00001000 +DRIVER.HET.VAR.HET1_BIT24_HRSHARE.VALUE=0x00000000 DRIVER.HET.VAR.HET1_BIT16_HRSHARE.VALUE=0x00000000 DRIVER.HET.VAR.HET1_BIT10_PULDIS.VALUE=0x00000000 DRIVER.HET.VAR.HET2_PWM5_PIN_SELECT.VALUE=17 Index: firmware/include/het.h =================================================================== diff -u -rcea079b61dbd17b2ddaec99b1124248147d14e72 -rba0335ef18c7859109251f130178acc785c1d39e --- firmware/include/het.h (.../het.h) (revision cea079b61dbd17b2ddaec99b1124248147d14e72) +++ firmware/include/het.h (.../het.h) (revision ba0335ef18c7859109251f130178acc785c1d39e) @@ -467,7 +467,6 @@ #define HET1_HRSH_CONFIGVALUE ((uint32)0x00000000U \ | (uint32)0x00000000U \ | (uint32)0x00000000U \ - | (uint32)0x00001000U \ | (uint32)0x00000000U \ | (uint32)0x00000000U \ | (uint32)0x00000000U \ @@ -476,6 +475,7 @@ | (uint32)0x00000000U \ | (uint32)0x00000000U \ | (uint32)0x00000000U \ + | (uint32)0x00000000U \ | (uint32)0x00000008U \ | (uint32)0x00000004U \ | (uint32)0x00000000U \ Index: firmware/source/het.c =================================================================== diff -u -rcea079b61dbd17b2ddaec99b1124248147d14e72 -rba0335ef18c7859109251f130178acc785c1d39e --- firmware/source/het.c (.../het.c) (revision cea079b61dbd17b2ddaec99b1124248147d14e72) +++ firmware/source/het.c (.../het.c) (revision ba0335ef18c7859109251f130178acc785c1d39e) @@ -1250,7 +1250,6 @@ hetREG1->HRSH = (uint32) 0x00000000U | (uint32) 0x00000000U | (uint32) 0x00000000U - | (uint32) 0x00001000U | (uint32) 0x00000000U | (uint32) 0x00000000U | (uint32) 0x00000000U @@ -1259,6 +1258,7 @@ | (uint32) 0x00000000U | (uint32) 0x00000000U | (uint32) 0x00000000U + | (uint32) 0x00000000U | (uint32) 0x00000008U | (uint32) 0x00000004U | (uint32) 0x00000000U