Index: firmware/App/Drivers/ConductivitySensors.h
===================================================================
diff -u -r2205857f59dd884c4af450239381387cfb560c2e -rf47296145b6a0adb78df0e325587629171909fd6
--- firmware/App/Drivers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision 2205857f59dd884c4af450239381387cfb560c2e)
+++ firmware/App/Drivers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision f47296145b6a0adb78df0e325587629171909fd6)
@@ -40,39 +40,38 @@
 /// Enumeration of conductivity sensors.
 typedef enum ConductivitySensors
 {
-    CONDUCTIVITYSENSORS_CD1_SENSOR = 0,                   ///< Inlet water conductivity sensor
-    CONDUCTIVITYSENSORS_CD2_SENSOR,                       ///< Outlet water conductivity sensor
-    CONDUCTIVITYSENSORS_CD3_SENSOR,                       ///< Post-acid concentrate conductivity sensor
-    CONDUCTIVITYSENSORS_CD4_SENSOR,                       ///< Post-bicarbonate concentrate conductivity sensor
-    NUM_OF_CONDUCTIVITY_SENSORS                           ///< Number of conductivity sensors
+    CONDUCTIVITYSENSORS_CPI_SENSOR = 0,                             ///< Inlet water conductivity sensor
+    CONDUCTIVITYSENSORS_FIRST = CONDUCTIVITYSENSORS_CPI_SENSOR,     ///< First conductivity sensor
+    CONDUCTIVITYSENSORS_CPO_SENSOR,                                 ///< RO outlet water conductivity sensor
+    NUM_OF_CONDUCTIVITY_SENSORS                                     ///< Number of conductivity sensors
 } CONDUCTIVITY_SENSORS_T;
 
 // ********** public function prototypes **********
 
 void initConductivitySensors( void );
 void readConductivitySensors( void );
 
-//F32 getConductivityValue( CONDUCTIVITY_SENSORS_T sensor );
-//F32 getConductivityTemperatureValue( CONDUCTIVITY_SENSORS_T sensor );
-//U32 getConductivitySensorReadCount( CONDUCTIVITY_SENSORS_T sensor );
-//U32 getConductivitySensorErrorCount( CONDUCTIVITY_SENSORS_T sensor );
-//
-//void handleConductivitySensorsReset( void );
-//void handleConductivitySensorsInitProcedure( void );
-//void execConductivitySensorWrite( void );
-//void execConductivitySensorRead( void );
-//
-//void requestConductivitySensorReset( CONDUCTIVITY_SENSORS_T sensor );
-//void setConductivitySensorInitEnable( CONDUCTIVITY_SENSORS_T sensor );
-//void conductivitySensorWriteRequest( CONDUCTIVITY_SENSORS_T sensor, U16 writeAddr, U32 data );
-//void conductivitySensorReadRequest( CONDUCTIVITY_SENSORS_T sensor, U16 readAddr );
-//U32 conductivitySensorReadData( CONDUCTIVITY_SENSORS_T sensor );
-//
-//BOOL testConductivitySensorReadingsOverride( MESSAGE_T *message );
-//BOOL testConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message );
-//BOOL testConductivitySensorReadCounterOverride( MESSAGE_T *message );
-//BOOL testConductivitySensorErrorCounterOverride( MESSAGE_T *message );
+F32 getConductivityValue( CONDUCTIVITY_SENSORS_T sensor );
+F32 getConductivityTemperatureValue( CONDUCTIVITY_SENSORS_T sensor );
+U32 getConductivitySensorReadCount( CONDUCTIVITY_SENSORS_T sensor );
+U32 getConductivitySensorErrorCount( CONDUCTIVITY_SENSORS_T sensor );
 
+void handleConductivitySensorsReset( void );
+void handleConductivitySensorsInitProcedure( void );
+void execConductivitySensorWrite( void );
+void execConductivitySensorRead( void );
+
+void requestConductivitySensorReset( CONDUCTIVITY_SENSORS_T sensor );
+void setConductivitySensorInitEnable( CONDUCTIVITY_SENSORS_T sensor );
+void conductivitySensorWriteRequest( CONDUCTIVITY_SENSORS_T sensor, U16 writeAddr, U32 data );
+void conductivitySensorReadRequest( CONDUCTIVITY_SENSORS_T sensor, U16 readAddr );
+U32 conductivitySensorReadData( CONDUCTIVITY_SENSORS_T sensor );
+
+BOOL testConductivitySensorReadingsOverride( MESSAGE_T *message );
+BOOL testConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message );
+BOOL testConductivitySensorReadCounterOverride( MESSAGE_T *message );
+BOOL testConductivitySensorErrorCounterOverride( MESSAGE_T *message );
+
 /**@}*/
 
 #endif