Index: firmware/App/Controllers/ConductivitySensors.h
===================================================================
diff -u -r3414e47b2664c56ab6b2f0cd5cd6b30ae9a5e333 -r66cc826068b54bc436cde0fae70a05ba6c1ac974
--- firmware/App/Controllers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision 3414e47b2664c56ab6b2f0cd5cd6b30ae9a5e333)
+++ firmware/App/Controllers/ConductivitySensors.h	(.../ConductivitySensors.h)	(revision 66cc826068b54bc436cde0fae70a05ba6c1ac974)
@@ -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
 {