Index: DDDefs.h
===================================================================
diff -u -r246eafb023f008a3e3ad0ab8e38d9b5ed3b91ec3 -r33d21a82caa07ab8e0c0e428cab35a38420d0303
--- DDDefs.h	(.../DDDefs.h)	(revision 246eafb023f008a3e3ad0ab8e38d9b5ed3b91ec3)
+++ DDDefs.h	(.../DDDefs.h)	(revision 33d21a82caa07ab8e0c0e428cab35a38420d0303)
@@ -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
@@ -40,6 +40,7 @@
     DD_MODE_ROPS,                       ///< RO permeate sample mode
     DD_MODE_UPDT,                       ///< Update mode
     DD_MODE_NLEG,                       ///< Not legal - an illegal mode transition occurred
+    DD_MODE_FLUS,                       ///< Flush mode
     NUM_OF_DD_MODES                     ///< Number of DD operation modes
 };
 typedef enum DD_Op_Modes DD_OP_MODE_T;  ///< Type for DD operation modes enumeration
@@ -293,10 +294,12 @@
 /// Enumeration of available DD commands.
 enum DD_Command
 {
-    DD_CMD_NONE = 0,                           ///< Not a command
-    NUM_OF_DD_COMMANDS                         ///< Number of DD commands
+    DD_CMD_NONE = 0,                                ///< Not a command
+    DD_CMD_START_FLUSH,                             ///< Command to request DD to start flush
+    DD_CMD_START_HEAT_DISINFECT_ACTIVE_COOL,        ///< Command to request DD to start heat disinfect with active cool
+    NUM_OF_DD_COMMANDS                              ///< Number of DD commands
 };
-typedef enum DD_Command DD_COMMAND_T;          ///< Type for DD commands enumeration
+typedef enum DD_Command DD_COMMAND_T;               ///< Type for DD commands enumeration
 
 /// Enumeration of general commands to DD sub-system.
 enum DD_General_Commands
@@ -333,7 +336,18 @@
     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,                                           ///< 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_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
@@ -432,6 +446,9 @@
     P37_VALV,                                     ///< Valve (P37)
     P39_VALV,                                     ///< Valve (P39)
     P6_VALV,                                      ///< Valve (P6)
+    P3_VALV,                                      ///< Valve (P3)
+    P43_VALV,                                     ///< Valve (P43)
+    P48_VALV,                                     ///< Valve (P48)
     LAST_FP_VALVE = P6_VALV,                      ///< Last FP valve
     DD_NUM_OF_VALVES                              ///< Number of DD valves
 };
@@ -472,22 +489,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
  *  @{
  */
@@ -531,10 +532,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