Index: MsgDefs.h =================================================================== diff -u -rd3f89a836ece4a21be2b9abfb244adfc4290357b -r44dddc7881f76b4120df7f2b0a92d3d51140c786 --- MsgDefs.h (.../MsgDefs.h) (revision d3f89a836ece4a21be2b9abfb244adfc4290357b) +++ MsgDefs.h (.../MsgDefs.h) (revision 44dddc7881f76b4120df7f2b0a92d3d51140c786) @@ -101,8 +101,8 @@ MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST = 0x46, ///< UI request to change pressure limits MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE = 0x47, ///< HD response to change pressure limits request MSG_ID_DG_FANS_DATA = 0x48, ///< DG broadcast fans data - MSG_ID_HD_CALIBRATION_DATA = 0x49, ///< HD broadcast calibration data - MSG_ID_DG_CALIBRATION_DATA = 0x4A, ///< DG broadcast calibration data + MSG_ID___AVAILABLE_4 = 0x49, ///< This msg ID is available for use + MSG_ID___AVAILABLE_5 = 0x4A, ///< This msg ID is available for use MSG_ID_UI_HEPARIN_PAUSE_RESUME_REQUEST = 0x4B, ///< UI request to pause/resume Heparin delivery MSG_ID_HD_HEPARIN_PAUSE_RESUME_RESPONSE = 0x4C, ///< HD response to pause/resume Heparing delivery request MSG_ID_HD_HEPARIN_DATA_BROADCAST = 0x4D, ///< HD broadcast of Heparin delivery data @@ -140,7 +140,7 @@ MSG_ID_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE = 0x800A, ///< Blood pump motor controller speed override request MSG_ID_BLOOD_PUMP_MC_MEAS_CURR_OVERRIDE = 0x800B, ///< Blood pump motor controller current override request MSG_ID_BLOOD_FLOW_SEND_INTERVAL_OVERRIDE = 0x800C, ///< Blood flow broadcast interval override request - MSG_ID___AVAILABLE_3 = 0x800D, ///< This msg ID is available for use + MSG_ID_TREATMENT_TIME_REMAINING_OVERRIDE = 0x800D, ///< Treatment time remaining override request MSG_ID_BLOOD_PUMP_MEAS_SPEED_OVERRIDE = 0x800E, ///< Blood pump measured motor speed override request MSG_ID_BLOOD_PUMP_MEAS_ROTOR_SPEED_OVERRIDE = 0x800F, ///< Blood pump measured rotor speed override request MSG_ID_DIAL_IN_FLOW_SET_PT_OVERRIDE = 0x8010, ///< Dialysate inlet flow set point override request @@ -169,9 +169,9 @@ MSG_ID_HD_ACCEL_OVERRIDE = 0x8027, ///< HD accelerometer sensor override request MSG_ID_HD_ACCEL_MAX_OVERRIDE = 0x8028, ///< HD accelerometer sensor max. override request MSG_ID_HD_ACCEL_SEND_INTERVAL_OVERRIDE = 0x8029, ///< HD accelerometer data broadcast interval override request - MSG_ID_HD_ACCEL_SET_CALIBRATION = 0x802A, ///< HD accelerometer set calibration factors request - MSG_ID_HD_BLOOD_FLOW_SET_CALIBRATION = 0x802B, ///< Blood flow set calibration factors request - MSG_ID_HD_DIALYSATE_FLOW_SET_CALIBRATION = 0x802C, ///< Dialysate flow set calibration factors request + MSG_ID___AVAILABLE_6 = 0x802A, ///< This msg ID is available for use + MSG_ID___AVAILABLE_7 = 0x802B, ///< This msg ID is available for use + MSG_ID___AVAILABLE_8 = 0x802C, ///< This msg ID is available for use MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER = 0x802D, ///< Set a treatment parameter (will change actual setting, not an override) MSG_ID_HD_VALVES_HOME = 0x802E, ///< Home an HD Valve MSG_ID_HD_VALVES_POSITION_OVERRIDE = 0x802F, ///< Set an HD valve to a position in counts @@ -186,8 +186,17 @@ MSG_ID_DIAL_IN_PUMP_HOME_CMD = 0x8038, ///< Dialysate inlet pump home command MSG_ID_DIAL_OUT_PUMP_HOME_CMD = 0x8039, ///< Dialysate outlet pump home command MSG_ID_SUPER_CLEAR_ALARMS_CMD = 0x803A, ///< Clears all alarms (even if non-recoverable or fault) - MSG_ID_HD_REQUEST_CALIBRATION_DATA = 0x803B, ///< Requests calibration data from HD - MSG_ID_HD_ERASE_CALIBRATION_DATA = 0x803C, ///< Requests calibration data on HD be erased + MSG_ID___AVAILABLE_9 = 0x803B, ///< This msg ID is available for use + MSG_ID___AVAILABLE_10 = 0x803C, ///< This msg ID is available for use + MSG_ID_HD_SET_CALIBRATION_RECORD = 0x803D, ///< HD set calibration record that is received from Dialin + MSG_ID_HD_GET_CALIBRATION_RECORD = 0x803E, ///< HD get calibration record that is requested from Dialin + MSG_ID_HD_SEND_CALIBRATION_RECORD = 0x803F, ///< HD send calibration record to CAN bus to be received in Dialin (equivalent to publish) + MSG_ID_HD_SET_SYSTEM_RECORD = 0x8040, ///< HD set system record that is received from Dialin + MSG_ID_HD_GET_SYSTEM_RECORD = 0x8041, ///< HD get system record that is requested from Dialin + MSG_ID_HD_SEND_SYSTEM_RECORD = 0x8042, ///< HD send system record to CAN bus to be received in Dialin (equivalent to publish) + MSG_ID_HD_GET_SERVICE_RECORD = 0x8043, ///< HD get service record that is requested from Dialin + MSG_ID_HD_SET_SERVICE_RECORD = 0x8044, ///< HD set service record that is received from Dialin + MSG_ID_HD_SEND_SERVICE_RECORD = 0x8045, ///< HD send service record to CAN bus to be received in Dialin (equivalent to publish) MSG_ID_FIRST_DG_TESTER_MESSAGE = 0xA000, ///< First DG test message ID MSG_ID_DG_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DG_TESTER_MESSAGE, ///< DG tester log-in @@ -214,7 +223,7 @@ MSG_ID_DG_ACCEL_OVERRIDE = 0xA017, ///< DG accelerometer sensor override request MSG_ID_DG_ACCEL_MAX_OVERRIDE = 0xA018, ///< DG accelerometer sensor max. override request MSG_ID_DG_ACCEL_SEND_INTERVAL_OVERRIDE = 0xA019, ///< DG accelerometer data broadcast interval override request - MSG_ID_DG_ACCEL_SET_CALIBRATION = 0xA01A, ///< DG accelerometer set calibration factors request + MSG_ID___AVAILABLE_11 = 0xA01A, ///< This msg ID is available for use MSG_ID_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE = 0xA01C, ///< Drain pump set delta pressure override MSG_ID_HEAT_DISINFECT_RECIRC_PATH_DURATION_MINS = 0xA01D, ///< Heat disinfection recirculation path duration in minutes MSG_ID_HEAT_DISINFECT_R1_TO_R2_DURATION_MINS = 0xA01E, ///< Heat disinfection reservoir 1 to reservoir 2 duration in minutes @@ -239,9 +248,16 @@ MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE = 0xA032, ///< DG RO pump target pressure override MSG_ID_DG_SET_CALIBRATION_RECORD = 0xA033, ///< DG set calibration record that is received from Dialin MSG_ID_DG_GET_CALIBRATION_RECORD = 0xA034, ///< DG get calibration record that is requested from Dialin - MSG_ID_DG_SEND_CALIBRATION_RECORD = 0xA035, ///< DG send calibration record to CAN bus that is received in Dialin + MSG_ID_DG_SEND_CALIBRATION_RECORD = 0xA035, ///< DG send calibration record to CAN bus to be received in Dialin (equivalent to publish) MSG_ID_DG_SET_SYSTEM_RECORD = 0xA036, ///< DG set system record that is received from Dialin MSG_ID_DG_GET_SYSTEM_RECORD = 0xA037, ///< DG get system record that is requested from Dialin + MSG_ID_DG_SEND_SYSTEM_RECORD = 0xA038, ///< DG send system record to CAN bus to be received in Dialin (equivalent to publish) + MSG_ID_DG_GET_SERVICE_RECORD = 0xA039, ///< DG get service record that is requested from Dialin + MSG_ID_DG_SET_SERVICE_RECORD = 0xA03A, ///< DG set service record that is received from Dialin + MSG_ID_DG_SEND_SERVICE_RECORD = 0xA03B, ///< DG send service record to CAN bus to be received in Dialin (equivalent to publish) + MSG_ID_DG_GET_SCHEDULED_RUNS_RECORD = 0xA03C, ///< DG get scheduled runs that is requested from Dialin + MSG_ID_DG_SET_SCHEDULED_RUNS_RECORD = 0xA03D, ///< DG set scheduled runs that is received from Dialin + MSG_ID_DG_SEND_SCHEDULED_RUNS_RECORD = 0xA03E, ///< DG send scheduled runs to CAN bus to be received in Dialin (equivalent to publish) MSG_ID_HD_DEBUG_EVENT = 0xFFF1, ///< HD debug event text to be logged in event log MSG_ID_DG_DEBUG_EVENT = 0xFFF2, ///< DG debug event text to be logged in event log