Index: leahi_dialin/td/treatment_delivery.py =================================================================== diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -rbd45f04f6e4f66ec2b121f496bc8db20ca00a6b8 --- leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f) +++ leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision bd45f04f6e4f66ec2b121f496bc8db20ca00a6b8) @@ -25,6 +25,9 @@ from .modules.switches import TDSwitches from .modules.valves import TDValves from .modules.voltages import TDVoltages + +from .proxies.dd_proxy import DDProxy + from ..common.msg_defs import MsgIds, MsgFieldPositions from ..common.td_defs import TDOpModes from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels @@ -122,6 +125,8 @@ self.valves = TDValves(self.can_interface, self.logger) self.voltages = TDVoltages(self.can_interface, self.logger) + self.dd_proxy = DDProxy(self.can_interface, self.logger) + @publish(["td_debug_events_timestamp","td_debug_events"]) def _handler_td_debug_event_sync(self, message, timestamp = 0.0): @@ -228,8 +233,8 @@ if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1: self.logger.debug("Success: Logged In") self.td_set_logged_in_status(True) - self._send_td_checkin_message() # Timer starts interval first - self.can_interface.transmit_interval_dictionary[self.callback_id].start() + #self._send_td_checkin_message() # Timer starts interval first + #self.can_interface.transmit_interval_dictionary[self.callback_id].start() else: self.logger.debug("Failure: Log In Failed.") return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] @@ -307,7 +312,7 @@ @return: none """ - message = DenaliMessage.build_message(channel_id=DenaliChannels.TD_to_ui_ch_id, + message = DenaliMessage.build_message(channel_id=DenaliChannels.td_to_ui_ch_id, message_id=MsgIds.MSG_ID_TD_UI_VERSION_INFO_REQUEST.value) self.logger.debug("Sending an UI version request to the TD.")