Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r56ba1b163b0cbf6953638065b2108f745b17ec8f -rf93ec3de5b9ce8b8d62a06378d12f10fe01a4365
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 56ba1b163b0cbf6953638065b2108f745b17ec8f)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision f93ec3de5b9ce8b8d62a06378d12f10fe01a4365)
@@ -518,6 +518,7 @@
 
     switch ( board )
     {
+        // TODO should check Rx FIFO to see if a character exists?
         case EMSTAT_CPI_CPO_BOARD:
             emstatByte     = getFPGAEmstatCPiCPoByteOut();
             fpgaErrorCount = getFPGAEmstatCPiCPoRxErrCount();
Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r56ba1b163b0cbf6953638065b2108f745b17ec8f -rf93ec3de5b9ce8b8d62a06378d12f10fe01a4365
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 56ba1b163b0cbf6953638065b2108f745b17ec8f)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision f93ec3de5b9ce8b8d62a06378d12f10fe01a4365)
@@ -998,7 +998,7 @@
     {
         // 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() );
+        checkFPGAPersistentAlarms( FPGA_PERS_ERROR_MAIN_PRIMARY_HEATER_VOLTAGE_ADC, getFPGAHeaterGateADCReadCount() );
     }
 
     isMainPriOut  = ( fabs( mainPriExpectedVoltage  - mainPriVoltage )  > HEATERS_VOLTAGE_TOLERANCE_V ? TRUE : FALSE );
Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -r4c7ef2a9a07569d02844f58b74c4fbdc96a06999 -rf93ec3de5b9ce8b8d62a06378d12f10fe01a4365
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 4c7ef2a9a07569d02844f58b74c4fbdc96a06999)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision f93ec3de5b9ce8b8d62a06378d12f10fe01a4365)
@@ -195,8 +195,8 @@
     loadcells[ LOAD_CELL_RESERVOIR_2_PRIMARY ].rawReading = ( 0 == b1Err ? b1Signed : loadcells[ LOAD_CELL_RESERVOIR_2_PRIMARY ].rawReading );
     loadcells[ LOAD_CELL_RESERVOIR_2_BACKUP ].rawReading  = ( 0 == b2Err ? b2Signed : loadcells[ LOAD_CELL_RESERVOIR_2_BACKUP ].rawReading );
 
-    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_LOAD_CELL_A1_B1_SENSORS, getFPGAADC1ErrorCount(), getFPGAADC1ReadCount() );
-    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_LOAD_CELL_A2_B2_SENSORS, getFPGAADC2ErrorCount(), getFPGAADC2ReadCount() );
+    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_LOAD_CELL_A1_B1_SENSORS, getFPGAADC1ReadCount() );
+    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_LOAD_CELL_A2_B2_SENSORS, getFPGAADC2ReadCount() );
 
     // Check if a new calibration is available
     if ( TRUE == isNewCalibrationRecordAvailable() )
Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r0d1a270e86f26fc2ba145cb9aaa036bf09bcc6c1 -rf93ec3de5b9ce8b8d62a06378d12f10fe01a4365
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 0d1a270e86f26fc2ba145cb9aaa036bf09bcc6c1)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision f93ec3de5b9ce8b8d62a06378d12f10fe01a4365)
@@ -895,13 +895,11 @@
  *************************************************************************/
 static TEMPSENSORS_EXEC_STATES_T handleExecGetADCValues( void )
 {
-    U32 errorCount = 0;
     U32 readCount  = 0;
 
-    errorCount = (U32)getFPGARTDErrorCount();
     readCount  = (U32)getFPGARTDReadCount();
 
-    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_TWO_WIRE_ADC_TEMP_SENSORS, errorCount, readCount );
+    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_TWO_WIRE_ADC_TEMP_SENSORS, readCount );
     processTempSnsrsADCRead( TEMPSENSORS_INLET_PRIMARY_HEATER,      getFPGATPiTemp() );
     processTempSnsrsADCRead( TEMPSENSORS_OUTLET_PRIMARY_HEATER,     getFPGATPoTemp() );
     processTempSnsrsADCRead( TEMPSENSORS_CONDUCTIVITY_SENSOR_1,     getFPGACD1Temp() );
@@ -912,10 +910,9 @@
     if ( ( getHardwareConfigStatus() != HW_CONFIG_BETA ) && ( getCurrentOperationMode() != DG_MODE_INIT ) )
 #endif
     {
-        errorCount = (U32)getFPGATHdErrorCount();
         readCount  = (U32)getFPGATHdReadCount();
 
-        checkFPGAPersistentAlarms( FPGA_PERS_ERROR_THD_ADC_TEMP_SENSORS, errorCount, readCount );
+        checkFPGAPersistentAlarms( FPGA_PERS_ERROR_THD_ADC_TEMP_SENSORS, readCount );
         processTempSnsrsADCRead( TEMPSENSORS_HEAT_DISINFECT,   getFPGATHdTemp() );
         processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_THD_RTD, getFPGATHdInternalTemp() );
 
@@ -924,24 +921,21 @@
 
         baroConvConsts.refTemperature   = getFPGABaroReferenceTemperature();
         baroConvConsts.temperatureCoeff = getFPGABaroTempCoeffOfTemperature();
-        errorCount                      = getFPGABaroErrorCount();
         readCount                       = getFPGABaroReadCount();
 
-        checkFPGAPersistentAlarms( FPGA_PERS_ERROR_BARO_SENSOR, errorCount, readCount );
+        checkFPGAPersistentAlarms( FPGA_PERS_ERROR_BARO_SENSOR, readCount );
         processTempSnsrsADCRead( TEMPSENSORS_BAROMETRIC_TEMP_SENSOR, getFPGABaroTemperature() );
     }
 
-    errorCount = (U32)getFPGATRoErrorCount();
     readCount  = (U32)getFPGATRoReadCount();
 
-    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_TRO_ADC_TEMP_SENSORS, errorCount, readCount );
+    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_TRO_ADC_TEMP_SENSORS, readCount );
     processTempSnsrsADCRead( TEMPSENSORS_OUTLET_REDUNDANT, getFPGATRoTemp() );
     processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_TRO_RTD, getFPGATRoInternalTemp() );
 
-    errorCount = (U32)getFPGATDiErrorCount();
     readCount  = (U32)getFPGATDiReadCount();
 
-    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_TDI_ADC_TEMP_SENSORS, errorCount, readCount );
+    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_TDI_ADC_TEMP_SENSORS, readCount );
     processTempSnsrsADCRead( TEMPSENSORS_INLET_DIALYSATE,  getFPGATDiTemp() );
     processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_TDI_RTD, getFPGATDiInternalTemp() );