Index: DDDefs.h
===================================================================
diff -u -r95b26747824594c0e36cb198002c61660a575a22 -r16c3706648bfd23ef916f980abbac1a268e81242
--- DDDefs.h	(.../DDDefs.h)	(revision 95b26747824594c0e36cb198002c61660a575a22)
+++ DDDefs.h	(.../DDDefs.h)	(revision 16c3706648bfd23ef916f980abbac1a268e81242)
@@ -7,8 +7,8 @@
 *
 * @file    DDDefs.h
 *
-* @author  (last)      Varshini Nagabooshanam
-* @date    (last)      02-Feb-2026
+* @author  (last)      Sameer Kalliadan Poyil
+* @date    (last)      10-Feb-2026
 *
 * @author  (original)  Sean Nash
 * @date    (original)  01-Aug-2024
@@ -137,6 +137,7 @@
 {
     DD_PRE_GEN_DIALYSATE_HYD_CHAMBER_FILL_CHECK = 0,        ///< DD Pre-Gen Dialysate hyrochamber fill check
     DD_PRE_GEN_WET_SELF_TEST,                               ///< DD Pre-Gen WetSelf Test
+    DD_PRE_GEN_DRY_BICART_INITIAL_FILL,                     ///< DD Pre-Gen DryBicart Initial Fill
     DD_PRE_GEN_DIALYSATE_WAIT_FOR_GEND,                     ///< DD Pre-Gen Dialysate Wait for Gen Dialysate state transition
     NUM_OF_DD_PRE_GEN_DIALYSATE_STATES                      ///< Number of Pre-Gen Dialysate mode states
 };
@@ -395,8 +396,8 @@
     FIRST_SP_VALVE = D79_PMP_VALV,                ///< First spare valve
     D83_VALV,                                     ///< D83 Valve mapped to Spare valve 1
     D91_VALV,                                     ///< D91 Valve mapped to Spare valve 2
-    SPARE3_VALV,                                  ///< Spare Valve 3
-    SPARE4_VALV,                                  ///< Spare Valve 4
+    D104_VALV,                                    ///< D104 Valve mapped to Spare valve 2
+    D95_VALV,                                     ///< D95 Valve mapped to Spare valve 2
     SPARE5_VALV,                                  ///< Spare Valve 5
     D100_VALV,                                    ///< D100 Valve mapped to Spare valve 6
     SPARE7_VALV,                                  ///< Spare Valve 7
@@ -487,7 +488,13 @@
 };
 typedef enum Spent_Chamber_Fill_Exec_States SPENT_CHAMBER_FILL_EXEC_STATE_T;  ///< Type for spent chamber fill exec state enumeration
 
+/**@}*/
 
+/**
+ *  @addtogroup DryBicart
+ *  @{
+ */
+
 /// Enumeration of DryBicart fill exec states.
 enum Dry_Bicart_Fill_Exec_States
 {
@@ -506,13 +513,28 @@
 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_CHECK_LEVEL_STATE,                                ///< Bicarb Chamber check level state
     BICARB_CHAMBER_FILL_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
+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
+    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
+
 /**@}*/
 
 #endif