Index: DD_Versions/interface.ui =================================================================== diff -u --- DD_Versions/interface.ui (revision 0) +++ DD_Versions/interface.ui (revision 4e2342ccd6104d0cb1f5321c24c9955c2cae69c8) @@ -0,0 +1,354 @@ + + + ui_interface + + + + 0 + 0 + 758 + 208 + + + + + 16777215 + 16777215 + + + + + 0 + 0 + + + + &Misc/&2 DD Versions + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + 0 + + + + + + + + 0 + 0 + + + + + 220 + 0 + + + + + 10 + + + + color: rgb(238, 238, 236); +background-color: rgb(52, 105, 2); + + + 136 : [0x8800] : DD Serial # + + + Qt::AlignCenter + + + + + + + + + + 16777215 + 30 + + + + + + + + + 260 + 0 + + + + + 16777215 + 30 + + + + background-color: rgb(32, 74, 135); +color: rgb(255, 255, 255); + + + Serial # + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + + 0 + 0 + + + + + 220 + 0 + + + + + 10 + + + + color: rgb(238, 238, 236); +background-color: rgb(52, 105, 2); + + + 15 : [0x0F00] : DD Versions + + + Qt::AlignCenter + + + + + + + Send + + + + + + + reset + + + + + + + + + + + 0 + + + + + 0 + + + + + 0 + + + + + + 250 + 0 + + + + false + + + background-color: rgb(114, 159, 207); +color: rgb(255, 255, 255); + + + Device Ver. + + + + + + + background-color: rgb(52, 101, 164); +color: rgb(255, 255, 255); + + + FPGA Ver. + + + + + + + + + + + + + + + + Lab + + + + + + + Micro + + + + + + + Minor + + + + + + + ID + + + + + + + + + + + + + Minor + + + + + + + Build + + + + + + + + + + + + + + + + Major + + + + + + + + + + Comp. + + + + + + + + + + Major + + + + + + + + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Index: DD_Versions/loader.py =================================================================== diff -u --- DD_Versions/loader.py (revision 0) +++ DD_Versions/loader.py (revision 4e2342ccd6104d0cb1f5321c24c9955c2cae69c8) @@ -0,0 +1,108 @@ +""" + The DD Versions ui loader +""" +# Python +import os + +# Qt +from PySide2 import QtCore, QtWidgets +from PySide2.QtCore import Slot + +# 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.dd_messaging import DD_Messaging + + +class Loader(DynamicLoader): + """ + The TD Versions ui loader + """ + + def __init__(self): + self.dd_interface = DD_Messaging() + super().__init__(os.path.dirname(__file__)) + + + def _init_loader(self): + """ + finds and creates widgets + :return: none + """ + self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' ) + self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' ) + + self.dmajor = self.find_widget(QtWidgets.QSpinBox , 'deviceMajorspinBox' ) + self.dminor = self.find_widget(QtWidgets.QSpinBox , 'deviceMinorspinBox' ) + self.dmicro = self.find_widget(QtWidgets.QSpinBox , 'deviceMicrospinBox' ) + self.dbuild = self.find_widget(QtWidgets.QSpinBox , 'deviceBuildspinBox' ) + self.comp = self.find_widget(QtWidgets.QSpinBox , 'deviceCompatibilityspinBox' ) + self.fpga_id = self.find_widget(QtWidgets.QSpinBox , 'FPGAIDspinBox' ) + self.fpga_major = self.find_widget(QtWidgets.QSpinBox , 'FPGAMajorspinBox' ) + self.fpga_minor = self.find_widget(QtWidgets.QSpinBox , 'FPGAMinorspinBox' ) + self.fpga_lab = self.find_widget(QtWidgets.QSpinBox , 'FPGALabspinBox' ) + self.serial = self.find_widget(QtWidgets.QPlainTextEdit , 'deviceSerial' ) + + def _init_connections(self): + """ + initializes the widgets connections + :return: none + """ + self.tbReset.clicked.connect(self._init_widgets) + self.tbSend.clicked.connect(self.do_version_data) + # self.tblOpMode.currentCellChanged.connect(self.do_treatment_states) + # self.tblSubMode.currentCellChanged.connect(self.do_treatment_states) + + @Slot() + def _init_widgets(self): + """ + initializes the widgets' properties + :return: none + """ + self.dmajor.setValue(0) + self.dminor.setValue(0) + self.dmicro.setValue(0) + self.dbuild.setValue(0) + self.comp.setValue(0) + self.fpga_id.setValue(0) + self.fpga_major.setValue(0) + self.fpga_minor.setValue(0) + self.fpga_lab.setValue(0) + self.serial.setPlainText("12345") + + @Slot() + def do_version_data(self): + """ + the slot for Version data change + :return: none + """ + major = self.dmajor.value() + minor = self.dminor.value() + micro = self.dmicro.value() + build = self.dbuild.value() + fpga_id = self.fpga_id.value() + fpga_major = self.fpga_major.value() + fpga_minor = self.fpga_minor.value() + fpga_lab = self.fpga_lab.value() + compatibility_rev = self.comp.value() + self.dd_interface.dd_versions( + major, + minor, + micro, + build, + fpga_id, + fpga_major, + fpga_minor, + fpga_lab, + compatibility_rev + ) + + serial = self.serial.toPlainText() + self.dd_interface.dd_serial( + serial + ) \ No newline at end of file Index: TD_Battery/loader.py =================================================================== diff -u -rf05537cca2e7e054a5124d4f5f9ed3ad26264458 -r4e2342ccd6104d0cb1f5321c24c9955c2cae69c8 --- TD_Battery/loader.py (.../loader.py) (revision f05537cca2e7e054a5124d4f5f9ed3ad26264458) +++ TD_Battery/loader.py (.../loader.py) (revision 4e2342ccd6104d0cb1f5321c24c9955c2cae69c8) @@ -1,5 +1,5 @@ """ - The TD Air Trap Mode ui loader + The TD Battery ui loader """ # Python import os Index: TD_BloodPump/loader.py =================================================================== diff -u -rfed26cc0ded3c0c08da0588bdb531143867fd1b3 -r4e2342ccd6104d0cb1f5321c24c9955c2cae69c8 --- TD_BloodPump/loader.py (.../loader.py) (revision fed26cc0ded3c0c08da0588bdb531143867fd1b3) +++ TD_BloodPump/loader.py (.../loader.py) (revision 4e2342ccd6104d0cb1f5321c24c9955c2cae69c8) @@ -1,5 +1,5 @@ """ - The TD Air Trap Mode ui loader + The TD Blood Pump ui loader """ # Python import os @@ -21,7 +21,7 @@ class Loader(DynamicLoader): """ - The TDBlood Pump ui loader + The TD Blood Pump ui loader """ def __init__(self): Index: TD_Ejector/loader.py =================================================================== diff -u -rfed26cc0ded3c0c08da0588bdb531143867fd1b3 -r4e2342ccd6104d0cb1f5321c24c9955c2cae69c8 --- TD_Ejector/loader.py (.../loader.py) (revision fed26cc0ded3c0c08da0588bdb531143867fd1b3) +++ TD_Ejector/loader.py (.../loader.py) (revision 4e2342ccd6104d0cb1f5321c24c9955c2cae69c8) @@ -1,5 +1,5 @@ """ - The TD Air Trap Mode ui loader + The TD Ejector ui loader """ # Python import os @@ -21,7 +21,7 @@ class Loader(DynamicLoader): """ - The TD Air Trap ui loader + The TD Ejector ui loader """ def __init__(self): @@ -47,8 +47,6 @@ """ self.tbReset.clicked.connect(self._init_widgets) self.tbSend.clicked.connect(self.do_ejector_data) - # self.tblOpMode.currentCellChanged.connect(self.do_treatment_states) - # self.tblSubMode.currentCellChanged.connect(self.do_treatment_states) @Slot() def _init_widgets(self): Index: TD_OpMode/loader.py =================================================================== diff -u -rc81cc70c3e01faf81396c4c891509471eb4fffb5 -r4e2342ccd6104d0cb1f5321c24c9955c2cae69c8 --- TD_OpMode/loader.py (.../loader.py) (revision c81cc70c3e01faf81396c4c891509471eb4fffb5) +++ TD_OpMode/loader.py (.../loader.py) (revision 4e2342ccd6104d0cb1f5321c24c9955c2cae69c8) @@ -1,5 +1,5 @@ """ - The HD Op Mode ui loader + The TD Op Mode ui loader """ # Python import os Index: TD_Switches/loader.py =================================================================== diff -u -rfed26cc0ded3c0c08da0588bdb531143867fd1b3 -r4e2342ccd6104d0cb1f5321c24c9955c2cae69c8 --- TD_Switches/loader.py (.../loader.py) (revision fed26cc0ded3c0c08da0588bdb531143867fd1b3) +++ TD_Switches/loader.py (.../loader.py) (revision 4e2342ccd6104d0cb1f5321c24c9955c2cae69c8) @@ -1,5 +1,5 @@ """ - The TD Air Trap Mode ui loader + The TD Switches ui loader """ # Python import os Index: TD_Temperatures/loader.py =================================================================== diff -u -rf05537cca2e7e054a5124d4f5f9ed3ad26264458 -r4e2342ccd6104d0cb1f5321c24c9955c2cae69c8 --- TD_Temperatures/loader.py (.../loader.py) (revision f05537cca2e7e054a5124d4f5f9ed3ad26264458) +++ TD_Temperatures/loader.py (.../loader.py) (revision 4e2342ccd6104d0cb1f5321c24c9955c2cae69c8) @@ -1,5 +1,5 @@ """ - The TD Air Trap Mode ui loader + The TD Temperatures ui loader """ # Python import os Index: TD_Valves/loader.py =================================================================== diff -u -rfed26cc0ded3c0c08da0588bdb531143867fd1b3 -r4e2342ccd6104d0cb1f5321c24c9955c2cae69c8 --- TD_Valves/loader.py (.../loader.py) (revision fed26cc0ded3c0c08da0588bdb531143867fd1b3) +++ TD_Valves/loader.py (.../loader.py) (revision 4e2342ccd6104d0cb1f5321c24c9955c2cae69c8) @@ -1,5 +1,5 @@ """ - The TD Air Trap Mode ui loader + The TD Valves ui loader """ # Python import os Index: TD_Versions/interface.ui =================================================================== diff -u -rfed26cc0ded3c0c08da0588bdb531143867fd1b3 -r4e2342ccd6104d0cb1f5321c24c9955c2cae69c8 --- TD_Versions/interface.ui (.../interface.ui) (revision fed26cc0ded3c0c08da0588bdb531143867fd1b3) +++ TD_Versions/interface.ui (.../interface.ui) (revision 4e2342ccd6104d0cb1f5321c24c9955c2cae69c8) @@ -23,7 +23,7 @@ - &10 Misc/&1 TD Versions + &Misc/&1 TD Versions @@ -70,7 +70,7 @@ background-color: rgb(52, 105, 2); - 149 : [0x9500] : TD Serial # + 153 : [0x9900] : TD Serial # Qt::AlignCenter @@ -157,7 +157,7 @@ background-color: rgb(52, 105, 2); - 15 : [0x0E00] : TD Versions + 14 : [0x0E00] : TD Versions Qt::AlignCenter Index: TD_Versions/loader.py =================================================================== diff -u -rfed26cc0ded3c0c08da0588bdb531143867fd1b3 -r4e2342ccd6104d0cb1f5321c24c9955c2cae69c8 --- TD_Versions/loader.py (.../loader.py) (revision fed26cc0ded3c0c08da0588bdb531143867fd1b3) +++ TD_Versions/loader.py (.../loader.py) (revision 4e2342ccd6104d0cb1f5321c24c9955c2cae69c8) @@ -1,5 +1,5 @@ """ - The TD Air Trap Mode ui loader + The TD Versions ui loader """ # Python import os @@ -103,6 +103,6 @@ ) serial = self.serial.toPlainText() - self.td_interface.cmd_send_serial_td_data( + self.td_interface.td_serial( serial ) \ No newline at end of file Index: TD_Voltages/loader.py =================================================================== diff -u -rf05537cca2e7e054a5124d4f5f9ed3ad26264458 -r4e2342ccd6104d0cb1f5321c24c9955c2cae69c8 --- TD_Voltages/loader.py (.../loader.py) (revision f05537cca2e7e054a5124d4f5f9ed3ad26264458) +++ TD_Voltages/loader.py (.../loader.py) (revision 4e2342ccd6104d0cb1f5321c24c9955c2cae69c8) @@ -1,5 +1,5 @@ """ - The TD Air Trap Mode ui loader + The TD Voltage ui loader """ # Python import os