Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r62b202c33e90b032326da24aa4067e2f5032f448 -re88c2cfc5d6b693d8c85cbb5bc81836b04ad3b2b
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 62b202c33e90b032326da24aa4067e2f5032f448)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision e88c2cfc5d6b693d8c85cbb5bc81836b04ad3b2b)
@@ -546,17 +546,19 @@
     {
         F32 tempDutyCycle     = 0.0F;
         F32 targetTemperature = heatersStatus[ DG_TRIMMER_HEATER ].targetTemp;
-        F32 targetFlowLPM     = heatersStatus[ DG_TRIMMER_HEATER ].targetFlow;
+        F32 targetFlowLPM     = getTargetROPumpFlowRateLPM();
         F32 dutyCycle         = calculateTrimmerHeaterDutyCycle( targetTemperature, heatDisinfectSensorTemp, targetFlowLPM, FALSE );
         heaterControlCounter  = 0;
         // Trimmer heater duty cycle function checks the minimum to -100%. So if the duty cycle was calculated to be negative it is set to 0 here
         tempDutyCycle         = MAX( dutyCycle, HEATERS_MIN_DUTY_CYCLE );
+        heatersStatus[ DG_TRIMMER_HEATER ].targetFlow = getTargetROPumpFlowRateLPM();
 
         setHeaterDutyCycle( DG_TRIMMER_HEATER, tempDutyCycle );
 
         targetTemperature = heatersStatus[ DG_PRIMARY_HEATER ].targetTemp;
-        targetFlowLPM     = heatersStatus[ DG_PRIMARY_HEATER ].targetFlow;
+        targetFlowLPM     = getTargetROPumpFlowRateLPM();
         dutyCycle         = calculatePrimaryHeaterDutyCycle( targetTemperature, heatDisinfectSensorTemp, targetFlowLPM, FALSE );
+        heatersStatus[ DG_PRIMARY_HEATER ].targetFlow = getTargetROPumpFlowRateLPM();
 
         setHeaterDutyCycle( DG_PRIMARY_HEATER, dutyCycle );
     }
@@ -885,8 +887,9 @@
     else
 #endif
     {
+        // TODO this is not working on DVT-002
         // If the system is DVT, check the FPGA persistent alarm of the main primary heater's voltage ADC
-        checkFPGAPersistentAlarms( FPGA_PERS_ERROR_MAIN_PRIMARY_HEATER_VOLTAGE_ADC, getFPGAHeaterGateADCErrorCount(), getFPGAHeaterGateADCReadCount() );
+        //checkFPGAPersistentAlarms( FPGA_PERS_ERROR_MAIN_PRIMARY_HEATER_VOLTAGE_ADC, getFPGAHeaterGateADCErrorCount(), getFPGAHeaterGateADCReadCount() );
     }
 
     F32 smallPriVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_GND_SMALL_PRIM_HTR_V );