linuswck
/
thermostat
forked from M-Labs/thermostat
1
0
Fork 0
Code Pull Requests 2 Activity

GUI: Refactor send_command #4

Open
atse wants to merge 6 commits from gui_dev-refactor-send_command into gui_dev
pull from: gui_dev-refactor-send_command
merge into: linuswck:gui_dev
Conversation 0 Commits 6 Files Changed 2 +14 -21
2 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 41abad7aa3 - Show all commits

12
pytec/pytec/gui/view/param_tree.json
View File

@ -25,14 +25,10 @@
"Constant Current",
"Temperature PID"
],
"activaters":[
null,
[
"pwm",
"ch",
"pid"
]
],
"thermostat:set_param":{
"topic":"pwm",
"field":"pid"
},
"children":[
{
"name":"Set Current",

23
pytec/tec_qt.py
View File

@ -273,10 +273,16 @@ class MainWindow(QtWidgets.QMainWindow):
thermostat_param = inner_param.opts["thermostat:set_param"]
if inner_param.name() == "Postfilter Rate" and new_value is None:
thermostat_param = thermostat_param.copy()
thermostat_param["field"] = "off"
new_value = ""
# Handle thermostat command irregularities
match inner_param.name(), new_value:
case "Postfilter Rate", None:
thermostat_param = thermostat_param.copy()
thermostat_param["field"] = "off"
new_value = ""
case "Control Method", "Constant Current":
return
case "Control Method", "Temperature PID":
new_value = ""
inner_param.setOpts(lock=True)
await self.client.set_param(
@ -288,15 +294,6 @@ class MainWindow(QtWidgets.QMainWindow):
auto_tuner_param = inner_param.opts["pid_autotune"]
self.autotuners.set_params(auto_tuner_param, ch, new_value)
if "activaters" in inner_param.opts:
activater = inner_param.opts["activaters"][
inner_param.opts["limits"].index(data)
]
if activater is not None:
if activater[1] == "ch":
activater[1] = ch
await self.client.set_param(*activater)
@asyncSlot()
async def pid_auto_tune_request(self, ch=0):
match self.autotuners.get_state(ch):