Index: DDDefs.h
===================================================================
diff -u -rca2cbd27bec325b8837880e387b940ee0302328e -r9ca6e6dfbe780f8a0a4e4725bb2bf8ffa2d19d70
--- DDDefs.h	(.../DDDefs.h)	(revision ca2cbd27bec325b8837880e387b940ee0302328e)
+++ DDDefs.h	(.../DDDefs.h)	(revision 9ca6e6dfbe780f8a0a4e4725bb2bf8ffa2d19d70)
@@ -7,8 +7,8 @@
 *
 * @file    DDDefs.h
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      27-May-2026
+* @author  (last)      Santhosh Reddy
+* @date    (last)      06-Jul-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -342,7 +342,12 @@
     DD_EVENT_BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES,                ///< DD blood leak number of setpoint check failures
     DD_EVENT_CPU_RAM_ERROR_STATUS,                                      ///< DD CPU RAM error
     DD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT,                               ///< DD blood leak self test result
-    DD_EVENT_LAST = DD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT,               ///< DD last event in list
+    DD_EVENT_BC_SWITCH_ONLY_MODE_CHANGE,                                ///< DD Balancing Chamber Switching Only status event
+    DD_EVENT_BC_STATE_CHANGE,                                           ///< Balancing chamber state switch event
+    DD_EVENT_HEATER_STATE_CHANGE,                                       ///< DD heater state change event
+    DD_EVENT_DRY_BICART_STATE_CHANGE,                                   ///< DD Dry Bicart State change event
+    DD_EVENT_UF_PUMP_ON_OFF,                                            ///< DD UltraFiltration State change event
+    DD_EVENT_LAST = DD_EVENT_UF_PUMP_ON_OFF,                            ///< DD last event in list
     FP_EVENT_STARTUP,                                                   ///< FP startup event
     FP_EVENT_FIRST = FP_EVENT_STARTUP,                                  ///< FP first event in list
     FP_EVENT_OP_MODE_CHANGE,                                            ///< FP Op mode change event
@@ -481,22 +486,6 @@
 /**@}*/
 
 /**
- *  @addtogroup Ultrafiltraion
- *  @{
- */
-
-/// Enumeration of ultra filtration exec states.
-enum Ultra_filtration_Exec_States
-{
-    DD_UF_PAUSED = 0,                               ///< Ultrafiltration pasued state
-    DD_UF_RUNNING,                                  ///< Ultrafiltration running state
-    NUM_OF_UF_EXEC_STATES                           ///< Number of ultrafiltration exec states
-};
-typedef enum Ultra_filtration_Exec_States UF_EXEC_STATE_T;  ///< Type for ultrafiltration exec state enumeration
-
-/**@}*/
-
-/**
  *  @addtogroup SpentChamberFill
  *  @{
  */
@@ -542,26 +531,35 @@
     BICARB_CHAMBER_START_STATE = 0,                                  ///< Initial state of Chamber F fill
     BICARB_CARTRIDGE_FILL_WATER_START_STATE,                         ///< Dry bicart fill water start state while dialysate delivery
     BICARB_CARTRIDGE_FILL_WATER_END_STATE,                           ///< Dry bicart fill water end state while dialysate delivery
-    BICARB_CHAMBER_CHECK_LEVEL_STATE,                                ///< Bicarb Chamber check level state
-    BICARB_CHAMBER_FILL_STATE,                                       ///< Bicarb Chamber fill start state
+    BICARB_CHAMBER_SUPPLY_STATE,                                     ///< Bicarb Chamber fill start state
     BICARB_CHAMBER_PRESSURE_CHECK_STATE,                             ///< Bicarb Chamber pressure check start state
     BICARB_SUPPLY_VENT_START_STATE,                                  ///< Bicarb Chamber supply vent cartridge and Chamber F start state
     BICARB_SUPPLY_VENT_END_STATE,                                    ///< Bicarb Chamber supply vent cartridge and Chamber F end state
     NUM_OF_BICARB_CHAMBER_FILL_EXEC_STATES                           ///< Number of Bicarb chamber fill state
 };
 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 DryBicart drain exec states
 enum Dry_Bicart_Drain_Exec_States
 {
-    DRY_BICART_DRAIN_START_STATE = 0,                                 ///< Initial state of dry bicart drain
-    DRY_BICART_FLUID_DRAIN_STATE,                                     ///< Dry bicart fluid drain state
-    DRY_BICART_FLUID_DRAIN_DURATION_CHECK_STATE,                      ///< Dry bicart drain duration check state
-    DRY_BICART_FLUID_DRAIN_END_STATE,                                 ///< Dry bicart drain end state
+    DRY_BICART_DRAIN_START_STATE = 0,                                ///< Initial state of dry bicart drain
+    DRY_BICART_FLUID_DRAIN_STATE,                                    ///< Dry bicart fluid drain state
+    DRY_BICART_FLUID_DRAIN_DURATION_CHECK_STATE,                     ///< Dry bicart drain duration check state
+    DRY_BICART_FLUID_DRAIN_END_STATE,                                ///< Dry bicart drain end state
     NUM_OF_DRY_BICART_DRAIN_EXEC_STATES
 };
 typedef enum Dry_Bicart_Drain_Exec_States DRY_BICART_DRAIN_EXEC_STATE_T;    ///< Type for dry bicart fill exec state enumeration
 
+/// Enumeration of drybicart depressurize exec states
+enum Dry_Bicart_Depressurize_Exec_States
+{
+    DRY_BICART_DEPRESSURIZE_START_STATE = 0,                         ///< Initial state of dry bicart depressurise
+    DRY_BICART_DEPRESSURIZE_VENT_START_STATE,                        ///< Dry bicart depressurize vent start state
+    DRY_BICART_DEPRESSURIZE_VENT_END_STATE,                          ///< Dry bicart depressurize vent end state
+    NUM_OF_DRY_BICART_DEPRESSURIZE_EXEC_STATES
+};
+typedef enum Dry_Bicart_Depressurize_Exec_States DRY_BICART_DEPRESSURIZE_EXEC_STATE_T;    ///< Type for dry bicart depressurize exec state enumeration
+
 /// Enumeration of conductivity sensors.
 enum Conductivity_Sensors
 {