Index: leahi_dialin/td/treatment_delivery.py =================================================================== diff -u -rbac0a2d09d57dc27cfa2f2a596d57fdcbed392ee -r1d7d95e8ec37a124e2ccfeb4b462aa023dfffba7 --- leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision bac0a2d09d57dc27cfa2f2a596d57fdcbed392ee) +++ leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision 1d7d95e8ec37a124e2ccfeb4b462aa023dfffba7) @@ -81,20 +81,23 @@ # register handler for TD operation mode broadcast messages if self.can_interface is not None: channel_id = DenaliChannels.td_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_TD_OP_MODE_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_td_op_mode_data = MsgIds.MSG_ID_TD_OP_MODE_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_op_mode_data, self._handler_td_op_mode_sync) + self.msg_id_td_debug_event = MsgIds.MSG_ID_TD_DEBUG_EVENT.value self.can_interface.register_receiving_publication_function(channel_id, - MsgIds.MSG_ID_TD_DEBUG_EVENT.value, + self.msg_id_td_debug_event, self._handler_td_debug_event_sync) + self.msg_id_td_version_response = MsgIds.MSG_ID_TD_VERSION_RESPONSE.value self.can_interface.register_receiving_publication_function(channel_id, - MsgIds.MSG_ID_TD_VERSION_RESPONSE.value, + self.msg_id_td_version_response, self._handler_td_version_response_sync) + self.msg_id_ui_version_info_response = MsgIds.MSG_ID_UI_VERSION_INFO_RESPONSE.value self.can_interface.register_receiving_publication_function(DenaliChannels.ui_to_td_ch_id, - MsgIds.MSG_ID_UI_VERSION_INFO_RESPONSE.value, + self.msg_id_ui_version_info_response, self._handler_ui_version_response_sync) # create properties @@ -133,7 +136,7 @@ self.dd_proxy = DDProxy(self.can_interface, self.logger) self.ui_proxy = UIProxy(self.can_interface, self.logger) - @publish(["td_debug_events_timestamp","td_debug_events"]) + @publish(["msg_id_td_debug_event", "td_debug_events_timestamp","td_debug_events"]) def _handler_td_debug_event_sync(self, message, timestamp = 0.0): payload = message['message'] @@ -164,7 +167,7 @@ """ self.td_logged_in = logged_in - @publish(["td_op_mode_timestamp","td_operation_mode", "td_operation_sub_mode"]) + @publish(["msg_id_td_op_mode_data", "td_op_mode_timestamp","td_operation_mode", "td_operation_sub_mode"]) def _handler_td_op_mode_sync(self, message, timestamp = 0.0): """ Handles published TD operation mode messages. Current TD operation mode @@ -182,7 +185,7 @@ self.td_operation_sub_mode = smode[0] self.td_op_mode_timestamp = timestamp - @publish(["td_version, td_fpga_version"]) + @publish(["msg_id_td_version_response", "td_version, td_fpga_version"]) def _handler_td_version_response_sync(self,message, timestamp = 0.0): """ Handler for response from TD regarding its version. @@ -220,7 +223,7 @@ self.td_version_response_timestamp = timestamp - + @publish(["msg_id_ui_version_info_response", "ui_version", "ui_version_info_response_timestamp"]) def _handler_ui_version_response_sync(self,message, timestamp = 0.0): """ Handler for response from TD regarding its version.