Index: firmware/App/Controllers/ConductivitySensors.h
===================================================================
diff -u -r487057777532342a4034df8296310270c8827f14 -r9279d01e7e539ad1e788b85db4ea2288965b03c6
--- firmware/App/Controllers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision 487057777532342a4034df8296310270c8827f14)
+++ firmware/App/Controllers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision 9279d01e7e539ad1e788b85db4ea2288965b03c6)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    ConductivitySensors.h
 *
-* @author  (last)      Quang Nguyen
-* @date    (last)      18-Aug-2021
+* @author  (last)      Hung Nguyen
+* @date    (last)      09-Feb-2022
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  13-Jul-2020
@@ -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
  *  @{
  */
@@ -53,6 +67,14 @@
     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)
+    U32 cpiSensorStatus;                    ///< CPi conductivity sensor status
+    U32 cpoSensorStatus;                    ///< CPo conductivity sensor status
+    U32 cd1SensorStatus;                    ///< CD1 conductivity sensor status
+    U32 cd2SensorStatus;                    ///< CD2 conductivity sensor status
 } CONDUCTIVITY_DATA_T;
 
 // ********** public function prototypes **********
@@ -66,10 +88,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 );