Index: DDDefs.h
===================================================================
diff -u -re29faa9d6c8f662fc74d41ee56042dace0e67bd9 -r29c7246fc2d2ff4907401a4c67285679f5089241
--- DDDefs.h	(.../DDDefs.h)	(revision e29faa9d6c8f662fc74d41ee56042dace0e67bd9)
+++ DDDefs.h	(.../DDDefs.h)	(revision 29c7246fc2d2ff4907401a4c67285679f5089241)
@@ -7,8 +7,8 @@
 *
 * @file    DDDefs.h
 *
-* @author  (last)      Sameer Kalliadan Poyil
-* @date    (last)      24-Jun-2026
+* @author  (last)      Jashwant Gantyada
+* @date    (last)      29-Jul-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -334,11 +334,17 @@
     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_BC_SWITCH_ONLY_MODE_CHANGE,                                ///< DD Balancing Chamber Switching Only status event
-    DD_EVENT_BC_STATE_CHANGE,                                           ///< Balancing chamber state switch event
+    DD_EVENT_BC_STATE_CHANGE,                                           ///< DD Balancing chamber state switch event
+    DD_EVENT_BC_FILL_TIMEOUT,                                           ///< DD Balancing chamber fill timeout 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
+    DD_EVENT_CALIBRATION_RECORD_UPDATE,                                 ///< DD NVM Calibration Record Change Event
+    DD_EVENT_SYSTEM_RECORD_UPDATE,                                      ///< DD NVM System Record Change Event
+    DD_EVENT_SERVICE_RECORD_UPDATE,                                     ///< DD NVM Service Record Change Event
+    DD_EVENT_INSTITUTIONAL_RECORD_UPDATE,                               ///< DD NVM Institutional Record Change Event
+    DD_EVENT_USAGE_INFO_RECORD_UPDATE,                                  ///< DD NVM Usage Info Record Change Event
+    DD_EVENT_LAST = DD_EVENT_USAGE_INFO_RECORD_UPDATE,                  ///< 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
@@ -477,22 +483,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
  *  @{
  */
@@ -501,6 +491,7 @@
 enum Spent_Chamber_Fill_Exec_States
 {
     SPENT_CHAMBER_FILL_STATE_START = 0,                            ///< Initial state of spent chamber fill
+    SPENT_CHAMBER_FILL_WAIT_PRESSURE_STABILIZE_STATE,              ///< Pressure Stabilization Wait state
     SPENT_CHAMBER_FILL_STATE1_FILL_START,                          ///< Spent chamber fill state 1 fill start state
     SPENT_CHAMBER_FILL_STATE1_DOSING_CNTRL,                        ///< Spent chamber fill state 1 dosing control
     SPENT_CHAMBER_FILL_STATE1_FILL_END,                            ///< Spent chamber fill state 1 fill end state
@@ -536,10 +527,10 @@
 enum Bicarb_Chamber_F_Fill_Exec_States
 {
     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_SUPPLY_STATE,                                     ///< Bicarb Chamber fill start state
     BICARB_CHAMBER_PRESSURE_CHECK_STATE,                             ///< Bicarb Chamber pressure check start state
+    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_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