Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r47ac2fffcf33a27396bc924068d9e320cd1cd684 -r0393f47526aae8f1aa456429886d8684689535bf
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 47ac2fffcf33a27396bc924068d9e320cd1cd684)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 0393f47526aae8f1aa456429886d8684689535bf)
@@ -8,7 +8,7 @@
 * @file    Heaters.c
 *
 * @author  (last)      Michael Garthwaite
-* @date    (last)      16-Mar-2023
+* @date    (last)      31-Mar-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  23-Apr-2020
@@ -115,7 +115,7 @@
 static HEATERS_STATE_T handleHeaterStateTrimmerRampToTarget( void );
 static HEATERS_STATE_T handleHeaterStateTrimmerControlToTarget( void );
 
-static void setHeaterDutyCycle( DG_HEATERS_T heater, F32 pwm );
+static void setHeaterDutyCycle( DG_HEATERS_T heater );
 static F32  calculatePrimaryHeaterDutyCycle( F32 targetTemperature, F32 currentTemperature, F32 flow, BOOL checkEfficiency );
 static F32  calculateTrimmerHeaterDutyCycle( F32 targetTemperature, F32 currentTemperature, F32 flow, BOOL checkEfficiency );
 static BOOL haveHeaterControlConditionsChanged( DG_HEATERS_T heater );
@@ -341,7 +341,8 @@
         // Check if the heater is requested to be off
         if ( FALSE == heatersStatus[ heater ].isHeaterOn )
         {
-            setHeaterDutyCycle( heater, HEATERS_MIN_DUTY_CYCLE );
+            heatersStatus[ heater ].dutyCycle.data = HEATERS_MIN_DUTY_CYCLE;
+            setHeaterDutyCycle( heater );
             heatersStatus[ heater ].state = HEATER_EXEC_STATE_OFF;
         }
     }
@@ -560,7 +561,8 @@
     heatersStatus[ DG_PRIMARY_HEATER ].calculatedTemperatureC = targetTemperature;
     heatersStatus[ DG_PRIMARY_HEATER ].targetFlowLPM          = targetFlowLPM;
     heatersStatus[ DG_PRIMARY_HEATER ].nomTargetFlowLPM       = getTargetROPumpFlowRateLPM();
-    setHeaterDutyCycle( heater, dutyCycle );
+    heatersStatus[ DG_PRIMARY_HEATER ].dutyCycle.data         = dutyCycle;
+    setHeaterDutyCycle( heater );
 
     return state;
 }
@@ -592,7 +594,8 @@
         heatersStatus[ heater ].calculatedTemperatureC = targetTemperature;
         heatersStatus[ heater ].targetFlowLPM          = targetFlow;
         heatersStatus[ heater ].hasTargetTempChanged   = FALSE;
-        setHeaterDutyCycle( heater, dutyCycle );
+        heatersStatus[ heater ].dutyCycle.data = dutyCycle;
+        setHeaterDutyCycle( heater );
     }
 
     return state;
