Index: DDDefs.h
===================================================================
diff -u -rd5a65c0ef712ea473a9f5d72ef881e3e69a7c8ba -rf5acd0705793201fdff907c7a5324965e0dc6e34
--- DDDefs.h	(.../DDDefs.h)	(revision d5a65c0ef712ea473a9f5d72ef881e3e69a7c8ba)
+++ DDDefs.h	(.../DDDefs.h)	(revision f5acd0705793201fdff907c7a5324965e0dc6e34)
@@ -7,8 +7,8 @@
 *
 * @file    DDDefs.h
 *
-* @author  (last)      Sameer Kalliadan Poyil
-* @date    (last)      10-Feb-2026
+* @author  (last)      Jashwant Gantyada
+* @date    (last)      21-May-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -329,7 +329,9 @@
     FP_EVENT_PRE_GEN_DEF_CHANGE,                                        ///< FP defeatured pre gen state change
     FP_EVENT_GENP_DEF_CHANGE,                                           ///< FP defeatured pre gen state change
     FP_EVENT_FAULT_ALARM_TRIGGER,                                       ///< FP event for alarms that would trigger
-    FP_EVENT_LAST = FP_EVENT_FAULT_ALARM_TRIGGER,                       ///< FP last event in list
+    FP_EVENT_P25_LEVL_CHANGE,                                           ///< FP floater level change event
+    FP_EVENT_OPERATION_STATUS,                                          ///< FP operation status event
+    FP_EVENT_LAST = FP_EVENT_OPERATION_STATUS,                          ///< FP last event in list
     NUM_OF_DD_EVENT_IDS                                                 ///< Total number of DD events
 };
 typedef enum DD_Event_List DD_EVENT_ID_T;                               ///< Type for DD event list enumeration
@@ -429,14 +431,14 @@
 /// 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
+    BAL_CHAMBER_STATE1_FILL_DETECT_COMPLETE,                ///< Balancing Chamber state 1 fill detect complete state
     BAL_CHAMBER_STATE1_FILL_END,                            ///< Balancing Chamber state 1 fill end state
     BAL_CHAMBER_STATE2_FILL_START,                          ///< Balancing chamber state 2 fill start state
     BAL_CHAMBER_STATE2_BICARB_ACID_DOSING_CNTRL,            ///< Balancing Chamber state 2 Bicarb and acid dosing control state
-    BAL_CHAMBER_STATE2_VALVES_CLOSE,                        ///< Balancing Chamber state 2 valves close state
+    BAL_CHAMBER_STATE2_FILL_DETECT_COMPLETE,                ///< Balancing Chamber state 2 fill detect complete state
     BAL_CHAMBER_STATE2_FILL_END,                            ///< Balancing Chamber state 2 fill end state
     NUM_OF_BAL_CHAMBER_EXEC_STATES                          ///< Number of balancing chamber states
 };
@@ -524,7 +526,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 +537,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