Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -ree6a964026f5167389daf212aa57e753f5d95ab9 -r7e864b8d034f7a5cb961402d4f6672b180a57bb5 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision ee6a964026f5167389daf212aa57e753f5d95ab9) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 7e864b8d034f7a5cb961402d4f6672b180a57bb5) @@ -14,7 +14,7 @@ # ############################################################################ from enum import unique -from ..utils.base import DialinEnum +from ..utils.enums import DialinEnum # Branch: staging Index: leahi_dialin/ui/td_messaging.py =================================================================== diff -u -ree6a964026f5167389daf212aa57e753f5d95ab9 -r7e864b8d034f7a5cb961402d4f6672b180a57bb5 --- leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision ee6a964026f5167389daf212aa57e753f5d95ab9) +++ leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 7e864b8d034f7a5cb961402d4f6672b180a57bb5) @@ -25,7 +25,7 @@ def info(a1, a2): pass - self.can_interface = CAN.DenaliCanMessenger(can_interface=self.can_Channel, logger=fakeLogger() ) + self.can_interface = CAN.CanMessenger(can_interface=self.can_Channel, logger=fakeLogger() ) self.can_interface.start() if self.can_interface is not None: @@ -45,8 +45,8 @@ payload = conversions.integer_to_bytearray(op_mode ) payload += conversions.integer_to_bytearray(sub_mode) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_OP_MODE_DATA.value, payload=payload) @@ -65,8 +65,8 @@ payload = conversions.float_to_bytearray(board_temp) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_TEMPERATURE_DATA.value, payload=payload) @@ -110,8 +110,8 @@ payload += conversions.unsigned_integer_to_bytearray(H4_pres_flow ) payload += conversions.unsigned_integer_to_bytearray(H6_rot_hall_state ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_BLOOD_PUMP_DATA.value, payload=payload) @@ -149,8 +149,8 @@ payload += conversions.unsigned_integer_to_bytearray(H20_State ) payload += conversions.unsigned_integer_to_bytearray(controlling ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_AIR_TRAP_DATA.value, payload=payload) @@ -172,8 +172,8 @@ payload = conversions.unsigned_integer_to_bytearray(H18_status ) payload += conversions.unsigned_integer_to_bytearray(H18_state ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_BUBBLES_DATA.value, payload=payload) @@ -195,8 +195,8 @@ payload = conversions.unsigned_integer_to_bytearray(H12_state) payload += conversions.unsigned_integer_to_bytearray(H12_power) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_AIR_PUMP_DATA.value, payload=payload) @@ -217,8 +217,8 @@ payload = conversions.unsigned_integer_to_bytearray(H5_state ) payload += conversions.float_to_bytearray (H5_set_speed) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_EJECTOR_DATA.value, payload=payload) @@ -237,8 +237,8 @@ payload = conversions.unsigned_integer_to_bytearray(H9_door ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_SWITCHES_DATA.value, payload=payload) @@ -260,8 +260,8 @@ payload = conversions.unsigned_integer_to_bytearray(capacity) payload += conversions.unsigned_integer_to_bytearray(ac_power) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_BATTERY_DATA.value, payload=payload) @@ -289,8 +289,8 @@ payload += conversions.short_to_bytearray (pos_count ) payload += conversions.short_to_bytearray (next_pos ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_VALVES_DATA.value, payload=payload) @@ -331,8 +331,8 @@ payload += conversions.float_to_bytearray(fpga_vaux ) payload += conversions.float_to_bytearray(fpga_vpvn ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_VOLTAGES_DATA.value, payload=payload) @@ -391,8 +391,8 @@ payload += conversions.float_to_bytearray (tmp_max ) payload += conversions.float_to_bytearray (barometric ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_PRESSURE_DATA.value, payload=payload) @@ -418,8 +418,8 @@ payload += conversions.float_to_bytearray (cumulative ) payload += conversions.unsigned_integer_to_bytearray(time_remaining ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_HEPARIN_DATA.value, payload=payload) @@ -442,8 +442,8 @@ payload = conversions.unsigned_integer_to_bytearray (total ) payload += conversions.unsigned_integer_to_bytearray (countdown ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_TREATMENT_PAUSED_TIMER_DATA.value, payload=payload) @@ -469,8 +469,8 @@ payload += conversions.unsigned_integer_to_bytearray (diastolic ) payload += conversions.unsigned_integer_to_bytearray (heartRate ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_BLOOD_PRESSURE_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -498,8 +498,8 @@ payload += conversions.float_to_bytearray (cumulative_volume ) payload += conversions.unsigned_integer_to_bytearray(bolusPermitted ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_SALINE_BOLUS_DATA.value, payload=payload) @@ -528,8 +528,8 @@ payload += conversions.float_to_bytearray (volume_delivered ) payload += conversions.unsigned_integer_to_bytearray(state ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ULTRAFILTRATION_DATA.value, payload=payload) @@ -556,8 +556,8 @@ payload += conversions.unsigned_integer_to_bytearray(tx_elapsed_s ) payload += conversions.unsigned_integer_to_bytearray(tx_remaining_s ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_TREATMENT_TIME_DATA.value, payload=payload) @@ -636,8 +636,8 @@ payload += conversions.unsigned_integer_to_bytearray (min_dial_rate_mLH ) payload += conversions.unsigned_integer_to_bytearray (max_dial_rate_mLH ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_TREATMENT_PARAM_RANGES.value, payload=payload) @@ -663,8 +663,8 @@ payload += conversions.unsigned_integer_to_bytearray(dialysate_flow ) payload += conversions.float_to_bytearray (dialysate_temp ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_TREATMENT_SET_POINTS.value, payload=payload) @@ -694,8 +694,8 @@ payload += conversions.unsigned_integer_to_bytearray ( timeout ) payload += conversions.unsigned_integer_to_bytearray ( countdown ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_BLOOD_PRIME_PROGRESS_DATA.value, payload=payload) @@ -712,8 +712,8 @@ payload = conversions.integer_to_bytearray(vAccepted) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_BLOOD_PRIME_CMD_RESPONSE.value, payload=payload) @@ -732,8 +732,8 @@ payload = conversions.unsigned_integer_to_bytearray (vTimeout ) payload += conversions.unsigned_integer_to_bytearray (vCountdown ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_RECIRCULATE_DATA.value, payload=payload) self.can_interface.send(message, 0) @@ -749,8 +749,8 @@ payload = conversions.integer_to_bytearray(vAccepted) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_RECIRCULATE_RESPONSE.value, payload=payload) @@ -779,8 +779,8 @@ payload += conversions.unsigned_integer_to_bytearray(volume_delivered ) payload += conversions.unsigned_integer_to_bytearray(rate ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ISOLATED_UF_DATA.value, payload=payload) @@ -817,8 +817,8 @@ payload += conversions.unsigned_byte_to_bytearray (fpga_lab ) payload += conversions.unsigned_integer_to_bytearray(compatibility_rev) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_VERSION_RESPONSE.value, payload=payload) @@ -834,8 +834,8 @@ """ payload = bytes(serial, 'ascii') + b'\x00' - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_SERIAL_RESPONSE.value, payload=payload) @@ -848,8 +848,8 @@ None @return: None """ - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_UI_VERSION_INFO_REQUEST.value) self.can_interface.send(message, 0) @@ -865,8 +865,8 @@ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_BLOOD_PRESSURE_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -882,8 +882,8 @@ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_PRESSURE_LIMIT_WIDEN_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -899,8 +899,8 @@ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_DATE_AND_TIME_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -915,8 +915,8 @@ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_HEPARIN_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -931,8 +931,8 @@ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_END_TREATMENT_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1064,8 +1064,8 @@ payload += conversions.float_to_bytearray(vSubstitutionVolumeMax) payload += conversions.float_to_bytearray(vSubstitutionVolumeDef) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_INSTITUTIONAL_RECORD_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1251,8 +1251,8 @@ payload += conversions.integer_to_bytearray(vSubVolumeMinReason ) payload += conversions.integer_to_bytearray(vSubVolumeMaxReason ) payload += conversions.integer_to_bytearray(vSubVolumeDefReason ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ADJUST_INSTITUTIONAL_RECORD_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1312,8 +1312,8 @@ payload += conversions.integer_to_bytearray(vWaterSampleTestResultRequiredDef ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ADVANCED_INSTITUTIONAL_RECORD_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1391,8 +1391,8 @@ payload += conversions.integer_to_bytearray(vChlorineWaterSampleCheckDefRejectionReason ) payload += conversions.integer_to_bytearray(vWaterSampleTestResultRequiredDefRejectionReason ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ADVANCED_ADJUST_INSTITUTIONAL_RECORD_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1421,8 +1421,8 @@ payload += conversions.float_to_bytearray(vUFVolume ) payload += conversions.float_to_bytearray(vUFRate ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_DURATION_VALIDATE_RESPONSE .value, payload=payload) self.can_interface.send(message, 0) @@ -1448,8 +1448,8 @@ payload += conversions.unsigned_integer_to_bytearray (vCountdown ) payload += conversions.integer_to_bytearray (vIsCompleted ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_RINSEBACK_PROGRESS.value, payload=payload) self.can_interface.send(message, 0) @@ -1465,8 +1465,8 @@ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_RINSEBACK_CMD_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1486,8 +1486,8 @@ payload += conversions.integer_to_bytearray(vRejectionReason ) payload += conversions.integer_to_bytearray(vVolumeMax ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ISOLATED_UF_DURATION_CHANGE_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1511,8 +1511,8 @@ payload += conversions.integer_to_bytearray(vDuration ) payload += conversions.integer_to_bytearray(vRate ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ISOLATED_UF_VOLUME_GOAL_CHANGE_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1530,8 +1530,8 @@ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0 ) payload += conversions.integer_to_bytearray(vRejectionReason ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ISOLATED_UF_CONFIRM_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1547,8 +1547,8 @@ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ADJUST_DISPOSABLES_CONFIRM_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1563,8 +1563,8 @@ payload = conversions.integer_to_bytearray(vAccepted) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1660,8 +1660,8 @@ payload = conversions.integer_to_bytearray(1 if vRejectionReason == 0 else 0) payload += conversions.integer_to_bytearray(vRejectionReason) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_RESP_INITIATE_TREATMENT_WORKFLOW.value, payload=payload) self.can_interface.send(message, 0) @@ -1894,8 +1894,8 @@ payload += conversions.integer_to_bytearray(vUFEstimatedTargetWeightRejectReason ) payload += conversions.integer_to_bytearray(vUFVolumeRejectReason ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_RESP_TREATMENT_PARAMS_TO_VALIDATE.value, payload=payload) self.can_interface.send(message, 0) @@ -1938,8 +1938,8 @@ payload += conversions.unsigned_integer_to_bytearray(tx_saline_state ) payload += conversions.unsigned_integer_to_bytearray(tx_heparin_state ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_TREATMENT_STATE_DATA.value, payload=payload) @@ -1958,8 +1958,8 @@ payload += conversions.float_to_bytearray(parameter1) payload += conversions.float_to_bytearray(parameter2) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_TREATMENT_LOG_ALARM_EVENT.value, payload=payload) @@ -1978,8 +1978,8 @@ payload += conversions.float_to_bytearray(old_value) payload += conversions.float_to_bytearray(new_value) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.td_to_ui_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.td_to_ui_ch_id, message_id=msg_ids.MsgIds.MSG_ID_TD_TREATMENT_LOG_EVENT.value, payload=payload) @@ -1990,7 +1990,7 @@ is_pure_data: bool = False, has_parameters: bool = False, parameters_payload: any = 0x00, - channel_id=CAN.DenaliChannels.td_to_ui_ch_id) -> None: + channel_id=CAN.CanChannels.td_to_ui_ch_id) -> None: """A general method to send any standard response message, by it's id and list of parameters. Args: message_id (int ): the id of the message @@ -1999,7 +1999,7 @@ is_pure_data (bool, optional ): The message only has data. Defaults to False. has_parameters (bool, optional ): if the message has parameter this needs to be true. Defaults to False. parameters_payload (any, optional ): the list of parameters pre-converted and ready to be concatenated to the payload. Defaults to 0x00. - channel_id (_type_, optional ): indicates the channel. Defaults to CAN.DenaliChannels.td_to_ui_ch_id. + channel_id (_type_, optional ): indicates the channel. Defaults to CAN.Channels.td_to_ui_ch_id. """ payload = "" if not is_pure_data: @@ -2009,7 +2009,7 @@ if has_parameters: payload = parameters_payload - message = CAN.DenaliMessage.build_message( + message = CAN.CanMessage.build_message( channel_id, message_id, payload