Index: firmware/App/Drivers/ConductivityTeensy.h
===================================================================
diff -u -r31a1037056fb4d4c4705211302594e015036c86f -r11dbd4210f75d1587be89117e60409cf1b4d1085
--- firmware/App/Drivers/ConductivityTeensy.h	(.../ConductivityTeensy.h)	(revision 31a1037056fb4d4c4705211302594e015036c86f)
+++ firmware/App/Drivers/ConductivityTeensy.h	(.../ConductivityTeensy.h)	(revision 11dbd4210f75d1587be89117e60409cf1b4d1085)
@@ -24,14 +24,32 @@
 #define DOUBLE_COUNT                8                                    ///< Number of double values in Teensy EEPROM data
 #define FLOAT_COUNT                 16                                   ///< Number of float values in Teensy EEPROM data
 #define MAX_COND_MST_PARAM_IDX      7                                    ///< Total number of parameters in measurement settings CONDUCTIVITY_MEASUREMENT_SETTINGS_T
+
+/// Enumeration of conductivity sensors.
+typedef enum ConductivitySensors
+{
+    D17_COND = 0,                                   ///< Bicarb only conductivity sensor - 1
+    FIRST_DD_COND_SENSOR = D17_COND,                ///< First conductivity sensor
+    D27_COND,                                       ///< Acid and Bicarb mix conductivity sensor - 1
+    D29_COND,                                       ///< Acid and Bicarb mix conductivity sensor - 2
+    D43_COND,                                       ///< Spent dialysate conductivity sensor
+    D74_COND,                                       ///< Bicarb only conductivity sensor - 2
+    LAST_DD_COND_SENSOR = D74_COND,                 ///< Last conductivity sensor
+    P9_COND,                                        ///< Inlet water conductivity sensor
+    FIRST_FP_COND_SENSOR = P9_COND,                 ///< First FP conductivity sensor
+    P18_COND,                                       ///< RO outlet water conductivity sensor
+    LAST_FP_COND_SENSOR = P18_COND,                 ///< Last FP conductivity sensor
+    NUM_OF_CONDUCTIVITY_SENSORS                     ///< Number of conductivity sensors
+} CONDUCTIVITY_SENSORS_T;
+
 typedef enum TeensySensorIndex
 {
-    TEENSY_SENSOR_0 = 0,                            ///< Maps to D17_COND
-    TEENSY_SENSOR_1,                                ///< Maps to D27_COND
-    TEENSY_SENSOR_2,                                ///< Maps to D43_COND
-    TEENSY_SENSOR_3,                                ///< Maps to D74_COND
-    TEENSY_SENSOR_4,                                ///< Maps to P9_COND
-    TEENSY_SENSOR_5,                                ///< Maps to P18_COND
+    TEENSY_SENSOR_0 = 0,                            ///< Maps to P9_COND
+    TEENSY_SENSOR_1,                                ///< Maps to P18_COND
+    TEENSY_SENSOR_2,                                ///< Maps to D17_COND
+    TEENSY_SENSOR_3,                                ///< Maps to D27_COND
+    TEENSY_SENSOR_4,                                ///< Maps to D29_COND
+    TEENSY_SENSOR_5,                                ///< Maps to D43_COND
     MAX_TEENSY_SENSOR                               ///< Total number of mapped sensors
 } TEENSY_SENSOR_INDEX_T;
 
@@ -167,7 +185,7 @@
 void signalConductivityReceiptCompleted( void );
 void signalConductivityTransmitCompleted( void );
 void addToCmdQ(U08 teensyCmd);
-F64 getImpedanceValue( U32 sensorNum );
-F64 getRTDValue( U32 sensorNum );
+F32 getTeensyConductivityValue( CONDUCTIVITY_SENSORS_T sensorId );
+F32 getTeensyConductivityTemperatureValue( CONDUCTIVITY_SENSORS_T sensorId );
 
 #endif /* _CONDUCTIVITY_TEENSY_H_ */