Index: leahi_dialin/td/treatment_delivery.py =================================================================== diff -u -rb9e9c4477d1083db8d96beafd98ae6cd96ea432f -r20c821bd230fc7689a0275a2918981669ff5cc19 --- leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision b9e9c4477d1083db8d96beafd98ae6cd96ea432f) +++ leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision 20c821bd230fc7689a0275a2918981669ff5cc19) @@ -37,7 +37,7 @@ from ..common.constants import NO_RESET from ..common.msg_defs import MsgIds, MsgFieldPositions, MsgFieldPositionsFWVersions -from ..common.td_defs import td_enum_repository +from ..common import td_enum_repository from ..common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels from ..utils.base import AbstractSubSystem, publish, LogManager @@ -105,41 +105,41 @@ self.cmd_log_in_to_td() # create properties - self.td_op_mode_timestamp = 0.0 - self.td_debug_events_timestamp = 0.0 - self.ui_version_info_response_timestamp = 0.0 - self.td_version_response_timestamp = 0.0 - self.td_operation_mode = td_enum_repository.TDOpModes.MODE_INIT.value - self.td_operation_sub_mode = 0 - self.td_logged_in = False + self.td_op_mode_timestamp = 0.0 #: The timestamp of the latest operation mode message + self.td_debug_events_timestamp = 0.0 #: The timestamp of the latest events message + self.ui_version_info_response_timestamp = 0.0 #: The timestamp of the latest UI version info message + self.td_version_response_timestamp = 0.0 #: The timestamp of the latest TD version info message + self.td_operation_mode = td_enum_repository.TDOpModes.MODE_INIT.value #: The Operation Mode's value + self.td_operation_sub_mode = 0 #: The Operation Sub-Mode's value + self.td_logged_in = False #: The value showing if the user is logged in or not self.td_set_logged_in_status(False) - self.ui_version = None - self.td_version = None - self.td_fpga_version = None - self.td_debug_events = [''] * self._TD_DEBUG_EVENT_LIST_COUNT - self.td_debug_event_index = 0 - self.td_last_debug_event = '' + self.ui_version = None #: The UI's version value + self.td_version = None #: The TD's version value + self.td_fpga_version = None #: The TD's FPGA version value + self.td_debug_events = [''] * self._TD_DEBUG_EVENT_LIST_COUNT #: The Debug Event's list + self.td_debug_event_index = 0 #: The index of the last Event + self.td_last_debug_event = '' #: The name of the last Event # Create command groups - self.air_pump = TDAirPump(self.can_interface, self.logger) - self.air_trap = TDAirTrap(self.can_interface, self.logger) - self.alarms = TDAlarms(self.can_interface, self.logger) - self.blood_flow = TDBloodFlow(self.can_interface, self.logger) - self.bubbles = TDBubbleDetector(self.can_interface, self.logger) - self.buttons = TDButtons(self.can_interface, self.logger) - self.ejector = TDEjector(self.can_interface, self.logger) - self.events = TDEvents(self.can_interface, self.logger) - self.pressure_sensors = TDPressureSensors(self.can_interface, self.logger) - self.switches = TDSwitches(self.can_interface, self.logger) - self.temperature_sensors = TDTemperatureSensors(self.can_interface, self.logger) - self.treatment = TDTreatment(self.can_interface, self.logger) - self.test_configs = TDTestConfig(self.can_interface, self.logger) - self.valves = TDValves(self.can_interface, self.logger) - self.voltages = TDVoltages(self.can_interface, self.logger) + self.air_pump = TDAirPump(self.can_interface, self.logger) #: The Air Pump module + self.air_trap = TDAirTrap(self.can_interface, self.logger) #: The Air Trap module + self.alarms = TDAlarms(self.can_interface, self.logger) #: The Alarms module + self.blood_flow = TDBloodFlow(self.can_interface, self.logger) #: The Blood Flow module + self.bubbles = TDBubbleDetector(self.can_interface, self.logger) #: The Bubble Detector module + self.buttons = TDButtons(self.can_interface, self.logger) #: The Buttons module + self.ejector = TDEjector(self.can_interface, self.logger) #: The Ejector module + self.events = TDEvents(self.can_interface, self.logger) #: The Events module + self.pressure_sensors = TDPressureSensors(self.can_interface, self.logger) #: The Pressure Sensors module + self.switches = TDSwitches(self.can_interface, self.logger) #: The Switches module + self.temperature_sensors = TDTemperatureSensors(self.can_interface, self.logger) #: The Temperature Sensprs module + self.treatment = TDTreatment(self.can_interface, self.logger) #: The Treatment module + self.test_configs = TDTestConfig(self.can_interface, self.logger) #: The Test Configs module + self.valves = TDValves(self.can_interface, self.logger) #: The Valves module + self.voltages = TDVoltages(self.can_interface, self.logger) #: The Voltages module - self.dd_proxy = DDProxy(self.can_interface, self.logger) - self.ui_proxy = UIProxy(self.can_interface, self.logger) + self.dd_proxy = DDProxy(self.can_interface, self.logger) #: The DD Proxy module (imitates commands sent by DD) + self.ui_proxy = UIProxy(self.can_interface, self.logger) #: The UI Proxy module (imitates commands sent by UI) @publish(["msg_id_td_debug_event", "td_debug_events_timestamp","td_debug_events"]) @@ -165,12 +165,12 @@ self.td_debug_event_index = 0 - @publish(["td_logged_in"]) def td_set_logged_in_status(self, logged_in: bool = False): """ Callback for td logged in status change. - @param logged_in boolean logged in status for TD - @return: none + + @param logged_in: Logged in status for TD + @return: None """ self.td_logged_in = logged_in