Index: firmware/App/Drivers/ConductivitySensors.c
===================================================================
diff -u -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 -r72ae21d8343d3a2b07a47452ff48549e25f876df
--- firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602)
+++ firmware/App/Drivers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 72ae21d8343d3a2b07a47452ff48549e25f876df)
@@ -140,8 +140,8 @@
     }
 
     // Initialize the conductivity sensor FPGA alarms
-//    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 );
+//    initFPGAPersistentAlarm( FPGA_PERS_ERROR_P9_COND_SENSOR, ALARM_ID_RO_P9_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
+//    initFPGAPersistentAlarm( FPGA_PERS_ERROR_P9_COND_SENSOR, ALARM_ID_RO_P18_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS );
 }
 
 /*********************************************************************//**
@@ -182,29 +182,18 @@
  * @brief
  * The checkConductivitySensors function checks the read and error counters for
  * each conductivity sensor.
- * @details \b Alarm: ALARM_ID_DD_CD1_SENSOR_FPGA_FAULT if the
- * CD1 conductivity sensor is not able to be read.
- * @details \b Alarm: ALARM_ID_DD_CD2_SENSOR_FPGA_FAULT if the
- * CD2 conductivity sensor is not able to be read.
- * @details \b Alarm: ALARM_ID_DD_CD3_SENSOR_FPGA_FAULT if the
- * CD3 conductivity sensor is not able to be read.
- * @details \b Alarm: ALARM_ID_DD_CD4_SENSOR_FPGA_FAULT if the
- * CD4 conductivity sensor is not able to be read.
+ * @details \b Alarm: TBD
  * @details \b Inputs: lastConductivityReadCounter, lastConductivityErrorCounter
  * @details \b Outputs: none
  * @return none
  *************************************************************************/
 //static void checkConductivitySensors( void )
 //{
-//    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_CD1_COND_SENSOR, getConductivitySensorReadCount(CONDUCTIVITYSENSORS_CD1_SENSOR) );
-//    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_CD2_COND_SENSOR, getConductivitySensorReadCount(CONDUCTIVITYSENSORS_CD2_SENSOR) );
-//    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_CD3_COND_SENSOR, getConductivitySensorReadCount(CONDUCTIVITYSENSORS_CD3_SENSOR) );
-//    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_CD4_COND_SENSOR, getConductivitySensorReadCount(CONDUCTIVITYSENSORS_CD4_SENSOR) );
+//    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_P9_COND_SENSOR, getConductivitySensorReadCount(P9_COND) );
+//    checkFPGAPersistentAlarms( FPGA_PERS_ERROR_P18_COND_SENSOR, getConductivitySensorReadCount(P18_COND) );
 //
-//    checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_CD1_COND_SENSOR, getConductivitySensorErrorCount( CONDUCTIVITYSENSORS_CD1_SENSOR ) );
-//    checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_CD2_COND_SENSOR, getConductivitySensorErrorCount( CONDUCTIVITYSENSORS_CD2_SENSOR ) );
-//    checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_CD3_COND_SENSOR, getConductivitySensorErrorCount( CONDUCTIVITYSENSORS_CD3_SENSOR ) );
-//    checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_CD4_COND_SENSOR, getConductivitySensorErrorCount( CONDUCTIVITYSENSORS_CD4_SENSOR ) );
+//    checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_P9_COND_SENSOR, getConductivitySensorErrorCount( P9_COND ) );
+//    checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_P18_COND_SENSOR, getConductivitySensorErrorCount( P18_COND ) );
 //}
 
 /*********************************************************************//**