elena/TimeBinControl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Client bugfixes

Browse Source
This commit is contained in:
Elena Arenskötter 2023-11-04 13:51:51 +01:00
parent 6d10c0d7f5
commit cf5f084247
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui-client/channelInfoClass.py
View File

@ -43,7 +43,7 @@ class channelInfo(QObject):
self.widget_obj.peltierCheckBox.stateChanged.connect(self.heaterTypeChanged) self.widget_obj.peltierCheckBox.stateChanged.connect(self.heaterTypeChanged)
self.widget_obj.CurrentButton.clicked.connect(self.CurrentButtonChanged) self.widget_obj.CurrentButton.clicked.connect(self.CurrentButtonChanged)
self.widget_obj.PhaseButton.clicked.connect(self.PhaseButton) self.widget_obj.PhaseButton.clicked.connect(self.PhaseButtonChanged)
def update(self): def update(self):
if globalvars.conStatus[self.device_num]: if globalvars.conStatus[self.device_num]:

6
src/gui-client/client.py
View File

@ -134,6 +134,7 @@ class ApplicationWindow(QMainWindow, Ui_MainWindow):
else: else:
globalvars.conStatus[0] = False globalvars.conStatus[0] = False
if not globalvars.conStatus[0]:
self.refresh_timer.stop() self.refresh_timer.stop()
time.sleep(0.1) time.sleep(0.1)
print("disconnect from "+ self.address) print("disconnect from "+ self.address)
@ -178,6 +179,7 @@ class ApplicationWindow(QMainWindow, Ui_MainWindow):
else: else:
globalvars.conStatus[1] = False globalvars.conStatus[1] = False
if not globalvars.conStatus[1]:
self.refresh_timer.stop() self.refresh_timer.stop()
time.sleep(0.1) time.sleep(0.1)
print("disconnect from "+ self.address2) print("disconnect from "+ self.address2)
@ -185,8 +187,8 @@ class ApplicationWindow(QMainWindow, Ui_MainWindow):
self.channel[1].setEnabled(globalvars.conStatus[1]) self.channel[1].setEnabled(globalvars.conStatus[1])
self.remoteRadioButton.setEnabled(not globalvars.conStatus[1]) self.remoteRadioButton2.setEnabled(not globalvars.conStatus[1])
self.localRadioButton.setEnabled(not globalvars.conStatus[1]) self.localRadioButton2.setEnabled(not globalvars.conStatus[1])
def refresh(self): def refresh(self):
for ch in range(len(self.channel)): for ch in range(len(self.channel)):

2
src/gui-client/settings.json
View File

@ -1 +1 @@
{"defaultIP": "134.96.13.250", "defaultPort": 2000, "defaultIP2": "134.96.13.250", "defaultPort2": 2000, "ch0": {"name": "Encoder", "setpoint": 26.62, "kp": 12.0, "ki": 4.0, "kd": 0, "PIDenabled": 0, "channelEnabled": 1, "peltier": 0, "zeroVolt": 1.29}, "ch1": {"name": "Decoder", "setpoint": 26.62, "kp": 12.0, "ki": 4.0, "kd": 0, "PIDenabled": 0, "channelEnabled": 1, "peltier": 0, "zeroVolt": 1.29}, "ch2": {"name": "Channel 3", "setpoint": 34.05, "kp": 0.0, "ki": 0.0, "kd": 0.0, "PIDenabled": 0, "channelEnabled": 1}, "ch3": {"name": "Channel 4", "setpoint": 21.5, "kp": 0.0, "ki": 0.0, "kd": 0.0, "PIDenabled": 0, "channelEnabled": 1}} {"defaultIP": "134.96.13.250", "defaultPort": 2000, "defaultIP2": "134.96.13.250", "defaultPort2": 2000, "ch0": {"name": "Encoder", "setpoint": 30.0, "kp": 0.2, "ki": 0.05000000000000002, "kd": 0.0, "PIDenabled": 0, "channelEnabled": 1, "peltier": 0, "zeroVolt": 1.29}, "ch1": {"name": "Decoder", "setpoint": 26.62, "kp": 12.0, "ki": 4.0, "kd": 0, "PIDenabled": 0, "channelEnabled": 1, "peltier": 0, "zeroVolt": 1.29}, "ch2": {"name": "Channel 3", "setpoint": 34.05, "kp": 0.0, "ki": 0.0, "kd": 0.0, "PIDenabled": 0, "channelEnabled": 1}, "ch3": {"name": "Channel 4", "setpoint": 21.5, "kp": 0.0, "ki": 0.0, "kd": 0.0, "PIDenabled": 0, "channelEnabled": 1}}