Index: DDDefs.h
===================================================================
diff -u -r24a8108d62a8c8f6a527541adeed00dde76bcf8f -r2de751b9f394d5316981542e3e744e05a088f698
--- DDDefs.h	(.../DDDefs.h)	(revision 24a8108d62a8c8f6a527541adeed00dde76bcf8f)
+++ DDDefs.h	(.../DDDefs.h)	(revision 2de751b9f394d5316981542e3e744e05a088f698)
@@ -512,9 +512,13 @@
 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
Index: MsgDefs.h
===================================================================
diff -u -rb275bc38ae16b44c6d387ad14d0ac0d9610be90d -r2de751b9f394d5316981542e3e744e05a088f698
--- MsgDefs.h	(.../MsgDefs.h)	(revision b275bc38ae16b44c6d387ad14d0ac0d9610be90d)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 2de751b9f394d5316981542e3e744e05a088f698)
@@ -305,6 +305,7 @@
     MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST = 0xA056,                    ///< DD dry bicart fill request overrride request
     MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST = 0xA057,                ///< DD bicarb chamber fill request overrride request
     MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST = 0xA058,                       ///< DD bicarb drain request overrride request
+    MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST = 0xA059,                    ///< DD bicarb cartridge select(small-0, large-1) overrride request
 
     MSG_ID_FIRST_FP_TESTER_MESSAGE = 0xB000,                                        ///< First FP test message ID
     MSG_ID_FP_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_FP_TESTER_MESSAGE,                ///< FP tester log-in