Index: DDDefs.h =================================================================== diff -u -rffe968d36207b80678a9fd77a834f48f7d3b5aed -r8cfb792e7dd41d237e91d3d80216af8ea2f2ec42 --- DDDefs.h (.../DDDefs.h) (revision ffe968d36207b80678a9fd77a834f48f7d3b5aed) +++ DDDefs.h (.../DDDefs.h) (revision 8cfb792e7dd41d237e91d3d80216af8ea2f2ec42) @@ -533,8 +533,7 @@ 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_SUPPLY_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 Index: MsgDefs.h =================================================================== diff -u -r5d03d89caa1987d5b7062fd0feab13f4633e7587 -r8cfb792e7dd41d237e91d3d80216af8ea2f2ec42 --- MsgDefs.h (.../MsgDefs.h) (revision 5d03d89caa1987d5b7062fd0feab13f4633e7587) +++ MsgDefs.h (.../MsgDefs.h) (revision 8cfb792e7dd41d237e91d3d80216af8ea2f2ec42) @@ -418,6 +418,7 @@ MSG_ID_DD_SUBSTITUTION_PUMP_TARGET_RATE_OVERRIDE_REQUEST = 0xA06F, ///< DD substitution pump target speed override request. MSG_ID_DD_CONDUCTIVITY_SENSOR_CAL_REQUEST = 0xA070, ///< DD conductivity sensor cal request MSG_ID_DD_CONDUCTIVITY_SENSOR_CAL_RESPONSE = 0xA071, ///< DD conductivity sensor cal response + MSG_ID_DD_MIXING_CONTROL_DATA = 0xA072, ///< DD mixing control publish data 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