diff --git a/src/gui-client/channelInfoClass.py b/src/gui-client/channelInfoClass.py index 18a65b4..b66631c 100644 --- a/src/gui-client/channelInfoClass.py +++ b/src/gui-client/channelInfoClass.py @@ -43,7 +43,7 @@ class channelInfo(QObject): self.widget_obj.peltierCheckBox.stateChanged.connect(self.heaterTypeChanged) 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): if globalvars.conStatus[self.device_num]: diff --git a/src/gui-client/client.py b/src/gui-client/client.py index ccefbbc..7b57eb1 100644 --- a/src/gui-client/client.py +++ b/src/gui-client/client.py @@ -134,7 +134,8 @@ class ApplicationWindow(QMainWindow, Ui_MainWindow): else: globalvars.conStatus[0] = False - self.refresh_timer.stop() + if not globalvars.conStatus[0]: + self.refresh_timer.stop() time.sleep(0.1) print("disconnect from "+ self.address) self.sock.close() @@ -178,15 +179,16 @@ class ApplicationWindow(QMainWindow, Ui_MainWindow): else: globalvars.conStatus[1] = False - self.refresh_timer.stop() + if not globalvars.conStatus[1]: + self.refresh_timer.stop() time.sleep(0.1) print("disconnect from "+ self.address2) self.sock2.close() self.channel[1].setEnabled(globalvars.conStatus[1]) - self.remoteRadioButton.setEnabled(not globalvars.conStatus[1]) - self.localRadioButton.setEnabled(not globalvars.conStatus[1]) + self.remoteRadioButton2.setEnabled(not globalvars.conStatus[1]) + self.localRadioButton2.setEnabled(not globalvars.conStatus[1]) def refresh(self): for ch in range(len(self.channel)): diff --git a/src/gui-client/settings.json b/src/gui-client/settings.json index fca486d..4f951a8 100644 --- a/src/gui-client/settings.json +++ b/src/gui-client/settings.json @@ -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}} \ No newline at end of file +{"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}} \ No newline at end of file