Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -re398b4bd8bfacd05a021d6008dbccf3c38f2c5d1 -r696e732c9742535a58b9c65f243df7cd797d1423
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision e398b4bd8bfacd05a021d6008dbccf3c38f2c5d1)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 696e732c9742535a58b9c65f243df7cd797d1423)
@@ -49,7 +49,7 @@
 
 #define HEATERS_MAX_DUTY_CYCLE                                     1.00F                                                           ///< Heaters max duty cycle (100%).
 #define HEATERS_MIN_DUTY_CYCLE                                     0.00F                                                           ///< Heaters minimum duty cycle (0.00%).
-#define HEATERS_DISINFECT_DUTY_CYCLE                               0.60F                                                           ///< Heaters disinfect cycle.
+#define HEATERS_DISINFECT_DUTY_CYCLE                               0.70F                                                           ///< Heaters disinfect cycle.
 #define HEATERS_DISINFECT_TEMPERATURE_DRIFT_C                      3.0F                                                            ///< Heaters disinfect temperature drift in C.
 #define HEATERS_MIN_EST_GAIN                                       0.2F                                                            ///< Heaters minimum estimation gain.
 #define HEATERS_MAX_EST_GAIN                                       5.0F                                                            ///< Heaters maximum estimation gain.
@@ -871,8 +871,24 @@
  *************************************************************************/
 static void monitorHeatersVoltage( void )
 {
-    F32 mainPriVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_GND_MAIN_PRIM_HTR_V );
+    F32 mainPriVoltage  = getMonitoredLineLevel( MONITORED_LINE_24V_GND_MAIN_PRIM_HTR_V );
+    F32 smallPriVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_GND_SMALL_PRIM_HTR_V );
+    F32 trimmerVoltage  = getMonitoredLineLevel( MONITORED_LINE_24V_GND_TRIM_HTR_V );
 
+    // Voltage to PWM is reverse. If PWM = 0 -> V = 24V
+    F32 mainPriDC  = heatersStatus[ DG_PRIMARY_HEATER ].dutyCycle;
+    F32 smallPriDC = heatersStatus[ DG_PRIMARY_HEATER ].dutyCycle;
+    F32 trimmerDC  = heatersStatus[ DG_TRIMMER_HEATER ].dutyCycle;
+
+    // The expected voltage is the inverse of the duty cycle
+    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  = FALSE;
+    BOOL isSmallPriOut = FALSE;
+    BOOL isTrimmerOut  = FALSE;
+
 #ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) )
     {
@@ -887,22 +903,10 @@
         //checkFPGAPersistentAlarms( FPGA_PERS_ERROR_MAIN_PRIMARY_HEATER_VOLTAGE_ADC, getFPGAHeaterGateADCErrorCount(), getFPGAHeaterGateADCReadCount() );
     }
 
-    F32 smallPriVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_GND_SMALL_PRIM_HTR_V );
-    F32 trimmerVoltage  = getMonitoredLineLevel( MONITORED_LINE_24V_GND_TRIM_HTR_V );
+    isMainPriOut  = ( fabs( mainPriExpectedVoltage  - mainPriVoltage )  > HEATERS_VOLTAGE_TOLERANCE_V ? TRUE : FALSE );
+    isSmallPriOut = ( fabs( smallPriExpectedVoltage - smallPriVoltage ) > HEATERS_VOLTAGE_TOLERANCE_V ? TRUE : FALSE );
+    isTrimmerOut  = ( fabs( trimmerExpectedVoltage  - trimmerVoltage )  > HEATERS_VOLTAGE_TOLERANCE_V ? TRUE : FALSE );
 
-    // Voltage to PWM is reverse. If PWM = 0 -> V = 24V
-    F32 mainPriDC  = heatersStatus[ DG_PRIMARY_HEATER ].dutyCycle;
-    F32 smallPriDC = heatersStatus[ DG_PRIMARY_HEATER ].dutyCycle;
-    F32 trimmerDC  = heatersStatus[ DG_TRIMMER_HEATER ].dutyCycle;
-
-    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 );
-
     if ( getCurrentOperationMode() != DG_MODE_INIT )
     {
         checkPersistentAlarm( ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE,  isMainPriOut,  mainPriDC,  HEATERS_VOLTAGE_TOLERANCE_V );