Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -r36f5be84c04aebf35dd6b13b03dd979d0a21dcd1 -r6ebf16aefe8865d3ecca50348cabc3f42e676fb5
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 36f5be84c04aebf35dd6b13b03dd979d0a21dcd1)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 6ebf16aefe8865d3ecca50348cabc3f42e676fb5)
@@ -140,10 +140,8 @@
     }
 
     // Initialize the conductivity sensor FPGA alarms
-//    initFPGAPersistentAlarm( FPGA_PERS_ERROR_CD1_COND_SENSOR, ALARM_ID_DD_CD1_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
-//    initFPGAPersistentAlarm( FPGA_PERS_ERROR_CD2_COND_SENSOR, ALARM_ID_DD_CD2_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
-//    initFPGAPersistentAlarm( FPGA_PERS_ERROR_CD3_COND_SENSOR, ALARM_ID_DD_CD3_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
-//    initFPGAPersistentAlarm( FPGA_PERS_ERROR_CD4_COND_SENSOR, ALARM_ID_DD_CD4_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
+//    initFPGAPersistentAlarm( FPGA_PERS_ERROR_CPI_COND_SENSOR, ALARM_ID_RO_CPI_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
+//    initFPGAPersistentAlarm( FPGA_PERS_ERROR_CPO_COND_SENSOR, ALARM_ID_RO_CPO_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
 }
 
 /*********************************************************************//**