Index: firmware/App/Drivers/ConductivityTeensy.h
===================================================================
diff -u -rbd896114f304304a7096b30b2a85067a64645e82 -r0bb2512f5a49b16b8c19e07e3dd34610129a07e3
--- firmware/App/Drivers/ConductivityTeensy.h	(.../ConductivityTeensy.h)	(revision bd896114f304304a7096b30b2a85067a64645e82)
+++ firmware/App/Drivers/ConductivityTeensy.h	(.../ConductivityTeensy.h)	(revision 0bb2512f5a49b16b8c19e07e3dd34610129a07e3)
@@ -94,7 +94,8 @@
 /// Enumeration of Conductivity Communication states.
 typedef enum Conductivity_Comm_States
 {
-    COND_COMM_STATE_IDLE = 0,                       ///< Idle comm state, will q automated polling if nothing is q'd.
+    COND_COMM_STATE_INIT = 0,                       ///< Init comm state, waits 1s before moving to idle.
+    COND_COMM_STATE_IDLE,                           ///< Idle comm state, will q automated polling if nothing is q'd.
     COND_COMM_STATE_TX,                             ///< TX comm state, sends commands to teensy.
     COND_COMM_STATE_RX,                             ///< RX comm state, recv data from teensy.
     COND_COMM_STATE_FAILED,                         ///< Failed comm state
@@ -196,9 +197,9 @@
 /// Structure to store calculated Conductivity and Temperature for each sensor.
 typedef struct
 {
-    F64 Conductivity;
-    F64 Resistance;
-    F64 Temperature;
+    OVERRIDE_F32_T Conductivity;
+    OVERRIDE_F32_T Resistance;
+    OVERRIDE_F32_T Temperature;
 } COND_CALCULATED_MEASUREMENTS_T;
 
 /// Structure to enqueue and dequeue commands in the command queue
@@ -219,5 +220,8 @@
 F32 getTeensyConductivityValue( CONDUCTIVITY_SENSORS_T sensorId );
 F32 getTeensyConductivityTemperatureValue( CONDUCTIVITY_SENSORS_T sensorId );
 BOOL testSetTeenyConductivityModel( MESSAGE_T *message );
+BOOL testTeensyConductivitySensorReadingsOverride( MESSAGE_T *message );
+BOOL testTeensyConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message );
+BOOL testTeensyConductivitySensorResistanceReadingsOverride( MESSAGE_T *message );
 
 #endif /* _CONDUCTIVITY_TEENSY_H_ */