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

GUI: Control Panel changes #2

Open
atse wants to merge 21 commits from gui_dev-ctrl_panel into gui_dev
pull from: gui_dev-ctrl_panel
merge into: linuswck:gui_dev
Conversation 13 Commits 21 Files Changed 6 +11 -3
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ed6cee4394 - Show all commits

2
pytec/pytec/gui/view/ctrl_panel.py
View File

@ -172,6 +172,6 @@ class CtrlPanel(QObject):
for postfilter_params in postfilter_data:
channel = postfilter_params["channel"]
with QSignalBlocker(self.params[channel]):
self.params[channel].child("thermistor", "rate").set_value_with_lock(
self.params[channel].child("postfilter", "rate").set_value_with_lock(
postfilter_params["rate"]
)

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

@ -177,7 +177,7 @@
"title": "Thermistor Settings",
"expanded": true,
"type": "group",
"tip": "Settings of the connected thermistor\n- Parameters for the resistance to temperature conversion (with the B-Parameter equation)\n- Settings for the 50/60 Hz filter with the thermistor",
"tip": "Parameters for the resistance to temperature conversion with the B-Parameter equation",
"children": [
{
"name": "t0",
@ -235,7 +235,15 @@
},
"tip": "The Beta Parameter",
"lock": false
},
}
]
},
{
"name": "postfilter",
"title": "ADC Settings",
"type": "group",
"tip": "Settings of the ADC on the SENS input",
"children": [
{
"name": "rate",
"title": "50/60 Hz Rejection Filter",