Index: firmware/App/Drivers/ConductivityTeensy.h
===================================================================
diff -u -r290cac3c0557c978647cef2972800dfe137dd662 -r4643a4b7f7ecaca8e07a809af6b218fac1c74799
--- firmware/App/Drivers/ConductivityTeensy.h	(.../ConductivityTeensy.h)	(revision 290cac3c0557c978647cef2972800dfe137dd662)
+++ firmware/App/Drivers/ConductivityTeensy.h	(.../ConductivityTeensy.h)	(revision 4643a4b7f7ecaca8e07a809af6b218fac1c74799)
@@ -19,30 +19,14 @@
 #define _CONDUCTIVITY_TEENSY_H_
 
 #include "DDCommon.h"
+#include "DDDefs.h"
 
 // ********** public definitions **********
 
 #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;
-
 /// Enumeration of Teensy Sensor Index values
 typedef enum TeensySensorIndex
 {
@@ -217,8 +201,8 @@
 void signalConductivityReceiptCompleted( void );
 void signalConductivityTransmitCompleted( void );
 void addToConductivityCmdQ(TEENSY_CMD_INDEX_T teensyCmd);
-F32 getTeensyConductivityValue( CONDUCTIVITY_SENSORS_T sensorId );
-F32 getTeensyConductivityTemperatureValue( CONDUCTIVITY_SENSORS_T sensorId );
+F32 getTeensyConductivityValue( U32 sensorId );
+F32 getTeensyConductivityTemperatureValue( U32 sensorId );
 BOOL testSetTeenyConductivityModel( MESSAGE_T *message );
 BOOL testTeensyConductivitySensorReadingsOverride( MESSAGE_T *message );
 BOOL testTeensyConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message );