Index: TD_Ejector/interface.ui =================================================================== diff -u -r767c7999a57c41783d0269ec5ba296caf5278295 -r5875ce76e61acd0220d42445b8cfaed8c3af0a0f --- TD_Ejector/interface.ui (.../interface.ui) (revision 767c7999a57c41783d0269ec5ba296caf5278295) +++ TD_Ejector/interface.ui (.../interface.ui) (revision 5875ce76e61acd0220d42445b8cfaed8c3af0a0f) @@ -6,17 +6,14 @@ 0 0 - 346 - 131 + 290 + 190 &5 TD info/&3 TD Ejector - - 6 - @@ -65,13 +62,6 @@ - - - - reset - - - @@ -104,32 +94,38 @@ + + + + Retract Opt Sensor + + + + + + + Engage Opt Sensor + + + + + + + + + - - - - Qt::Vertical - - - - 20 - 40 - - - - stateSpinBox setSpeedDoubleSpinBox tbSend - tbReset Index: TD_Ejector/loader.py =================================================================== diff -u -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b -r5875ce76e61acd0220d42445b8cfaed8c3af0a0f --- TD_Ejector/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) +++ TD_Ejector/loader.py (.../loader.py) (revision 5875ce76e61acd0220d42445b8cfaed8c3af0a0f) @@ -30,18 +30,19 @@ finds and creates widgets :return: none """ - self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' ) - self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' ) + self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' ) - self.state = self.find_widget(QtWidgets.QSpinBox , 'stateSpinBox' ) - self.setSpeed = self.find_widget(QtWidgets.QDoubleSpinBox , 'setSpeedDoubleSpinBox' ) + self.state = self.find_widget(QtWidgets.QSpinBox , 'stateSpinBox' ) + self.setSpeed = self.find_widget(QtWidgets.QDoubleSpinBox , 'setSpeedDoubleSpinBox') + self.sbRetractOptSensor = self.find_widget(QtWidgets.QSpinBox , 'sbRetractOptSensor' ) + self.sbEngageOptSensor = self.find_widget(QtWidgets.QSpinBox , 'sbEngageOptSensor' ) + def _init_connections(self): """ initializes the widgets connections :return: none """ - self.tbReset.clicked.connect(self._init_widgets) self.tbSend.clicked.connect(self.do_ejector_data) @Slot() @@ -52,16 +53,17 @@ """ self.state.setValue(0) self.setSpeed.setValue(0) + self.sbRetractOptSensor.setValue(0) + self.sbEngageOptSensor.setValue(0) @Slot() def do_ejector_data(self): """ the slot for ejector change :return: none """ - H5_state = self.state .value() - H5_set_speed = self.setSpeed .value() self.td_interface.td_ejector( - H5_state , - H5_set_speed - ) + self.state .value() , + self.setSpeed .value() , + self.sbRetractOptSensor .value() , + self.sbEngageOptSensor .value() ) Index: TD_Valves/interface.ui =================================================================== diff -u -r5e32491166e1ccf47a90c9d2db5d0b37ecf249bb -r5875ce76e61acd0220d42445b8cfaed8c3af0a0f --- TD_Valves/interface.ui (.../interface.ui) (revision 5e32491166e1ccf47a90c9d2db5d0b37ecf249bb) +++ TD_Valves/interface.ui (.../interface.ui) (revision 5875ce76e61acd0220d42445b8cfaed8c3af0a0f) @@ -6,8 +6,8 @@ 0 0 - 599 - 169 + 456 + 385 @@ -49,64 +49,71 @@ - + + + + Send + + + + - + 100 0 + + + 100 + 16777215 + + - Valve ID + Valve ID - - - - 0 - 0 - - + + + + + + + + - 400 + 100 0 - - 100 - - - Qt::Horizontal - - - - - - + - 60 - 0 + 100 + 16777215 - 0 + State + + + - + - + 100 @@ -120,51 +127,45 @@ - State + Curr Pos ID - - - - 0 - 0 - - - - 100 - - - Qt::Horizontal - - + + + + + - + - 60 + 100 0 - 60 + 100 16777215 - 0 + Curr Pos + + + - + - + 100 @@ -178,51 +179,45 @@ - Pos Name + Cmd Pos - - - - 0 - 0 - - - - 100 - - - Qt::Horizontal - - + + + + + - + - 60 + 100 0 - 60 + 100 16777215 - 0 + Pos A + + + - + - + 100 @@ -236,197 +231,97 @@ - Pos Count + Pos B - - - - 0 - 0 - - - - 32767 - - - Qt::Horizontal - - + + + + + - + - 60 + 100 0 - 60 + 100 16777215 - 0 + Pos C + + + - + - + 100 0 + + + 100 + 16777215 + + - Next Pos + Pos D - - - - 0 - 0 - - - - 32767 - - - Qt::Horizontal - - + + + + + - + - 60 + 100 0 - 60 + 100 16777215 - 0 + Max Homing Pos + + + - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - ValveIDSlider - valueChanged(int) - ValveID - setNum(int) - - - 577 - 46 - - - 700 - 46 - - - - - StateSlider - valueChanged(int) - ValveState - setNum(int) - - - 556 - 66 - - - 704 - 70 - - - - - PosNameSlider - valueChanged(int) - PosName - setNum(int) - - - 665 - 96 - - - 709 - 99 - - - - - PosCountSlider - valueChanged(int) - PosCount - setNum(int) - - - 509 - 119 - - - 715 - 118 - - - - - NextPosSlider - valueChanged(int) - NextPos - setNum(int) - - - 660 - 144 - - - 710 - 149 - - - - + Index: TD_Valves/loader.py =================================================================== diff -u -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b -r5875ce76e61acd0220d42445b8cfaed8c3af0a0f --- TD_Valves/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) +++ TD_Valves/loader.py (.../loader.py) (revision 5875ce76e61acd0220d42445b8cfaed8c3af0a0f) @@ -31,54 +31,59 @@ :return: none """ - self.ValveID = self.find_widget(QtWidgets.QSlider , 'ValveIDSlider' ) - self.State = self.find_widget(QtWidgets.QSlider , 'StateSlider' ) - self.PosName = self.find_widget(QtWidgets.QSlider , 'PosNameSlider' ) - self.PosCount = self.find_widget(QtWidgets.QSlider , 'PosCountSlider' ) - self.NextPos = self.find_widget(QtWidgets.QSlider , 'NextPosSlider' ) + self.pbSend = self.find_widget(QtWidgets.QPushButton, 'pbSend' ) + self.sbValveID = self.find_widget(QtWidgets.QSpinBox , 'sbValveID' ) + self.sbState = self.find_widget(QtWidgets.QSpinBox , 'sbState' ) + self.sbCurrPosID = self.find_widget(QtWidgets.QSpinBox , 'sbCurrPosID' ) + self.sbCurrPos = self.find_widget(QtWidgets.QSpinBox , 'sbCurrPos' ) + self.sbCmdPos = self.find_widget(QtWidgets.QSpinBox , 'sbCmdPos' ) + self.sbPosA = self.find_widget(QtWidgets.QSpinBox , 'sbPosA' ) + self.sbPosB = self.find_widget(QtWidgets.QSpinBox , 'sbPosB' ) + self.sbPosC = self.find_widget(QtWidgets.QSpinBox , 'sbPosC' ) + self.sbPosD = self.find_widget(QtWidgets.QSpinBox , 'sbPosD' ) + self.sbMaxHomingPos = self.find_widget(QtWidgets.QSpinBox , 'sbMaxHomingPos' ) + def _init_connections(self): """ initializes the widgets connections :return: none """ - # self.tbReset.clicked.connect(self._init_widgets) - # self.tbSend.clicked.connect(self.do_valve_data) - # self.tblOpMode.currentCellChanged.connect(self.do_treatment_states) - # self.tblSubMode.currentCellChanged.connect(self.do_treatment_states) - self.ValveID .valueChanged.connect(self.do_valve_data) - self.State .valueChanged.connect(self.do_valve_data) - self.PosName .valueChanged.connect(self.do_valve_data) - self.PosCount.valueChanged.connect(self.do_valve_data) - self.NextPos .valueChanged.connect(self.do_valve_data) + self.pbSend.clicked.connect(self.do_valve_data) + @Slot() def _init_widgets(self): """ initializes the widgets' properties :return: none """ - self.ValveID.setValue(0) - self.State.setValue(0) - self.PosName.setValue(0) - self.PosCount.setValue(0) - self.NextPos.setValue(0) + self.sbValveID .setValue(0) + self.sbState .setValue(0) + self.sbCurrPosID .setValue(0) + self.sbCurrPos .setValue(0) + self.sbCmdPos .setValue(0) + self.sbPosA .setValue(0) + self.sbPosB .setValue(0) + self.sbPosC .setValue(0) + self.sbPosD .setValue(0) + self.sbMaxHomingPos .setValue(0) @Slot() def do_valve_data(self): """ the slot for Valve data change :return: none """ - valve_id = self.ValveID.value() - state = self.State.value() - pos_name = self.PosName.value() - pos_count = self.PosCount.value() - next_pos = self.NextPos.value() self.td_interface.td_valves( - valve_id , - state , - pos_name , - pos_count , - next_pos + self.sbValveID .value() , + self.sbState .value() , + self.sbCurrPosID .value() , + self.sbCurrPos .value() , + self.sbCmdPos .value() , + self.sbPosA .value() , + self.sbPosB .value() , + self.sbPosC .value() , + self.sbPosD .value() , + self.sbMaxHomingPos.value() ) Index: TD_Voltages/interface.ui =================================================================== diff -u -r767c7999a57c41783d0269ec5ba296caf5278295 -r5875ce76e61acd0220d42445b8cfaed8c3af0a0f --- TD_Voltages/interface.ui (.../interface.ui) (revision 767c7999a57c41783d0269ec5ba296caf5278295) +++ TD_Voltages/interface.ui (.../interface.ui) (revision 5875ce76e61acd0220d42445b8cfaed8c3af0a0f) @@ -7,7 +7,7 @@ 0 0 412 - 270 + 332 @@ -56,225 +56,137 @@ - - - - reset - - - - - - - - - - QLayout::SetMaximumSize - - - 10 - - - - - 1.2V Line - - - - - - - 1.200000000000000 - - - - - - - 3.3V line - - - - - - - 5V Logic - - - - - - - 5.000000000000000 - - - - - - - 5V Sensors - - - - - - - 5.000000000000000 - - - - - - - 24V Line - - - - - - - 24.000000000000000 - - - - - - - 24 Regen - - - - - - - 24.000000000000000 - - - - - - - 3.300000000000000 - - - - - - + + + 10 + + + + + FPGA VCC + + - - - - 10 + + + + 3.000000000000000 - - - - FPGA ADC - - - - - - - 1.000000000000000 - - - - - - - FPGA VCC - - - - - - - 3.000000000000000 - - - - - - - FPGA VAUX - - - - - - - 3.000000000000000 - - - - - - - FPGA VPVN - - - - - - - 1.000000000000000 - - - - - - - Res Ref - - - - - - - 3.000000000000000 - - - - + + + + + FPGA VAUX + + + + + + + 3.000000000000000 + + + + + + + FPGA VPVN + + + + + + + 1.000000000000000 + + + + + + + 1.2V Line + + + + + + + 1.200000000000000 + + + + + + + 3.3V line + + + + + + + 3.300000000000000 + + + + + + + 5V Logic + + + + + + + 5.000000000000000 + + + + + + + 24V_1 Line + + + + + + + 24.000000000000000 + + + + + + + 24V_2 Line + + + + + + + 24.000000000000000 + + + - - - - Qt::Vertical - - - - 20 - 0 - - - - - 12VLineDoubleSpinBox - 33VLineDoubleSpinBox - 5VLogicDoubleSpinBox - 5VSensorsDoubleSpinBox - 24VLineDoubleSpinBox - 24RegenDoubleSpinBox - fPGAADCDoubleSpinBox - fPGAVCCDoubleSpinBox - fPGAVAUXDoubleSpinBox - fPGAVPVNDoubleSpinBox - resRefDoubleSpinBox + sb24V_1 + sbVCC + sbVAUX + sbVPVN tbSend - tbReset Index: TD_Voltages/loader.py =================================================================== diff -u -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b -r5875ce76e61acd0220d42445b8cfaed8c3af0a0f --- TD_Voltages/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) +++ TD_Voltages/loader.py (.../loader.py) (revision 5875ce76e61acd0220d42445b8cfaed8c3af0a0f) @@ -30,70 +30,54 @@ finds and creates widgets :return: none """ - self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' ) self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' ) - self.line_1_2 = self.find_widget(QtWidgets.QDoubleSpinBox , '12VLineDoubleSpinBox' ) - self.line_3_3v = self.find_widget(QtWidgets.QDoubleSpinBox , '33VLineDoubleSpinBox' ) - self.line_logic_5v = self.find_widget(QtWidgets.QDoubleSpinBox , '5VLogicDoubleSpinBox' ) - self.line_sensors_5v= self.find_widget(QtWidgets.QDoubleSpinBox , '5VSensorsDoubleSpinBox' ) - self.line_24v = self.find_widget(QtWidgets.QDoubleSpinBox , '24VLineDoubleSpinBox' ) - self.line_regen_24v = self.find_widget(QtWidgets.QDoubleSpinBox , '24RegenDoubleSpinBox' ) - self.fpga_adc_ref = self.find_widget(QtWidgets.QDoubleSpinBox , 'fPGAADCDoubleSpinBox' ) - self.res_ref = self.find_widget(QtWidgets.QDoubleSpinBox , 'resRefDoubleSpinBox' ) - self.fpga_vcc = self.find_widget(QtWidgets.QDoubleSpinBox , 'fPGAVCCDoubleSpinBox' ) - self.fpga_vaux = self.find_widget(QtWidgets.QDoubleSpinBox , 'fPGAVAUXDoubleSpinBox' ) - self.fpga_vpvn = self.find_widget(QtWidgets.QDoubleSpinBox , 'fPGAVPVNDoubleSpinBox' ) + self.line_1_2 = self.find_widget(QtWidgets.QDoubleSpinBox , 'sb12' ) + self.line_3_3v = self.find_widget(QtWidgets.QDoubleSpinBox , 'sb33' ) + self.line_logic_5v = self.find_widget(QtWidgets.QDoubleSpinBox , 'sb5V' ) + self.line_24_1v = self.find_widget(QtWidgets.QDoubleSpinBox , 'sb24V_1' ) + self.line_24_2v = self.find_widget(QtWidgets.QDoubleSpinBox , 'sb24V_2' ) + self.fpga_vcc = self.find_widget(QtWidgets.QDoubleSpinBox , 'sbVCC' ) + self.fpga_vaux = self.find_widget(QtWidgets.QDoubleSpinBox , 'sbVAUX' ) + self.fpga_vpvn = self.find_widget(QtWidgets.QDoubleSpinBox , 'sbVPVN' ) def _init_connections(self): """ initializes the widgets connections :return: none """ - self.tbReset.clicked.connect(self._init_widgets) self.tbSend.clicked.connect(self.do_voltage_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.line_1_2.setValue = 1.2 - self.line_3_3v.setValue = 3.3 - self.line_logic_5v.setValue = 5.0 - self.line_sensors_5v.setValue = 5.0 - self.line_24v.setValue = 24.0 - self.line_regen_24v.setValue = 24.0 - self.fpga_adc_ref.setValue = 1.0 - self.res_ref.setValue = 3.0 - self.fpga_vcc.setValue = 3.0 - self.fpga_vaux.setValue = 3.0 - self.fpga_vpvn.setValue = 1.0 + self.line_1_2 .setValue(0) + self.line_3_3v .setValue(0) + self.line_logic_5v .setValue(0) + self.line_24_1v .setValue(0) + self.line_24_2v .setValue(0) + self.fpga_vcc .setValue(0) + self.fpga_vaux .setValue(0) + self.fpga_vpvn .setValue(0) + @Slot() def do_voltage_data(self): """ the slot for voltage data change :return: none """ - line_1_2v = self.line_1_2.value() - line_3_3v = self.line_3_3v.value() - line_logic_5v = self.line_logic_5v.value() - line_sensors_5v = self.line_sensors_5v.value() - line_24v = self.line_24v.value() - line_regen_24v = self.line_regen_24v.value() - fpga_adc_ref = self.fpga_adc_ref.value() - res_ref = self.res_ref.value() - fpga_vcc = self.fpga_vcc.value() - fpga_vaux = self.fpga_vaux.value() - fpga_vpvn = self.fpga_vpvn.value() self.td_interface.td_voltage( - line_1_2v, line_3_3v, line_logic_5v, - line_sensors_5v, line_24v, line_regen_24v, - fpga_adc_ref, res_ref, fpga_vcc, - fpga_vaux, fpga_vpvn - ) + self.line_1_2 .value(), + self.line_3_3v .value(), + self.line_logic_5v .value(), + self.line_24_1v .value(), + self.line_24_2v .value(), + self.fpga_vcc .value(), + self.fpga_vaux .value(), + self.fpga_vpvn .value())