Index: firmware/App/Controllers/ConductivitySensors.h
===================================================================
diff -u -rca7bc09ad4fda0ad3578480b2ccf72d545937284 -r63215f2052a66ecb3e0355bad0ec99b4db335fff
--- firmware/App/Controllers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision ca7bc09ad4fda0ad3578480b2ccf72d545937284)
+++ firmware/App/Controllers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision 63215f2052a66ecb3e0355bad0ec99b4db335fff)
@@ -24,8 +24,22 @@
  *  @defgroup ConductivitySensors ConductivitySensors
  *  @brief Conductivity Sensors monitor module. Monitors and filters conductivity sensor readings.
  *  The module uses Atlas Scientific EC OEM for conductivity sensors CPi and CPo with probe type K 1.0 and 0.1 respectively.
- *  The module uses Emstat Pico from PalmSens to measure electrical resistance and convert to conductivity.
  *
+ *  Conductivity Sensor Pre-ROF (CPi)
+ *  Diality P/N: 100511-002
+ *  Manufacturer: Sensor Development Inc.
+ *  Manufacture P/N: CS51-1.0-PT1000-1/2” NPT-4’
+ *
+ *  Conductivity Sensor Post-ROF (CPo)
+ *  Diality P/N: 100511-001
+ *  Manufacturer: Sensor Development Inc.
+ *  Manufacture P/N: CS51-0.1-PT1000-1/2” NPT-4’
+ *
+ *  Conductivity Sensor Module (same module type is used for CPi and CPo)
+ *  Diality P/N: 100512-001
+ *  Manufacturer: Atlas Scientific
+ *  Manufacture P/N: EC-OEM
+ *
  *  @addtogroup ConductivitySensors
  *  @{
  */
@@ -52,6 +66,10 @@
     F32 cpo;                                ///< CPo conductivity sensor value
     F32 cd1;                                ///< CD1 conductivity sensor value
     F32 cd2;                                ///< CD2 conductivity sensor value
+    F32 cpiRaw;                             ///< CPi raw conductivity sensor value (without 2% temperature compensated)
+    F32 cpoRaw;                             ///< CPo raw conductivity sensor value (without 2% temperature compensated)
+    F32 cd1Raw;                             ///< CD1 raw conductivity sensor value (without 2% temperature compensated)
+    F32 cd2Raw;                             ///< CD2 raw conductivity sensor value (without 2% temperature compensated)
 } CONDUCTIVITY_DATA_T;
 
 // ********** public function prototypes **********
@@ -65,10 +83,14 @@
 void checkRORejectionRatio( void );
 
 F32 getConductivityValue( U32 sensorId );
+F32 getRawConductivityValue( U32 sensorId );
 
 BOOL testSetConductivityOverride( U32 sensorId, F32 value );
 BOOL testResetConductivityOverride( U32 sensorId );
 
+BOOL testSetRawConductivityOverride( U32 sensorId, F32 value );
+BOOL testResetRawConductivityOverride( U32 sensorId );
+
 BOOL testSetConductivityDataPublishIntervalOverride( U32 interval_ms );
 BOOL testResetConductivityDataPublishIntervalOverride( void );