Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r9acad76a93a069ff0fca6e0503ac4664d6cae5c0 -r2c70c24f7c5ead2322ec56f740277f0654ad281a
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 9acad76a93a069ff0fca6e0503ac4664d6cae5c0)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 2c70c24f7c5ead2322ec56f740277f0654ad281a)
@@ -7,8 +7,8 @@
 *
 * @file    Heaters.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      16-Mar-2023
+* @author  (last)      Dara Navaei
+* @date    (last)      31-Mar-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  23-Apr-2020
@@ -81,7 +81,6 @@
 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.
-static const F32 PRIMARY_HEATER_VOLTAGE_TOLERANCE_V     = HEATERS_MAX_OPERATING_VOLTAGE_V * PRIMARY_HEATER_POWER_TOL;              ///< Primary heater power voltage tolerance in volts.
 
 /// Heaters data structure
 typedef struct
@@ -163,7 +162,6 @@
     initPersistentAlarm( ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_DG_PRIMARY_HEATER_POWER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_RO_FLOW_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON, HEATERS_ON_NO_FLOW_TIMEOUT_MS, HEATERS_ON_NO_FLOW_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON, HEATERS_ON_NO_FLOW_TIMEOUT_MS, HEATERS_ON_NO_FLOW_TIMEOUT_MS );
 
@@ -1021,9 +1019,8 @@
     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() );
+       // 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, getFPGAHeaterGateADCReadCount() );
     }
 
     isMainPriOut  = ( fabs( mainPriExpectedVoltage  - mainPriVoltage )  > HEATERS_VOLTAGE_TOLERANCE_V ? TRUE : FALSE );
@@ -1035,17 +1032,6 @@
         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 );
-
-#ifndef _RELEASE_
-        if ( getHardwareConfigStatus() != HW_CONFIG_BETA )
-#endif
-        {
-            // If the system is DVT, check the primary heater's power line voltage
-            F32 powerMainPriVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_POWER_PRIM_HTR_V );
-            BOOL isPriPowerOut      = ( fabs( powerMainPriVoltage - HEATERS_MAX_OPERATING_VOLTAGE_V ) > PRIMARY_HEATER_VOLTAGE_TOLERANCE_V ? TRUE : FALSE );
-
-            checkPersistentAlarm( ALARM_ID_DG_PRIMARY_HEATER_POWER_VOLTAGE_OUT_OF_RANGE, isPriPowerOut, powerMainPriVoltage, PRIMARY_HEATER_VOLTAGE_TOLERANCE_V );
-        }
     }
 }