@@ -616,18 +619,24 @@
 
     if ( currentTemperature < targetTemperature )
     {
-        setHeaterDutyCycle( DG_TRIMMER_HEATER, HEATERS_MAX_DUTY_CYCLE );
-        setHeaterDutyCycle( DG_PRIMARY_HEATER, HEATERS_MAX_DUTY_CYCLE );
+        heatersStatus[ DG_TRIMMER_HEATER ].dutyCycle.data = HEATERS_MAX_DUTY_CYCLE;
+        heatersStatus[ DG_PRIMARY_HEATER ].dutyCycle.data = HEATERS_MAX_DUTY_CYCLE;
+        setHeaterDutyCycle( DG_TRIMMER_HEATER );
+        setHeaterDutyCycle( DG_PRIMARY_HEATER );
     }
     else if ( currentTemperature - targetTemperature < HEATERS_DISINFECT_TEMPERATURE_DRIFT_C )
     {
-        setHeaterDutyCycle( DG_TRIMMER_HEATER, HEATERS_DISINFECT_DUTY_CYCLE );
-        setHeaterDutyCycle( DG_PRIMARY_HEATER, HEATERS_DISINFECT_DUTY_CYCLE );
+        heatersStatus[ DG_TRIMMER_HEATER ].dutyCycle.data = HEATERS_DISINFECT_DUTY_CYCLE;
+        heatersStatus[ DG_PRIMARY_HEATER ].dutyCycle.data = HEATERS_DISINFECT_DUTY_CYCLE;
+        setHeaterDutyCycle( DG_TRIMMER_HEATER );
+        setHeaterDutyCycle( DG_PRIMARY_HEATER );
     }
     else
     {
-        setHeaterDutyCycle( DG_TRIMMER_HEATER, HEATERS_MIN_DUTY_CYCLE );
-        setHeaterDutyCycle( DG_PRIMARY_HEATER, HEATERS_MIN_DUTY_CYCLE );
+        heatersStatus[ DG_TRIMMER_HEATER ].dutyCycle.data = HEATERS_MIN_DUTY_CYCLE;
+        heatersStatus[ DG_PRIMARY_HEATER ].dutyCycle.data = HEATERS_MIN_DUTY_CYCLE;
+        setHeaterDutyCycle( DG_TRIMMER_HEATER );
+        setHeaterDutyCycle( DG_PRIMARY_HEATER );
     }
 
     return state;
@@ -691,8 +700,8 @@
     heatersStatus[ heater ].isThisFirstControl     = TRUE;
 
     // Cap the minimum duty cycle. So if it is calculated to negative, set it to 0
-    dutyCycle = MAX( dutyCycle, HEATERS_MIN_DUTY_CYCLE );
-    setHeaterDutyCycle( heater, dutyCycle );
+    heatersStatus[ heater ].dutyCycle.data = MAX( dutyCycle, HEATERS_MIN_DUTY_CYCLE );
+    setHeaterDutyCycle( heater );
 
     return state;
 }
@@ -735,8 +744,8 @@
         tempDutyCycle = heatersStatus[ heater ].dutyCycle.data + dutyCycle;
         tempDutyCycle = MIN( tempDutyCycle, HEATERS_MAX_DUTY_CYCLE );
         tempDutyCycle = MAX( tempDutyCycle, HEATERS_MIN_DUTY_CYCLE );
-
-        setHeaterDutyCycle( heater, tempDutyCycle );
+        heatersStatus[ heater ].dutyCycle.data = tempDutyCycle;
+        setHeaterDutyCycle( heater );
     }
 
     return state;
@@ -751,14 +760,13 @@
  * @param pwm: The PWM that is set
  * @return none
  *************************************************************************/
-static void setHeaterDutyCycle( DG_HEATERS_T heater, F32 pwm )
+static void setHeaterDutyCycle( DG_HEATERS_T heater )
 {
     if ( heater < NUM_OF_DG_HEATERS )
     {
         F32 duty;
 
-        heatersStatus[ heater ].dutyCycle.data = pwm;
-        duty                                   = getHeaterDutyCycle( heater );
+        duty = getHeaterDutyCycle( heater );
 
         if ( DG_PRIMARY_HEATER == heater )
         {
@@ -1065,7 +1073,7 @@
 
             if ( TRUE == heatersStatus[ (DG_HEATERS_T)heater ].isHeaterOn )
             {
-                setHeaterDutyCycle( (DG_HEATERS_T)heater, value );
+                setHeaterDutyCycle( (DG_HEATERS_T)heater );
             }
         }
     }
@@ -1090,11 +1098,8 @@
         result                                                   = TRUE;
         heatersStatus[ (DG_HEATERS_T)heater ].dutyCycle.override = OVERRIDE_RESET;
         heatersStatus[ (DG_HEATERS_T)heater ].dutyCycle.ovData   = heatersStatus[ (DG_HEATERS_T)heater ].dutyCycle.ovInitData;
+        setHeaterDutyCycle( (DG_HEATERS_T)heater );
 
-        if ( TRUE == heatersStatus[ (DG_HEATERS_T)heater ].isHeaterOn )
-        {
-            setHeaterDutyCycle( (DG_HEATERS_T)heater, heatersStatus[ (DG_HEATERS_T)heater ].dutyCycle.data );
-        }
     }
 
     return result;