Index: DDDefs.h
===================================================================
diff -u -rc138b6c9d4f5239d252b6343ed791a97e02c6f44 -r11348415c55786216c1af20b0b02bb076b203dff
--- DDDefs.h	(.../DDDefs.h)	(revision c138b6c9d4f5239d252b6343ed791a97e02c6f44)
+++ DDDefs.h	(.../DDDefs.h)	(revision 11348415c55786216c1af20b0b02bb076b203dff)
@@ -429,7 +429,7 @@
 /// Enumeration of balancing chamber exec states.
 enum Balancing_Chamber_Exec_States
 {
-    BAL_CHAMBER_STATE_START = 0,                            ///< Initial state of balancing chamber
+    BAL_CHAMBER_STATE_IDLE = 0,                             ///< Initial state of balancing chamber
     BAL_CHAMBER_STATE1_FILL_START,                          ///< Balancing chamber state 1 fill start state
     BAL_CHAMBER_STATE1_BICARB_ACID_DOSING_CNTRL,            ///< Balancing Chamber state 1 Bicarb and acid dosing control state
     BAL_CHAMBER_STATE1_VALVES_CLOSE,                        ///< Balancing Chamber state 1 valves close state
@@ -524,7 +524,7 @@
 };
 typedef enum Bicarb_Chamber_F_Fill_Exec_States BICARB_CHAMBER_FILL_EXEC_STATE_T;  ///< Type for bicarb chamber fill exec state enumeration
 
-//Enumeration of Bicarb chmaber drain mode exec states
+/// Enumeration of Bicarb chmaber drain mode exec states
 enum Dry_Bicart_Drain_Exec_States
 {
     DRY_BICART_DRAIN_START_STATE = 0,                                 ///< Initial state of dry bicart drain
@@ -535,6 +535,23 @@
 };
 typedef enum Dry_Bicart_Drain_Exec_States DRY_BICART_DRAIN_EXEC_STATE_T;    ///< Type for dry bicart fill exec state enumeration
 
+/// Enumeration of conductivity sensors.
+enum Conductivity_Sensors
+{
+    D17_COND = 0,                                       ///< Bicarb only conductivity sensor - 1
+    FIRST_DD_COND_SENSOR = D17_COND,                    ///< First conductivity sensor
+    D27_COND,                                           ///< Acid and Bicarb mix conductivity sensor - 1
+    D29_COND,                                           ///< Acid and Bicarb mix conductivity sensor - 2
+    D43_COND,                                           ///< Spent dialysate conductivity sensor
+    D74_COND,                                           ///< Bicarb only conductivity sensor - 2
+    LAST_DD_COND_SENSOR = D74_COND,                     ///< Last conductivity sensor
+    P9_COND,                                            ///< Inlet water conductivity sensor
+    FIRST_FP_COND_SENSOR = P9_COND,                     ///< First FP conductivity sensor
+    P18_COND,                                           ///< RO outlet water conductivity sensor
+    LAST_FP_COND_SENSOR = P18_COND,                     ///< Last FP conductivity sensor
+    NUM_OF_CONDUCTIVITY_SENSORS                         ///< Number of conductivity sensors
+};
+typedef enum Conductivity_Sensors CONDUCTIVITY_SENSORS_T; ///< Type for conductivity sensor enumeration.
 /**@}*/
 
 #endif