Index: DDDefs.h =================================================================== diff -u -r581c7ef4bb3af907e49b9a5619d7addd47057075 -r851c35e5db2b4f97e00e86b9f1ca4bccf8929c23 --- DDDefs.h (.../DDDefs.h) (revision 581c7ef4bb3af907e49b9a5619d7addd47057075) +++ DDDefs.h (.../DDDefs.h) (revision 851c35e5db2b4f97e00e86b9f1ca4bccf8929c23) @@ -252,8 +252,7 @@ DD_EVENT_OP_MODE_CHANGE, ///< DD Op mode change event DD_EVENT_SUB_MODE_CHANGE, ///< DD Op sub-mode change event DD_EVENT_OPERATION_STATUS, ///< DD operation status event - DD_EVENT_FLOATER_1_LEVEL_CHANGE, ///< DD floater 1 level change event - DD_EVENT_FLOATER_2_LEVEL_CHANGE, ///< DD floater 2 level change event + DD_EVENT_FLOATER_LEVEL_CHANGE, ///< DD floater 1 level change event DD_EVENT_BICARB_LEVEL_CHANGE, ///< DD bicarb level change event DD_EVENT_SPENT_DIALYSATE_LEVEL_CHANGE, ///< DD spent dialysate air seperation level change event DD_EVENT_TD_COMMUNICATION_LOSS, ///< DD TD communication loss Index: MsgDefs.h =================================================================== diff -u -r20715ecef1276ccdb303fa9603d75722df8df700 -r851c35e5db2b4f97e00e86b9f1ca4bccf8929c23 --- MsgDefs.h (.../MsgDefs.h) (revision 20715ecef1276ccdb303fa9603d75722df8df700) +++ MsgDefs.h (.../MsgDefs.h) (revision 851c35e5db2b4f97e00e86b9f1ca4bccf8929c23) @@ -133,7 +133,6 @@ MSG_ID_TD_BLOOD_PUMP_MEASURED_MOTOR_SPEED_OVERRIDE_REQUEST = 0x8029, ///< TD override request for blood pump measured motor speed MSG_ID_TD_BLOOD_PUMP_MEASURED_ROTOR_SPEED_OVERRIDE_REQUEST = 0x802A, ///< TD override request for blood pump measured rotor speed MSG_ID_TD_BLOOD_PUMP_ROTOR_COUNT_OVERRIDE_REQUEST = 0x802B, ///< TD override request for blood pump rotor count - MSG_ID_TD_PERISTALTIC_PUMP_SET_SPEED_REQUEST = 0x802C, ///< TD set peristaltic pump set speed request MSG_ID_FIRST_DD_TESTER_MESSAGE = 0xA000, ///< First DD test message ID MSG_ID_DD_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DD_TESTER_MESSAGE, ///< DD tester log-in @@ -185,6 +184,10 @@ MSG_ID_DD_HEATERS_START_STOP_OVERRIDE_REQUEST = 0xA02E, ///< DD Heaters start override request MSG_ID_DD_VALVES_OPEN_CLOSE_STATE_OVERRIDE_REQUEST = 0xA02F, ///< DD Valves open/close state override request MSD_ID_DD_RO_COMMUNICATION_STATUS_OVERRIDE_REQUEST = 0xA030, ///< DD RO CAN Communication status override request + MSG_ID_DD_BAL_CHAMBER_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA031, ///< DD balance chamber data publish interval override request + MSG_ID_DD_BAL_CHAMBER_SWITCH_FREQ_OVERRIDE_REQUEST = 0xA032, ///< DD balance chamber switching frequency override request + MSG_ID_DD_DIAL_DELIVERY_IN_PROGRESS_OVERRIDE_REQUEST = 0xA033, ///< DD dialysate delivery in progress override request + MSG_ID_DD_DIAL_DELIVERY_GOOD_TO_DELIVER_OVERRIDE_REQUEST = 0xA034, ///< DD dialysate delivery good to deliver override request MSG_ID_FIRST_RO_TESTER_MESSAGE = 0xB000, ///< First RO test message ID MSG_ID_RO_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_RO_TESTER_MESSAGE, ///< RO tester log-in