Index: dialin/hd/pressure_occlusion.py =================================================================== diff -u -r1d827991f6c7bff31397413562b3db994d6062be -r864ac652e57073046c683b996fe736d9a851b736 --- dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision 1d827991f6c7bff31397413562b3db994d6062be) +++ dialin/hd/pressure_occlusion.py (.../pressure_occlusion.py) (revision 864ac652e57073046c683b996fe736d9a851b736) @@ -137,7 +137,7 @@ payload = rst + prs message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_PRESSURE_ARTERIAL_OVERRIDE.value, + message_id=MsgIds.MSG_ID_PRESSURE_ARTERIAL_OVERRIDE.value, payload=payload) self.logger.debug("override measured arterial pressure") @@ -176,7 +176,7 @@ payload = rst + prs message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_PRESSURE_VENOUS_OVERRIDE.value, + message_id=MsgIds.MSG_ID_PRESSURE_VENOUS_OVERRIDE.value, payload=payload) self.logger.debug("override measured venous pressure") @@ -214,7 +214,7 @@ payload = rst + occ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_OCCLUSION_BLOOD_PUMP_OVERRIDE.value, + message_id=MsgIds.MSG_ID_OCCLUSION_BLOOD_PUMP_OVERRIDE.value, payload=payload) self.logger.debug("override measured blood pump occlusion pressure") @@ -253,7 +253,7 @@ payload = rst + occ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_OCCLUSION_DIAL_IN_PUMP_OVERRIDE.value, + message_id=MsgIds.MSG_ID_OCCLUSION_DIAL_IN_PUMP_OVERRIDE.value, payload=payload) self.logger.debug("override measured dialysate inlet pump occlusion pressure") @@ -292,7 +292,7 @@ payload = rst + occ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_OCCLUSION_DIAL_OUT_PUMP_OVERRIDE.value, + message_id=MsgIds.MSG_ID_OCCLUSION_DIAL_OUT_PUMP_OVERRIDE.value, payload=payload) self.logger.debug("override measured dialysate outlet pump occlusion pressure") @@ -331,7 +331,7 @@ payload = rst + mis message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_PRES_OCCL_SEND_INTERVAL_OVERRIDE.value, + message_id=MsgIds.MSG_ID_PRES_OCCL_SEND_INTERVAL_OVERRIDE.value, payload=payload) self.logger.debug("override pressure/occlusion broadcast interval") Index: dialin/hd/rtc.py =================================================================== diff -u -r8ea13ae6dd10732bfcc456798f4785c4d88c95d3 -r864ac652e57073046c683b996fe736d9a851b736 --- dialin/hd/rtc.py (.../rtc.py) (revision 8ea13ae6dd10732bfcc456798f4785c4d88c95d3) +++ dialin/hd/rtc.py (.../rtc.py) (revision 864ac652e57073046c683b996fe736d9a851b736) @@ -18,6 +18,7 @@ DenaliChannels) from ..utils.conversions import integer_to_bytearray from ..utils.base import _AbstractSubSystem, _publish +from ..common.msg_defs import MsgIds from logging import Logger @@ -28,9 +29,6 @@ """ - MSG_ID_SET_RTC_DATE_TIME = 0x801D - MSG_ID_RTC_EPOCH = 0x000A - START_POS_SET_PT = DenaliMessage.PAYLOAD_START_INDEX END_POS_SET_PT = START_POS_SET_PT + 4 @@ -46,7 +44,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.hd_sync_broadcast_ch_id - msg_id = self.MSG_ID_RTC_EPOCH + msg_id = MsgIds.MSG_ID_RTC_EPOCH.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_rtc_epoch) self.rtc_epoch = 0 @@ -93,7 +91,7 @@ payload = sec + mint + hour + day + month + year message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_SET_RTC_DATE_TIME, + message_id=MsgIds.MSG_ID_SET_RTC_DATE_TIME.value, payload=payload) self.logger.debug("Setting time and date to rtc") Index: dialin/hd/treatment.py =================================================================== diff -u -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -r864ac652e57073046c683b996fe736d9a851b736 --- dialin/hd/treatment.py (.../treatment.py) (revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4) +++ dialin/hd/treatment.py (.../treatment.py) (revision 864ac652e57073046c683b996fe736d9a851b736) @@ -273,7 +273,7 @@ payload = par + flo message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, + message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value, payload=payload) print("setting blood flow rate") @@ -311,7 +311,7 @@ payload = par + flo message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, + message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value, payload=payload) print("setting dialysate flow rate") @@ -347,7 +347,7 @@ payload = par + dur message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, + message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value, payload=payload) print("setting treatment duration") @@ -383,7 +383,7 @@ payload = par + sto message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, + message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value, payload=payload) print("setting Heparin pre-stop time") @@ -419,7 +419,7 @@ payload = par + vol message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, + message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value, payload=payload) print("setting saline bolus volume") @@ -458,7 +458,7 @@ payload = par + acd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, + message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value, payload=payload) print("setting acid concentrate parameter") @@ -495,7 +495,7 @@ payload = par + bic message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, + message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value, payload=payload) print("setting bicarbonate concentrate parameter") @@ -535,7 +535,7 @@ payload = par + dia message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, + message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value, payload=payload) print("setting dialyzer type parameter") @@ -571,7 +571,7 @@ payload = par + bpi message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, + message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value, payload=payload) print("setting BP measurement interval parameter") @@ -607,7 +607,7 @@ payload = par + flo message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, + message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value, payload=payload) print("setting rinseback flow rate parameter") @@ -643,7 +643,7 @@ payload = par + pre message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, + message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value, payload=payload) print("setting arterial pressure lower alarm limit parameter") @@ -679,7 +679,7 @@ payload = par + pre message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, + message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value, payload=payload) print("setting arterial pressure upper alarm limit parameter") @@ -715,7 +715,7 @@ payload = par + pre message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, + message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value, payload=payload) print("setting venous pressure lower alarm limit parameter") @@ -751,7 +751,7 @@ payload = par + pre message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, + message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value, payload=payload) print("setting venous pressure upper alarm limit parameter") @@ -787,7 +787,7 @@ payload = par + rat message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, + message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value, payload=payload) print("setting Heparin dispense rate parameter") @@ -823,7 +823,7 @@ payload = par + vol message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, + message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value, payload=payload) print("setting Heparin bolus volume parameter") @@ -859,7 +859,7 @@ payload = par + tmp message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, + message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value, payload=payload) print("setting dialysate temperature parameter") @@ -895,7 +895,7 @@ payload = par + vol message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_TREATMENT_PARAMETER.value, + message_id=MsgIds.MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER.value, payload=payload) print("setting ultrafiltration volume parameter") Index: dialin/hd/watchdog.py =================================================================== diff -u -r8ea13ae6dd10732bfcc456798f4785c4d88c95d3 -r864ac652e57073046c683b996fe736d9a851b736 --- dialin/hd/watchdog.py (.../watchdog.py) (revision 8ea13ae6dd10732bfcc456798f4785c4d88c95d3) +++ dialin/hd/watchdog.py (.../watchdog.py) (revision 864ac652e57073046c683b996fe736d9a851b736) @@ -19,16 +19,15 @@ from .constants import RESET, NO_RESET from ..utils.base import _AbstractSubSystem, _publish from logging import Logger +from ..common import MsgIds + class HDWatchdog(_AbstractSubSystem): """ Hemodialysis Delivery (HD) Dialin API sub-class for watchdog related commands. """ - # watchdog message IDs - MSG_ID_HD_WD_CHECKIN_OVERRIDE = 0x8005 - def __init__(self, can_interface, logger: Logger): """ @@ -59,7 +58,7 @@ payload = rst + sta + tsk message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=self.MSG_ID_HD_WD_CHECKIN_OVERRIDE, + message_id=MsgIds.MSG_ID_WATCHDOG_TASK_CHECKIN_OVERRIDE.value, payload=payload) self.logger.debug("override watchdog task check-in state") Index: dialin/ui/hd_simulator.py =================================================================== diff -u -r9f11c0ef3af059fbe331c803464b3be500a3ae03 -r864ac652e57073046c683b996fe736d9a851b736 --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 9f11c0ef3af059fbe331c803464b3be500a3ae03) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 864ac652e57073046c683b996fe736d9a851b736) @@ -173,7 +173,7 @@ payload = bytearray(0x01) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, - message_id=HDButtons.MSG_ID_HD_POWEROFF_OPEN, + message_id=MsgIds.MSG_ID_OFF_BUTTON_PRESS.value, payload=payload) self.can_interface.send(message, 0) @@ -188,7 +188,7 @@ payload = integer_to_bytearray(1) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_sync_broadcast_ch_id, - message_id=HDButtons.MSG_ID_HD_POWEROFF_BROADCAST, + message_id=MsgIds.MSG_ID_POWER_OFF_WARNING.value, payload=payload) self.can_interface.send(message, 0) @@ -203,7 +203,7 @@ payload = integer_to_bytearray(1) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, - message_id=HDButtons.MSG_ID_HD_POWEROFF_TIMEOUT, + message_id=MsgIds.MSG_ID_OFF_BUTTON_PRESS.value, payload=payload) self.can_interface.send(message, 0)