Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r544e9782a1b8d444224f41efef38a5204c262722 -r3dd12fb9d032f85126db82ca48812a4652a5b75f
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 544e9782a1b8d444224f41efef38a5204c262722)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 3dd12fb9d032f85126db82ca48812a4652a5b75f)
@@ -69,6 +69,7 @@
 
 static const F32 WATER_SPECIFIC_HEAT_DIVIDED_BY_MINUTES = 4184 / SEC_PER_MIN;                                                      ///< Water specific heat in J/KgC / 60.
 static const F32 PRIMARY_HEATERS_MAXIMUM_POWER_WATTS    = 475 + 237.5F;                                                            ///< Primary heaters maximum power (main primary = 475W and small primary = 237.5W).
+static const F32 HEATERS_VOLTAGE_TOLERANCE_V            = HEATERS_MAX_OPERATING_VOLTAGE_V * HEATERS_MAX_VOLTAGE_OUT_OF_RANGE_TOL;  ///< Heaters voltage tolerance in volts.
 
 /// Heaters exec states
 typedef enum Heaters_Exec_States
@@ -802,7 +803,6 @@
         data.primaryEfficiency      = heatersStatus[ DG_PRIMARY_HEATER ].heaterEfficiency * 100;
         data.primaryCalcTargetTemp  = heatersStatus[ DG_PRIMARY_HEATER ].calculatedTemperature;
         data.trimmerCalcCurrentTemp = heatersStatus[ DG_TRIMMER_HEATER ].calculatedTemperature;
-
         broadcastData( MSG_ID_DG_HEATERS_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( HEATERS_DATA_T ) );
 
         dataPublicationTimerCounter = 0;
@@ -830,21 +830,17 @@
     F32 smallPriDC = heatersStatus[ DG_PRIMARY_HEATER ].dutycycle;
     F32 trimmerDC  = heatersStatus[ DG_TRIMMER_HEATER ].dutycycle;
 
-    F32 mainPriVoltageTol  = HEATERS_MAX_VOLTAGE_OUT_OF_RANGE_TOL * HEATERS_MAX_OPERATING_VOLTAGE_V;
-    F32 smallPriVoltageTol = HEATERS_MAX_VOLTAGE_OUT_OF_RANGE_TOL * HEATERS_MAX_OPERATING_VOLTAGE_V;
-    F32 trimmerVoltageTol  = HEATERS_MAX_VOLTAGE_OUT_OF_RANGE_TOL * HEATERS_MAX_OPERATING_VOLTAGE_V;
-
     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 );
 
-    BOOL isMainPriOut  = ( fabs( mainPriExpectedVoltage  - mainPriVoltage )  > mainPriVoltageTol  ? TRUE : FALSE );
-    BOOL isSmallPriOut = ( fabs( smallPriExpectedVoltage - smallPriVoltage ) > smallPriVoltageTol ? TRUE : FALSE );
-    BOOL isTrimmerOut  = ( fabs( trimmerExpectedVoltage  - trimmerVoltage )  > trimmerVoltageTol  ? TRUE : FALSE );
+    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,  mainPriVoltageTol );
-    //checkPersistentAlarm( ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, isSmallPriOut, smallPriDC, smallPriVoltageTol );
-    //checkPersistentAlarm( ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE,       isTrimmerOut,  trimmerDC,  trimmerVoltageTol );
+    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 );
 }