Index: firmware/App/Controllers/ConductivitySensors.h
===================================================================
diff -u -ra9315539f527b92523b1598ff91e47db4d71dae2 -r95eefee71702fbf031025dc35ebaf553dfb050b7
--- firmware/App/Controllers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision a9315539f527b92523b1598ff91e47db4d71dae2)
+++ firmware/App/Controllers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision 95eefee71702fbf031025dc35ebaf553dfb050b7)
@@ -7,8 +7,8 @@
 *
 * @file    ConductivitySensors.h
 *
-* @author  (last)      Hung Nguyen
-* @date    (last)      09-Feb-2022
+* @author  (last)      Dara Navaei
+* @date    (last)      31-Mar-2022
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  13-Jul-2020
@@ -46,17 +46,9 @@
 
 // ********** 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
 {
@@ -79,6 +71,10 @@
     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 **********