Index: DDDefs.h
===================================================================
diff -u -rb1482aba19e14d3d0f46299399448e1bb1ee7fcc -rd5a65c0ef712ea473a9f5d72ef881e3e69a7c8ba
--- DDDefs.h	(.../DDDefs.h)	(revision b1482aba19e14d3d0f46299399448e1bb1ee7fcc)
+++ DDDefs.h	(.../DDDefs.h)	(revision d5a65c0ef712ea473a9f5d72ef881e3e69a7c8ba)
@@ -7,8 +7,8 @@
 *
 * @file    DDDefs.h
 *
-* @author  (last)      Varshini Nagabooshanam
-* @date    (last)      23-Jan-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
 };
@@ -379,7 +380,7 @@
     D3_VALV,                                      ///< Valve Hydraulics Inlet (D3)
     D80_VALV,                                     ///< Valve Dry Bicarb (D80)
     D81_VALV,                                     ///< Valve De-scaler (D81)
-    D85_VALV,                                     ///< Reserved space mapped for Valve (D85)
+    D85_VALV,                                     ///< Valve DryBicart vent (D85)
     LAST_HYD_VALVE = D85_VALV,                    ///< End of Hydraulics valve of group
     FIRST_BC_VALVE,                               ///< Start of Balancing Chamber valve group
     D23_VALV = FIRST_BC_VALVE,                    ///< Balancing chamber Valve 1 (D23)
@@ -391,12 +392,12 @@
     D26_VALV,                                     ///< Balancing chamber Valve 7 (D26)
     D22_VALV,                                     ///< Balancing chamber Valve 8 (D22)
     LAST_BC_VALVE = D22_VALV,                     ///< End of Balancing Chamber valve group
-    D79_PMP_VALV,                                 ///< D79 Pump mapped to Spare valve 0
-    FIRST_SP_VALVE = D79_PMP_VALV,                ///< First spare valve
+    D88_79_VALV,                                  ///< D88 Valve mapped to Spare valve 0  // TODO to be renamed to D88_VALV once Beta1.9 is obsolete
+    FIRST_SP_VALVE = D88_79_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 3
+    D95_VALV,                                     ///< D95 Valve mapped to Spare valve 4
     SPARE5_VALV,                                  ///< Spare Valve 5
     D100_VALV,                                    ///< D100 Valve mapped to Spare valve 6
     SPARE7_VALV,                                  ///< Spare Valve 7
@@ -414,7 +415,7 @@
     P39_VALV,                                     ///< Valve (P39)
     P6_VALV,                                      ///< Valve (P6)
     LAST_FP_VALVE = P6_VALV,                      ///< Last FP valve
-    DD_NUM_OF_VALVES                              ///< Number of valves
+    DD_NUM_OF_VALVES                              ///< Number of DD valves
 };
 typedef enum DD_Valves DD_VALVES_T;
 
@@ -489,4 +490,51 @@
 
 /**@}*/
 
+/**
+ *  @addtogroup DryBicart
+ *  @{
+ */
+
+/// Enumeration of DryBicart fill exec states.
+enum Dry_Bicart_Fill_Exec_States
+{
+    DRY_BICART_START_STATE = 0,                                      ///< Initial state of dry bicart fill
+    DRY_BICART_FILL_WATER_START_STATE,                               ///< Dry bicart fill start state
+    DRY_BICART_FILL_WATER_END_STATE,                                 ///< Dry bicart fill end state
+    DRY_BICART_DEGAS_START_STATE,                                    ///< Dry bicart vent start state
+    DRY_BICART_DEGAS_END_STATE,                                      ///< Dry bicart vent end state
+    DRY_BICART_FILL_DURATION_CHECK_STATE,                            ///< Dry bicart fill duration check state
+    DRY_BICART_FILL_COMPLETE_STATE,                                  ///< Dry bicart fill complete state
+    NUM_OF_DRY_BICART_FILL_EXEC_STATES                               ///< Number of dry bicart fill states
+};
+typedef enum Dry_Bicart_Fill_Exec_States DRY_BICART_FILL_EXEC_STATE_T;  ///< Type for dry bicart fill exec state enumeration
+
+/// Enumeration of Bicarb chamber fill exec states.
+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