Index: DDDefs.h
===================================================================
diff -u -ref2b4f007d09b4b14db6701816e5d94808a79239 -rb275bc38ae16b44c6d387ad14d0ac0d9610be90d
--- DDDefs.h	(.../DDDefs.h)	(revision ef2b4f007d09b4b14db6701816e5d94808a79239)
+++ DDDefs.h	(.../DDDefs.h)	(revision b275bc38ae16b44c6d387ad14d0ac0d9610be90d)
@@ -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_FILL_CHECK,
     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
 };
@@ -146,6 +147,7 @@
 enum DD_Pre_Gen_Wet_Self_Test_States
 {
     DD_WET_SELF_TEST_START = 0,                                 ///< DD Wet Slef test Start
+    DD_WET_SELF_TEST_DRYBICART_FILL_CHECK,                      ///< DD Wet Slef test dry bicart fill check
     DD_WET_SELF_TEST_NEGATIVE_DEAERATION_PRES_CHECK,            ///< DD Wet Self Test Negative Deaeration Pressure check
     DD_WET_SELF_TEST_POSITIVE_DEAERATION_PRES_CHECK,            ///< DD Wet Self Test Postive Deaeration Pressure check
     DD_WET_SELF_TEST_SPENT_DIAL_PRES_CHECK,                     ///< DD Wet Self Test Spent Dialysate Pressure check
Index: MsgDefs.h
===================================================================
diff -u -r9825ec38649b784ae9b71472ab0bf4ec27e26dc8 -rb275bc38ae16b44c6d387ad14d0ac0d9610be90d
--- MsgDefs.h	(.../MsgDefs.h)	(revision 9825ec38649b784ae9b71472ab0bf4ec27e26dc8)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision b275bc38ae16b44c6d387ad14d0ac0d9610be90d)
@@ -304,6 +304,7 @@
     MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST = 0xA055,                  ///< DD dry bicart fill cycle max count overrride request
     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_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