Index: firmware/App/Drivers/ConductivityTeensy.h
===================================================================
diff -u -r7aafdc16c133bcd4cb0ce5fe08079c1969cc67d2 -rd305a91c82fe89a76d9accbb8faa3d81e3106341
--- firmware/App/Drivers/ConductivityTeensy.h	(.../ConductivityTeensy.h)	(revision 7aafdc16c133bcd4cb0ce5fe08079c1969cc67d2)
+++ firmware/App/Drivers/ConductivityTeensy.h	(.../ConductivityTeensy.h)	(revision d305a91c82fe89a76d9accbb8faa3d81e3106341)
@@ -24,6 +24,23 @@
 #define DOUBLE_COUNT                8                                    ///< Number of double values in Teensy EEPROM data
 #define FLOAT_COUNT                 16                                   ///< Number of float values in Teensy EEPROM data
 
+/// 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 P9_COND
@@ -180,7 +197,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_ */