Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r3d9542c3bc8df7950b8374a6d91c2b3412de1dd9 -re304bc0cb86a7748e50682522fe8b2b5629a9f9c
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 3d9542c3bc8df7950b8374a6d91c2b3412de1dd9)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision e304bc0cb86a7748e50682522fe8b2b5629a9f9c)
@@ -7,8 +7,8 @@
 *
 * @file    Heaters.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      04-Aug-2022
+* @author  (last)      Bill Bracken
+* @date    (last)      22-Aug-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  23-Apr-2020
@@ -635,6 +635,7 @@
 static HEATERS_STATE_T handleHeaterStateTrimmerControlToTarget( void )
 {
     HEATERS_STATE_T state = HEATER_EXEC_STATE_TRIMMER_CONTROL_TO_TARGET;
+    F32 tempDutyCycle     = 0.0;
 
     // If the inactive reservoir has changed from the last run transition to ramp state to recalculate the
     // duty cycle for the next delivery
@@ -650,9 +651,13 @@
         F32 targetTemperature          = heatersStatus[ DG_TRIMMER_HEATER ].targetTemp;
         F32 targetFlowLPM              = heatersStatus[ DG_TRIMMER_HEATER ].targetFlow;
         F32 dutyCycle                  = calculateTrimmerHeaterDutyCycle( targetTemperature, outletRedundantTemperature, targetFlowLPM, TRUE );
-
         trimmerHeaterControlCounter    = 0;
-        setHeaterDutyCycle( DG_TRIMMER_HEATER, ( heatersStatus[ DG_TRIMMER_HEATER ].dutyCycle + dutyCycle ) );
+
+        tempDutyCycle = heatersStatus[ DG_TRIMMER_HEATER ].dutyCycle + dutyCycle;
+        tempDutyCycle = MIN( tempDutyCycle, HEATERS_MAX_DUTY_CYCLE );
+        tempDutyCycle = MAX( tempDutyCycle, HEATERS_MIN_DUTY_CYCLE );
+
+        setHeaterDutyCycle( DG_TRIMMER_HEATER, tempDutyCycle );
     }
 
     return state;
@@ -857,7 +862,7 @@
 static void monitorHeatersVoltage( void )
 {
     // NOTE: Default to using Primary heater voltage from FPGA
-    F32 mainPriVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_PRIM_HTR_V );;
+    F32 mainPriVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_PRIM_HTR_V );
 #ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) )
     {
@@ -873,17 +878,17 @@
     F32 smallPriDC = heatersStatus[ DG_PRIMARY_HEATER ].dutyCycle;
     F32 trimmerDC  = heatersStatus[ DG_TRIMMER_HEATER ].dutyCycle;
 
-    F32 mainPriExpectedVoltage  = HEATERS_MAX_OPERATING_VOLTAGE_V * ( 1.0 - mainPriDC );
-    F32 smallPriExpectedVoltage = HEATERS_MAX_OPERATING_VOLTAGE_V * ( 1.0 - smallPriDC );
-    F32 trimmerExpectedVoltage  = HEATERS_MAX_OPERATING_VOLTAGE_V * ( 1.0 - trimmerDC );
+    F32 mainPriExpectedVoltage  = HEATERS_MAX_OPERATING_VOLTAGE_V * ( 1.0F - mainPriDC );
+    F32 smallPriExpectedVoltage = HEATERS_MAX_OPERATING_VOLTAGE_V * ( 1.0F - smallPriDC );
+    F32 trimmerExpectedVoltage  = HEATERS_MAX_OPERATING_VOLTAGE_V * ( 1.0F - trimmerDC );
 
     BOOL isMainPriOut  = ( fabs( mainPriExpectedVoltage  - mainPriVoltage )  > HEATERS_VOLTAGE_TOLERANCE_V ? TRUE : FALSE );
     BOOL isSmallPriOut = ( fabs( smallPriExpectedVoltage - smallPriVoltage ) > HEATERS_VOLTAGE_TOLERANCE_V ? TRUE : FALSE );
     BOOL isTrimmerOut  = ( fabs( trimmerExpectedVoltage  - trimmerVoltage )  > HEATERS_VOLTAGE_TOLERANCE_V ? TRUE : FALSE );
 
-    //checkPersistentAlarm( ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE,  isMainPriOut,  mainPriDC,  HEATERS_VOLTAGE_TOLERANCE_V );
-    //checkPersistentAlarm( ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, isSmallPriOut, smallPriDC, HEATERS_VOLTAGE_TOLERANCE_V );
-    //checkPersistentAlarm( ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE,       isTrimmerOut,  trimmerDC,  HEATERS_VOLTAGE_TOLERANCE_V );
+    checkPersistentAlarm( ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE,  isMainPriOut,  mainPriDC,  HEATERS_VOLTAGE_TOLERANCE_V );
+    checkPersistentAlarm( ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, isSmallPriOut, smallPriDC, HEATERS_VOLTAGE_TOLERANCE_V );
+    checkPersistentAlarm( ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE,       isTrimmerOut,  trimmerDC,  HEATERS_VOLTAGE_TOLERANCE_V );
 }