Index: dialin/hd/air_trap.py =================================================================== diff -u -r924c42da99eaad59a4565fbd5dfedfa68f5dfe25 -rf994f3ff2163edac03c480e1112a7c4b3ade7b76 --- dialin/hd/air_trap.py (.../air_trap.py) (revision 924c42da99eaad59a4565fbd5dfedfa68f5dfe25) +++ dialin/hd/air_trap.py (.../air_trap.py) (revision f994f3ff2163edac03c480e1112a7c4b3ade7b76) @@ -55,7 +55,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.hd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_HD_AIR_TRAP_DATA + msg_id = MsgIds.MSG_ID_HD_AIR_TRAP_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_air_trap_sync) @@ -127,7 +127,7 @@ payload = rst + det + idx message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_DG_AIR_TRAP_LEVEL_SENSOR_OVERRIDE, + message_id=MsgIds.MSG_ID_DG_AIR_TRAP_LEVEL_SENSOR_OVERRIDE.value, payload=payload) self.logger.debug("override air trap level sensor detection value for sensor " + str(sensor)) @@ -160,7 +160,7 @@ payload = rst + mis message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_DG_AIR_TRAP_DATA_BROADCAST_INTERVAL_OVERRIDE, + message_id=MsgIds.MSG_ID_DG_AIR_TRAP_DATA_BROADCAST_INTERVAL_OVERRIDE.value, payload=payload) self.logger.debug("override HD air trap data broadcast interval") Index: dialin/hd/hemodialysis_device.py =================================================================== diff -u -re172ddc204389ba1eb69e14de52bd3b924087031 -rf994f3ff2163edac03c480e1112a7c4b3ade7b76 --- dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision e172ddc204389ba1eb69e14de52bd3b924087031) +++ dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision f994f3ff2163edac03c480e1112a7c4b3ade7b76) @@ -89,7 +89,7 @@ # register handler for HD operation mode broadcast messages if self.can_interface is not None: channel_id = DenaliChannels.hd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_HD_OP_MODE + msg_id = MsgIds.MSG_ID_HD_OP_MODE.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_hd_op_mode_sync) @@ -145,7 +145,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_TESTER_LOGIN_REQUEST, + message_id=MsgIds.MSG_ID_TESTER_LOGIN_REQUEST.value, payload=list(map(int, map(ord, self.HD_LOGIN_PASSWORD)))) self.logger.debug("Logging in...") @@ -186,7 +186,7 @@ payload = rst + saf message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SAFETY_SHUTDOWN_OVERRIDE, + message_id=MsgIds.MSG_ID_HD_SAFETY_SHUTDOWN_OVERRIDE.value, payload=payload) self.logger.debug("overriding HD safety shutdown") @@ -217,7 +217,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_SOFTWARE_RESET_REQUEST) + message_id=MsgIds.MSG_ID_HD_SOFTWARE_RESET_REQUEST.value) self.logger.debug("requesting HD software reset")