Index: firmware/App/Controllers/ConductivitySensors.h
===================================================================
diff -u -r025612ad77fe630889a364586de54bffe5262d56 -rc7ed4f90b600fe684097654f150e4972646ffec9
--- firmware/App/Controllers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision 025612ad77fe630889a364586de54bffe5262d56)
+++ firmware/App/Controllers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision c7ed4f90b600fe684097654f150e4972646ffec9)
@@ -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,25 +24,31 @@
  *  @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
  *  @{
  */
 
 // ********** public definitions **********
 
-#define MIN_ACID_CONCENTRATE_CONDUCTIVITY               11000                                       ///< Minimum conductivity for acid concentrate.
-#define MAX_ACID_CONCENTRATE_CONDUCTIVITY               11850                                       ///< Maximum conductivity for acid concentrate.
+#define ACID_NORMAL_CONDUCTIVITY                        11645.05                                    ///< Acid normal operation theoretical conductivity.
+#define BICARB_NORMAL_CONDUCTIVITY                      13734.88                                    ///< Bicarb normal operation theoretical conductivity.
 
-#define MIN_BICARB_CONCENTRATE_CONDUCTIVITY             2000                                        ///< Minimum conductivity for bicarbonate concentrate.
-#define MAX_BICARB_CONCENTRATE_CONDUCTIVITY             3000                                        ///< Maximum conductivity for bicarbonate concentrate.
-
-///< Minimum conductivity value for dialysate solution.
-#define MIN_DIALYSATE_CONDUCTIVITY                      ( MIN_ACID_CONCENTRATE_CONDUCTIVITY + MIN_BICARB_CONCENTRATE_CONDUCTIVITY )
-///< Maximum conductivity value for dialysate solution.
-#define MAX_DIALYSATE_CONDUCTIVITY                      ( MAX_ACID_CONCENTRATE_CONDUCTIVITY + MAX_BICARB_CONCENTRATE_CONDUCTIVITY )
-
 /// Enumeration of conductivity sensors.
 typedef enum ConductivitySensors
 {
@@ -61,6 +67,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 **********
@@ -74,10 +84,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 );