Index: leahi_dialin/ui/dd_messaging.py =================================================================== diff -u -r84e4345fc09b9796d6430c49f11cc2b0a1e33522 -r6c90336ac2cd8cf34ac620cff431a847d9ddf557 --- leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision 84e4345fc09b9796d6430c49f11cc2b0a1e33522) +++ leahi_dialin/ui/dd_messaging.py (.../dd_messaging.py) (revision 6c90336ac2cd8cf34ac620cff431a847d9ddf557) @@ -24,7 +24,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: @@ -52,8 +52,8 @@ payload += conversions.float_to_bytearray(D43 ) payload += conversions.float_to_bytearray(D74 ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_CONDUCTIVITY_DATA.value, payload=payload) @@ -80,8 +80,8 @@ payload += conversions.unsigned_integer_to_bytearray(is_dial_good ) payload += conversions.float_to_bytearray (currentQd ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_GEN_DIALYSATE_MODE_DATA.value, payload=payload) @@ -117,8 +117,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.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_VERSION_RESPONSE.value, payload=payload) @@ -134,8 +134,8 @@ # TODO: replace with proper payload and message ID once message is defined payload = bytes(serial, 'ascii') + b'\x00' - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_SERIAL_RESPONSE.value, payload=payload) @@ -155,8 +155,8 @@ payload += conversions.unsigned_integer_to_bytearray(d63Level ) payload += conversions.unsigned_integer_to_bytearray(d46Level ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_LEVEL_DATA.value, payload=payload) @@ -209,8 +209,8 @@ payload += conversions.float_to_bytearray(d18PresTemp ) payload += conversions.float_to_bytearray(d41PresTemp ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_PRESSURES_DATA.value, payload=payload) @@ -266,8 +266,8 @@ payload += conversions.float_to_bytearray(d28AvgTemp ) payload += conversions.float_to_bytearray(d30AvgTemp ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_TEMPERATURE_DATA.value, payload=payload) @@ -329,8 +329,8 @@ payload += conversions.float_to_bytearray (dbg8 ) payload += conversions.float_to_bytearray (dbg9 ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_HEATERS_DATA.value, payload=payload) @@ -416,8 +416,8 @@ payload += conversions.unsigned_integer_to_bytearray(d76PumpState ) payload += conversions.float_to_bytearray (d76PumpPulseUS ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_DATA.value, payload=payload) @@ -489,8 +489,8 @@ payload += conversions.unsigned_integer_to_bytearray(d12PumpMeasuredDir ) payload += conversions.unsigned_integer_to_bytearray(d48PumpMeasuredDir ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DIALYSATE_PUMPS_DATA.value, payload=payload) @@ -504,8 +504,8 @@ """ payload = conversions.unsigned_integer_to_bytearray(blood_leak ) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_BLOOD_LEAK_DATA.value, payload=payload) @@ -521,8 +521,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.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_DATE_AND_TIME_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -665,8 +665,8 @@ for i in range(len(valvesensedState)): payload += conversions.unsigned_byte_to_bytearray(valvesensedState[i]) - message = CAN.DenaliMessage.build_message( - channel_id=CAN.DenaliChannels.dd_sync_broadcast_ch_id, + message = CAN.CanMessage.build_message( + channel_id=CAN.CanChannels.dd_sync_broadcast_ch_id, message_id=msg_ids.MsgIds.MSG_ID_DD_VALVES_STATES_DATA.value, payload=payload)