Index: dialin/protocols/CAN.py =================================================================== diff -u -ref9b75f5db31f12a46fe9b509385fbd222cd2bf4 -rb1ea8fdb1d536f26e9cc23c7190e9ee47e7cfc2e --- dialin/protocols/CAN.py (.../CAN.py) (revision ef9b75f5db31f12a46fe9b509385fbd222cd2bf4) +++ dialin/protocols/CAN.py (.../CAN.py) (revision b1ea8fdb1d536f26e9cc23c7190e9ee47e7cfc2e) @@ -275,7 +275,7 @@ DenaliChannels.hd_sync_broadcast_ch_id : None, DenaliChannels.dg_to_ui_ch_id : DenaliChannels.dialin_to_dg_ch_id, DenaliChannels.dg_sync_broadcast_ch_id : None, - DenaliChannels.ui_to_hd_ch_id : DenaliChannels.hd_to_ui_ch_id, + DenaliChannels.ui_to_hd_ch_id : DenaliChannels.hd_sync_broadcast_ch_id, DenaliChannels.ui_sync_broadcast_ch_id : None, DenaliChannels.hd_to_dialin_ch_id : DenaliChannels.dialin_to_hd_ch_id, DenaliChannels.dg_to_dialin_ch_id : DenaliChannels.dialin_to_dg_ch_id, @@ -432,7 +432,7 @@ START_BYTE = DenaliMessage.START_BYTE DIALIN_MSG_RESP_TO = 0.1 # number of seconds to wait for a response to a sent command - def __init__(self, can_interface: str, logger: Logger, log_can=False, passive_mode=False): + def __init__(self, can_interface: str, logger: Logger, log_can=False, console_out=False, passive_mode=False): """ DenaliCanMessenger constructor @@ -446,6 +446,7 @@ self.logger = logger self.log_can = log_can self.passive_mode = passive_mode + self.console_out = console_out self.listener_buffer = can.BufferedReader() self.notifier = can.Notifier(self.bus, [self.listener_buffer]) self.send_packet_request_id = -1 @@ -563,6 +564,8 @@ DenaliMessage.crc8(self.messages))) if message_valid: + if self.console_out: + print(complete_dialin_message) # Send an ack if required if DenaliMessage.get_sequence_number(complete_dialin_message) < 0: # ACK required. Send back the received message with the sequence sign bit flipped Index: dialin/ui/hd_simulator.py =================================================================== diff -u -r5e0cad779f1af6c6fc4d1bfa85d07b50bf4d29cc -rb1ea8fdb1d536f26e9cc23c7190e9ee47e7cfc2e --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 5e0cad779f1af6c6fc4d1bfa85d07b50bf4d29cc) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision b1ea8fdb1d536f26e9cc23c7190e9ee47e7cfc2e) @@ -207,7 +207,7 @@ MsgIds.MSG_ID_UI_START_TREATMENT.value, self._handler_ui_start_treatment) self.can_interface.register_receiving_publication_function(channel_id, - MsgIds.MSG_ID_UI_SET_UF_VOLUME_PARAMETER.value, + MsgIds.MSG_ID_UI_PRE_TREATMENT_UF_REQUEST.value, self._handler_ui_pre_treatment_uf_request) self.can_interface.register_receiving_publication_function(channel_id, MsgIds.MSG_ID_UI_NEW_TREATMENT_PARAMS.value, @@ -463,7 +463,7 @@ payload += float_to_bytearray(volume) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, - message_id=MsgIds.MSG_ID_HD_SET_UF_VOLUME_PARAMETER_RESPONSE.value, + message_id=MsgIds.MSG_ID_HD_PRE_TREATMENT_UF_RESPONSE.value, payload=payload) self.can_interface.send(message, 0)