Index: firmware/App/Drivers/ConductivityTeensy.c
===================================================================
diff -u -ree9c8a27ccb6a9f1f5e18faf9f684935ccf118f4 -r279a41c031010740e5121ea978d8f069a4b7deb7
--- firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision ee9c8a27ccb6a9f1f5e18faf9f684935ccf118f4)
+++ firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision 279a41c031010740e5121ea978d8f069a4b7deb7)
@@ -181,13 +181,13 @@
 static COND_PARSE_STATUS parseEEPROMdata( const U08 *buffer, U32 len );
 static COND_PARSE_STATUS parseConductivityMeasurements( const U08 *buffer );
 
-static U32 getTeensyCondId( CONDUCTIVITY_SENSORS_T sensorId );
-static void calculateConductivity( TEENSY_SENSOR_INDEX_T sensorNum );
-static void calculateConductivityAly( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor );
-static void calculateConductivityUpdatedStandard( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor );
-static void calculateConductivityStandard( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor );
-static void calculateTemperature( TEENSY_SENSOR_INDEX_T sensorNum );
-static void calculateResistance( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor );
+static U32 getTeensyCondId( U32 sensorId );
+static void calculateConductivity( U32 sensorNum );
+static void calculateConductivityAly( U32 sensorNum, BOOL isFPSensor );
+static void calculateConductivityUpdatedStandard( U32 sensorNum, BOOL isFPSensor );
+static void calculateConductivityStandard( U32 sensorNum, BOOL isFPSensor );
+static void calculateTemperature( U32 sensorNum );
+static void calculateResistance( U32 sensorNum, BOOL isFPSensor );
 
 /*********************************************************************//**
  * @brief
@@ -1811,7 +1811,7 @@
  * @param sensorId - Id of DD Conductivity Sensors
  * @return sensorNum - Sensor Index.
  *************************************************************************/
-static U32 getTeensyCondId( CONDUCTIVITY_SENSORS_T sensorId )
+static U32 getTeensyCondId( U32 sensorId )
 {
     U32 sensorNum = 0;
 
@@ -1853,7 +1853,7 @@
  * @param sensorId ID of conductivity sensor to get conductivity.
  * @return The current conductivity of a given conductivity sensor.
  *************************************************************************/
-F32 getTeensyConductivityValue( CONDUCTIVITY_SENSORS_T sensorId )
+F32 getTeensyConductivityValue( U32 sensorId )
 {
     U32 sensorNum = getTeensyCondId( sensorId );
     F32 result = 0.0F;
@@ -1876,7 +1876,7 @@
  * @param sensorId ID of conductivity sensor to get temperature.
  * @return The current temperature of a given conductivity sensor.
  *************************************************************************/
-F32 getTeensyConductivityTemperatureValue( CONDUCTIVITY_SENSORS_T sensorId )
+F32 getTeensyConductivityTemperatureValue( U32 sensorId )
 {
     U32 sensorNum = getTeensyCondId( sensorId );
     F32 result = 0.0F;
@@ -1899,7 +1899,7 @@
  * @param sensorId ID of conductivity sensor to get temperature.
  * @return The current temperature of a given conductivity sensor.
  *************************************************************************/
-F32 getTeensyConductivityResistanceValue( CONDUCTIVITY_SENSORS_T sensorId )
+F32 getTeensyConductivityResistanceValue( U32 sensorId )
 {
     U32 sensorNum = getTeensyCondId( sensorId );
     F32 result = 0.0F;
@@ -1922,7 +1922,7 @@
  * @param isFPSensor - T/F if sensor is on FP hardware.
  * @return
  *************************************************************************/
-static void calculateConductivity( TEENSY_SENSOR_INDEX_T sensorNum )
+static void calculateConductivity( U32 sensorNum )
 {
     BOOL isFPSensor = FALSE;
 
@@ -1955,7 +1955,7 @@
  * @param isFPSensor - T/F if sensor is on FP hardware.
  * @return
  *************************************************************************/
-static void calculateConductivityAly( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor )
+static void calculateConductivityAly( U32 sensorNum, BOOL isFPSensor )
 {
     F32 calculatedConductivity = 0.0;
     F32 B3 = 0.0;
@@ -2008,7 +2008,7 @@
  * @param isFPSensor - T/F if sensor is on FP hardware.
  * @return
  *************************************************************************/
-static void calculateConductivityUpdatedStandard( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor )
+static void calculateConductivityUpdatedStandard( U32 sensorNum, BOOL isFPSensor )
 {
     F32 calculatedConductivity = 0.0;
     F64 alpha = 0.0;
@@ -2042,7 +2042,7 @@
  * @param isFPSensor - T/F if sensor is on FP hardware.
  * @return
  *************************************************************************/
-static void calculateConductivityStandard( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor )
+static void calculateConductivityStandard( U32 sensorNum, BOOL isFPSensor )
 {
     F32 calculatedConductivity = 0.0;
     F64 alpha = 0.0;
@@ -2086,7 +2086,7 @@
  * @param isFPSensor - T/F if sensor is on FP hardware.
  * @return
  *************************************************************************/
-static void calculateResistance( TEENSY_SENSOR_INDEX_T sensorNum, BOOL isFPSensor )
+static void calculateResistance( U32 sensorNum, BOOL isFPSensor )
 {
 
     F32 calculatedResistance = 0.0;
@@ -2125,7 +2125,7 @@
  * @param sensorNum - Teensy sensor index value.
  * @return
  *************************************************************************/
-static void calculateTemperature( TEENSY_SENSOR_INDEX_T sensorNum )
+static void calculateTemperature( U32 sensorNum )
 {
 
     F32 calculatedTemperature = 0.0;