Index: TD_Pre_Treatment/loader.py =================================================================== diff -u -rc3941c2f98ef15de30ccac6bb2a88d644f24e946 -r7006afe58ff6d87b2e2dc1e6b582f75ee54d176f --- TD_Pre_Treatment/loader.py (.../loader.py) (revision c3941c2f98ef15de30ccac6bb2a88d644f24e946) +++ TD_Pre_Treatment/loader.py (.../loader.py) (revision 7006afe58ff6d87b2e2dc1e6b582f75ee54d176f) @@ -16,11 +16,10 @@ from engine.dynamicloader import DynamicLoader # plugin specific +from leahi_dialin.common.td_defs import td_enum_repository as TD_Defs # dialin from leahi_dialin.ui.td_messaging import TD_Messaging -from leahi_dialin.common.td_defs import TDOpModes -from leahi_dialin.common.td_defs import TDStandbyStates from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.protocols import CAN @@ -145,8 +144,8 @@ @Slot() def do_standby(self): self.td_interface.td_operation_mode( - TDOpModes.MODE_STAN.value, - TDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value + TD_Defs.TDOpModes.MODE_STAN.value, + TD_Defs.TDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value ) @Slot() @@ -155,8 +154,8 @@ if self.spnCreateRxRejectReason.value() == 0 : self.td_interface.td_Treatment_Parameters_CreateRx (0) self.td_interface.td_operation_mode( - TDOpModes.MODE_PRET.value, - TDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value + TD_Defs.TDOpModes.MODE_PRET.value, + TD_Defs.TDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value ) else: self.td_interface.td_Treatment_Parameters_CreateRx (self.spnCreateRxRejectReason.value()) @@ -169,8 +168,8 @@ @Slot() def do_start(self): self.td_interface.td_operation_mode( - TDOpModes.MODE_TREA.value, - TDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value + TD_Defs.TDOpModes.MODE_TREA.value, + TD_Defs.TDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value ) self.lbStartTreatment.setText("-")