Index: firmware/App/Drivers/ConductivitySensors.h
===================================================================
diff -u -r336f6c49e05f515ca1250e0fd9ea97e5f5b5f11c -r8f59899872dd14f91e1cf07c1c51f24335287ad6
--- firmware/App/Drivers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision 336f6c49e05f515ca1250e0fd9ea97e5f5b5f11c)
+++ firmware/App/Drivers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision 8f59899872dd14f91e1cf07c1c51f24335287ad6)
@@ -97,6 +97,17 @@
     U08 hwSerial[ CONDUCTIVITY_CAL_CHAR_LENGTH ];       ///< HW Serial Number.
 } CONDUCTIVITY_REVISIONS_T;
 
+typedef struct
+{
+    U32 sensorID;                                       ///< Sensor ID to request
+    CONDUCTIVITY_REVISIONS_T sensorVersion;             ///< version data for given sensor ID
+} CONDUCTIVITY_VERSION_RESPONSE_T;
+
+typedef struct
+{
+    U32 sensorID;                                       ///< Sensor ID to request
+    CONDUCTIVITY_COEFFICIENTS_T sensorCal;              ///< Cal data for given sensor ID
+} CONDUCTIVITY_CAL_RESPONSE_T;
 // ********** public function prototypes **********
 
 void initConductivitySensors( void );
@@ -107,6 +118,8 @@
 F32 getConductivityTemperature( CONDUCTIVITY_SENSORS_T sensor );
 U08 getConductivityReadCount( CONDUCTIVITY_SENSORS_T sensor );
 U08 getConductivityTemperatureReadCount( CONDUCTIVITY_SENSORS_T sensor );
+F32 getConductivityRawResistance( CONDUCTIVITY_SENSORS_T sensor );
+F32 getConductivityRawRTD( CONDUCTIVITY_SENSORS_T sensor );
 
 BOOL testConductivitySensorConductivityReadingsOverride( MESSAGE_T *message );
 BOOL testConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message );
@@ -122,6 +135,7 @@
 BOOL testFPConductivitySensorTemperatureReadCounterOverride( MESSAGE_T *message );
 BOOL testFPConductivitySensorTemperatureErrorCounterOverride( MESSAGE_T *message );
 BOOL testHandleConductivitySensorVersionRequest( MESSAGE_T *message );
+BOOL testHandleConductivitySensorCalRequest( MESSAGE_T *message );
 
 /**@}*/