Index: PersistentAlarm.h
===================================================================
diff -u -rb6fffb70532da8e18ff2cb8357a378d517052db0 -rbfb5dbcf22ee998b6ad1e75cd9265c68e729078a
--- PersistentAlarm.h	(.../PersistentAlarm.h)	(revision b6fffb70532da8e18ff2cb8357a378d517052db0)
+++ PersistentAlarm.h	(.../PersistentAlarm.h)	(revision bfb5dbcf22ee998b6ad1e75cd9265c68e729078a)
@@ -39,8 +39,8 @@
     THD_ADC_TEMP_SENSORS,                                       ///< THd ADC temperature sensors.
     TDI_ADC_TEMP_SENSORS,                                       ///< TDi ADC temperature sensors.
     TRO_ADC_TEMP_SENSORS,                                       ///< TRo ADC temperature sensors.
-    CPI_COND_SENSOR,                                            ///< CPi conductivity sensor.
-    CPO_COND_SENSOR,                                            ///< CPo conductivity sensor.
+    CPI_CPO_COND_SENSORS,                                       ///< CPi/CPo conductivity sensors.
+    CD1_CD2_COND_SENSORS,                                       ///< CD1/CD2 conductivity sensors.
     BARO_SENSOR,                                                ///< Barometric sensor.
     LOAD_CELL_A1_B1_SENSORS,                                    ///< Load cell A1/B1 sensors.
     LOAD_CELL_A2_B2_SENSORS,                                    ///< Load cell A2/B2 sensors.
@@ -72,6 +72,7 @@
 void resetPersistentAlarmTimer( ALARM_ID_T alarmId );
 
 void checkFPGAPersistentAlarms( FPGA_PERSISTENT_ALARMS_GROUP_T group, U32 errorCount, U32 readCount );
+void checkFPGAPersistentErrorCountAlarm( FPGA_PERSISTENT_ALARMS_GROUP_T group, U32 errorCount );
 
 /**@}*/