Index: MainTreatmentData/loader.py =================================================================== diff -u -r5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b --- MainTreatmentData/loader.py (.../loader.py) (revision 5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd) +++ MainTreatmentData/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) @@ -18,9 +18,6 @@ from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions -from leahi_dialin.common.td_defs import TDOpModes -from leahi_dialin.common.td_defs import TDStandbyStates - # hd Simulator from leahi_dialin.ui.td_messaging import TD_Messaging Index: TD_AirBubbles/loader.py =================================================================== diff -u -rae3a21a4b37161a8bfa0a3fff23470d4ac198f5f -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b --- TD_AirBubbles/loader.py (.../loader.py) (revision ae3a21a4b37161a8bfa0a3fff23470d4ac198f5f) +++ TD_AirBubbles/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) @@ -11,10 +11,6 @@ # parent from engine.dynamicloader import DynamicLoader -# plugin specific -from leahi_dialin.common.td_defs import TDOpModes -from leahi_dialin.common.td_defs import TDStandbyStates - # hd Simulator from leahi_dialin.ui.td_messaging import TD_Messaging @@ -68,4 +64,4 @@ self.td_interface.td_air_bubbles( H18_status , H18_state - ) \ No newline at end of file + ) Index: TD_AirPump/loader.py =================================================================== diff -u -rae3a21a4b37161a8bfa0a3fff23470d4ac198f5f -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b --- TD_AirPump/loader.py (.../loader.py) (revision ae3a21a4b37161a8bfa0a3fff23470d4ac198f5f) +++ TD_AirPump/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) @@ -11,10 +11,6 @@ # parent from engine.dynamicloader import DynamicLoader -# plugin specific -from leahi_dialin.common.td_defs import TDOpModes -from leahi_dialin.common.td_defs import TDStandbyStates - # hd Simulator from leahi_dialin.ui.td_messaging import TD_Messaging @@ -68,4 +64,4 @@ self.td_interface.td_air_pump( H12_state , H12_power - ) \ No newline at end of file + ) Index: TD_AirTrap/loader.py =================================================================== diff -u -rf9ec0e263221cccdf36e037c4729b0972cd45c07 -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b --- TD_AirTrap/loader.py (.../loader.py) (revision f9ec0e263221cccdf36e037c4729b0972cd45c07) +++ TD_AirTrap/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) @@ -11,10 +11,6 @@ # parent from engine.dynamicloader import DynamicLoader -# plugin specific -from leahi_dialin.common.td_defs import TDOpModes -from leahi_dialin.common.td_defs import TDStandbyStates - # hd Simulator from leahi_dialin.ui.td_messaging import TD_Messaging @@ -89,4 +85,4 @@ H13_state , H20_State , controlling - ) \ No newline at end of file + ) Index: TD_Battery/loader.py =================================================================== diff -u -rfdb90058deb91dbded4bfebe521284d9737141fd -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b --- TD_Battery/loader.py (.../loader.py) (revision fdb90058deb91dbded4bfebe521284d9737141fd) +++ TD_Battery/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) @@ -11,10 +11,6 @@ # parent from engine.dynamicloader import DynamicLoader -# plugin specific -from leahi_dialin.common.td_defs import TDOpModes -from leahi_dialin.common.td_defs import TDStandbyStates - # hd Simulator from leahi_dialin.ui.td_messaging import TD_Messaging @@ -70,4 +66,4 @@ capacity, ac_power ) - \ No newline at end of file + Index: TD_Ejector/loader.py =================================================================== diff -u -rf9ec0e263221cccdf36e037c4729b0972cd45c07 -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b --- TD_Ejector/loader.py (.../loader.py) (revision f9ec0e263221cccdf36e037c4729b0972cd45c07) +++ TD_Ejector/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) @@ -11,10 +11,6 @@ # parent from engine.dynamicloader import DynamicLoader -# plugin specific -from leahi_dialin.common.td_defs import TDOpModes -from leahi_dialin.common.td_defs import TDStandbyStates - # hd Simulator from leahi_dialin.ui.td_messaging import TD_Messaging @@ -68,4 +64,4 @@ self.td_interface.td_ejector( H5_state , H5_set_speed - ) \ No newline at end of file + ) Index: TD_End_Treatment/loader.py =================================================================== diff -u -rb8d218923616a2a64366c45172a83184914415bd -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b --- TD_End_Treatment/loader.py (.../loader.py) (revision b8d218923616a2a64366c45172a83184914415bd) +++ TD_End_Treatment/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) @@ -15,7 +15,6 @@ # plugin specific from leahi_dialin.common.msg_defs import MsgIds -from leahi_dialin.common.td_defs import TDTreatmentStates from leahi_dialin.protocols import CAN # hd Simulator Index: TD_OpMode/loader.py =================================================================== diff -u -r95b7adb4a5430a8bdd9d1010d7ea94941d59face -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b --- TD_OpMode/loader.py (.../loader.py) (revision 95b7adb4a5430a8bdd9d1010d7ea94941d59face) +++ TD_OpMode/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) @@ -12,8 +12,7 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.td_defs import TDOpModes -from leahi_dialin.common.td_defs import TDStandbyStates +from leahi_dialin.common.td_defs import td_enum_repository as TD_Defs # dialin from leahi_dialin.ui.td_messaging import TD_Messaging @@ -55,9 +54,9 @@ initializes the widgets' properties :return: none """ - self.tblOpMode.setCurrentCell(TDOpModes.MODE_INIT.value, 0) + self.tblOpMode.setCurrentCell(TD_Defs.TDOpModes.MODE_INIT.value, 0) self.tblOpMode.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) - self.tblSubMode.setCurrentCell(TDStandbyStates.STANDBY_START_STATE.value, 0) + self.tblSubMode.setCurrentCell(TD_Defs.TDStandbyStates.STANDBY_START_STATE.value, 0) self.tblSubMode.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) @Slot() Index: TD_Switches/loader.py =================================================================== diff -u -r4e2342ccd6104d0cb1f5321c24c9955c2cae69c8 -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b --- TD_Switches/loader.py (.../loader.py) (revision 4e2342ccd6104d0cb1f5321c24c9955c2cae69c8) +++ TD_Switches/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) @@ -11,10 +11,6 @@ # parent from engine.dynamicloader import DynamicLoader -# plugin specific -from leahi_dialin.common.td_defs import TDOpModes -from leahi_dialin.common.td_defs import TDStandbyStates - # hd Simulator from leahi_dialin.ui.td_messaging import TD_Messaging @@ -66,4 +62,4 @@ door = self.door.value() self.td_interface.td_switches( door - ) \ No newline at end of file + ) Index: TD_Temperatures/loader.py =================================================================== diff -u -r4e2342ccd6104d0cb1f5321c24c9955c2cae69c8 -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b --- TD_Temperatures/loader.py (.../loader.py) (revision 4e2342ccd6104d0cb1f5321c24c9955c2cae69c8) +++ TD_Temperatures/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) @@ -11,10 +11,6 @@ # parent from engine.dynamicloader import DynamicLoader -# plugin specific -from leahi_dialin.common.td_defs import TDOpModes -from leahi_dialin.common.td_defs import TDStandbyStates - # hd Simulator from leahi_dialin.ui.td_messaging import TD_Messaging @@ -66,4 +62,4 @@ self.td_interface.td_temperatures( board_temp - ) \ No newline at end of file + ) Index: TD_TreatmentAdjustmentsUltrafiltration/loader.py =================================================================== diff -u -r5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b --- TD_TreatmentAdjustmentsUltrafiltration/loader.py (.../loader.py) (revision 5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd) +++ TD_TreatmentAdjustmentsUltrafiltration/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) @@ -18,9 +18,6 @@ from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions -from leahi_dialin.common.td_defs import TDOpModes -from leahi_dialin.common.td_defs import TDStandbyStates - # hd Simulator from leahi_dialin.ui.td_messaging import TD_Messaging Index: TD_TreatmentStates/loader.py =================================================================== diff -u -r03501309d607343ba120663e0abce74faeb34f59 -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b --- TD_TreatmentStates/loader.py (.../loader.py) (revision 03501309d607343ba120663e0abce74faeb34f59) +++ TD_TreatmentStates/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) @@ -10,8 +10,7 @@ from engine.dynamicloader import DynamicLoader # plugin specific -from leahi_dialin.common.td_defs import TDTreatmentStates as TXStates -from leahi_dialin.common.td_defs import TDDialysisStates as DialStates +from leahi_dialin.common.td_defs import td_enum_repository as TD_Defs # hd Simulator from leahi_dialin.ui.td_messaging import TD_Messaging @@ -72,9 +71,9 @@ initializes the widgets' properties :return: none """ - self.tblSubMode .setCurrentCell(TXStates.TREATMENT_START_STATE .value , 0) + self.tblSubMode .setCurrentCell(TD_Defs.TDTreatmentStates.TREATMENT_START_STATE .value , 0) self.tblBloodPrimeStates .setCurrentCell(0 , 0) - self.tblDialysisStates .setCurrentCell(DialStates.DIALYSIS_UF_STATE .value , 0) + self.tblDialysisStates .setCurrentCell(TD_Defs.TDDialysisStates.DIALYSIS_UF_STATE .value , 0) self.tblUFStates .setCurrentCell(0 , 0) self.tblTreatmentStopStates.setCurrentCell(0 , 0) self.tblRinsebackStates .setCurrentCell(0 , 0) @@ -111,4 +110,4 @@ tx_end_state , tx_saline_state , tx_heparin_state - ) \ No newline at end of file + ) Index: TD_Valves/loader.py =================================================================== diff -u -r4e2342ccd6104d0cb1f5321c24c9955c2cae69c8 -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b --- TD_Valves/loader.py (.../loader.py) (revision 4e2342ccd6104d0cb1f5321c24c9955c2cae69c8) +++ TD_Valves/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) @@ -11,10 +11,6 @@ # parent from engine.dynamicloader import DynamicLoader -# plugin specific -from leahi_dialin.common.td_defs import TDOpModes -from leahi_dialin.common.td_defs import TDStandbyStates - # hd Simulator from leahi_dialin.ui.td_messaging import TD_Messaging Index: TD_Versions/loader.py =================================================================== diff -u -r4e2342ccd6104d0cb1f5321c24c9955c2cae69c8 -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b --- TD_Versions/loader.py (.../loader.py) (revision 4e2342ccd6104d0cb1f5321c24c9955c2cae69c8) +++ TD_Versions/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) @@ -11,10 +11,6 @@ # parent from engine.dynamicloader import DynamicLoader -# plugin specific -from leahi_dialin.common.td_defs import TDOpModes -from leahi_dialin.common.td_defs import TDStandbyStates - # hd Simulator from leahi_dialin.ui.td_messaging import TD_Messaging @@ -105,4 +101,4 @@ serial = self.serial.toPlainText() self.td_interface.td_serial( serial - ) \ No newline at end of file + ) Index: TD_Voltages/loader.py =================================================================== diff -u -rf9ec0e263221cccdf36e037c4729b0972cd45c07 -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b --- TD_Voltages/loader.py (.../loader.py) (revision f9ec0e263221cccdf36e037c4729b0972cd45c07) +++ TD_Voltages/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) @@ -11,10 +11,6 @@ # parent from engine.dynamicloader import DynamicLoader -# plugin specific -from leahi_dialin.common.td_defs import TDOpModes -from leahi_dialin.common.td_defs import TDStandbyStates - # hd Simulator from leahi_dialin.ui.td_messaging import TD_Messaging @@ -100,4 +96,4 @@ line_sensors_5v, line_24v, line_regen_24v, fpga_adc_ref, res_ref, fpga_vcc, fpga_vaux, fpga_vpvn - ) \ No newline at end of file + ) Index: TreatmentParameters/loader.py =================================================================== diff -u -rbbec641c7f9e0c870581448fd953809b06a1c3b3 -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b --- TreatmentParameters/loader.py (.../loader.py) (revision bbec641c7f9e0c870581448fd953809b06a1c3b3) +++ TreatmentParameters/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) @@ -15,8 +15,7 @@ # 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.td_defs import TD_Defs from leahi_dialin.utils import conversions from leahi_dialin.protocols import CAN @@ -88,17 +87,17 @@ @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() def do_create(self): 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()) @@ -110,8 +109,8 @@ @Slot() def do_confirm(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 ) @Slot()