Index: firmware/App/Drivers/ConductivityTeensy.h
===================================================================
diff -u -r46a42611591cb92eef5f20c8d39964d406c5c8cc -r279a41c031010740e5121ea978d8f069a4b7deb7
--- firmware/App/Drivers/ConductivityTeensy.h	(.../ConductivityTeensy.h)	(revision 46a42611591cb92eef5f20c8d39964d406c5c8cc)
+++ firmware/App/Drivers/ConductivityTeensy.h	(.../ConductivityTeensy.h)	(revision 279a41c031010740e5121ea978d8f069a4b7deb7)
@@ -19,7 +19,8 @@
 #define _CONDUCTIVITY_TEENSY_H_
 
 #include "DDCommon.h"
-#include "ConductivitySensors.h"
+#include "DDDefs.h"
+
 // ********** public definitions **********
 
 #define DOUBLE_COUNT                8               ///< Number of double values in Teensy EEPROM data
@@ -200,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 );