Index: TD_Bloodset_Auto__Load_Eject/interface.ui =================================================================== diff -u --- TD_Bloodset_Auto__Load_Eject/interface.ui (revision 0) +++ TD_Bloodset_Auto__Load_Eject/interface.ui (revision 432c13cb8915c16bdeeb331754b1c56bcc128a3b) @@ -0,0 +1,171 @@ + + + ui_interface + + + + 0 + 0 + 430 + 150 + + + + + 100000 + 100000 + + + + &5 TD Info/&A Blood Set + + + + + + + + + + + 0 + 0 + + + + + 352 + 0 + + + + + 16777215 + 16777215 + + + + + 10 + + + + color: rgb(238, 238, 236); +background-color: rgb(92, 53, 102); + + + + 146 : [0x9200] : Auto Load + + + Qt::AlignCenter + + + + + + + + + + + + 180 + 0 + + + + Reason + + + + + + + 900 + + + + + + + + + + + + + + + + 180 + 0 + + + + Reason + + + + + + + 900 + + + + + + + + + + + + + + 0 + 0 + + + + + 352 + 0 + + + + + 16777215 + 16777215 + + + + + 10 + + + + color: rgb(238, 238, 236); +background-color: rgb(92, 53, 102); + + + + 148 : [0x9400] : Auto Eject + + + Qt::AlignCenter + + + + + + + + + + + + + + Index: TD_Bloodset_Auto__Load_Eject/loader.py =================================================================== diff -u --- TD_Bloodset_Auto__Load_Eject/loader.py (revision 0) +++ TD_Bloodset_Auto__Load_Eject/loader.py (revision 432c13cb8915c16bdeeb331754b1c56bcc128a3b) @@ -0,0 +1,84 @@ +""" + The Bloodset auto load/eject loader +""" +# Python +import os +import can +import struct + +# Qt +from PySide2 import QtCore, QtWidgets +from PySide2.QtCore import Slot + +# parent +from engine.dynamicloader import DynamicLoader + +# plugin specific +from leahi_dialin.common.msg_defs import MsgIds +from leahi_dialin.protocols import CAN + +# hd Simulator +from leahi_dialin.ui.td_messaging import TD_Messaging + +class Loader(DynamicLoader): + """ + The Bloodset auto load/eject ui loader + """ + + def __init__(self): + self.td_interface = TD_Messaging() + self.can_interface = self.td_interface.can_interface + super().__init__(os.path.dirname(__file__)) + + if self.can_interface is not None: + channel_id = CAN.DenaliChannels.ui_to_td_ch_id + load_request_message_id = MsgIds.MSG_ID_UI_ADJUST_DISPOSABLES_CONFIRM_REQUEST.value + self.can_interface.register_receiving_publication_function(channel_id, + load_request_message_id, + self.handle_load_request) + eject_request_message_id = MsgIds.MSG_ID_UI_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_REQUEST.value + self.can_interface.register_receiving_publication_function(channel_id, + eject_request_message_id, + self.handle_eject_request) + + def _init_loader(self): + """ + finds and creates widgets + :return: none + """ + self.sbLoadReason = self.find_widget(QtWidgets.QSpinBox , 'LoadReasonSpinBox' ) + self.sbEjectReason = self.find_widget(QtWidgets.QSpinBox , 'EjectReasonSpinBox' ) + + def _init_connections(self): + """ + initializes the widgets connections + :return: none + """ + + + def _init_widgets(self): + """ + initializes the widgets' properties + :return: none + """ + self.sbLoadReason .setValue(0) + self.sbEjectReason .setValue(0) + + @Slot() + def handle_load_request(self, message, timestamp = 0.0): + """ + Called when the user requests to firmware from UI + @return: None + """ + print(" handle_load_request") + reason = self.sbLoadReason.value() + self.td_interface.td_blood_set_auto_load_response(reason) + + def handle_eject_request(self, message, timestamp = 0.0): + """ + Called when the user requests to firmware from UI + @return: None + """ + print(" handle_eject_request") + reason = self.sbEjectReason.value() + self.td_interface.td_blood_set_auto_eject_response(reason) Index: TreatmentParameters/loader.py =================================================================== diff -u -r64d8a48a84b8b1bacd24876d1e49d77f8792fb72 -r432c13cb8915c16bdeeb331754b1c56bcc128a3b --- TreatmentParameters/loader.py (.../loader.py) (revision 64d8a48a84b8b1bacd24876d1e49d77f8792fb72) +++ TreatmentParameters/loader.py (.../loader.py) (revision 432c13cb8915c16bdeeb331754b1c56bcc128a3b) @@ -97,7 +97,7 @@ if self.spnCreateRxRejectReason.value() == 0 : self.td_interface.td_Treatment_Parameters_CreateRx (0) self.td_interface.td_operation_mode( - TDOpModes.MODE_TPAR.value, + TDOpModes.MODE_PRET.value, TDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value ) else: @@ -110,7 +110,7 @@ @Slot() def do_confirm(self): self.td_interface.td_operation_mode( - TDOpModes.MODE_PRET.value, + TDOpModes.MODE_TREA.value, TDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value )