esavkin/thermostat
1
0
Fork 0
forked from M-Labs/thermostat
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify postfilter stuff

Browse Source
This commit is contained in:
atse 2023-10-16 11:45:24 +08:00
parent bf0cb9ef05
commit c56a167824
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pytec/tec_qt.py
View File

@ -236,8 +236,8 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
{'name': 'B', 'type': 'float', 'value': 3950, 'step': 1, 'suffix': 'K', 'decimals': 4, 'param': ('s-h', ch, 'b')}, {'name': 'B', 'type': 'float', 'value': 3950, 'step': 1, 'suffix': 'K', 'decimals': 4, 'param': ('s-h', ch, 'b')},
]}, ]},
{'name': 'Postfilter Config', 'expanded': False, 'type': 'group', 'children': [ {'name': 'Postfilter Config', 'expanded': False, 'type': 'group', 'children': [
{'name': 'Postfilter Rate', 'type': 'list', 'value': ('rate', 16.67), 'param': ('postfilter', ch), {'name': 'Postfilter Rate', 'type': 'list', 'value': 16.67, 'param': ('postfilter', ch, 'rate'),
'limits': {'Off': ('off',), '16.67 Hz': ('rate', 16.67), '20 Hz': ('rate', 20.0), '21.25 Hz': ('rate', 21.25), '27 Hz': ('rate', 27.0)}}, 'limits': {'Off': None, '16.67 Hz': 16.67, '20 Hz': 20.0, '21.25 Hz': 21.25, '27 Hz': 27.0}},
]}, ]},
{'name': 'PID Config', 'expanded': False, 'type': 'group', 'children': [ {'name': 'PID Config', 'expanded': False, 'type': 'group', 'children': [
{'name': 'Kp', 'type': 'float', 'step': 0.1, 'suffix': '', 'param': ('pid', ch, 'kp')}, {'name': 'Kp', 'type': 'float', 'step': 0.1, 'suffix': '', 'param': ('pid', ch, 'kp')},
@ -668,8 +668,8 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
data /= 1000 # Given in mA data /= 1000 # Given in mA
thermostat_param = inner_param.opts["param"] thermostat_param = inner_param.opts["param"]
if inner_param.name() == 'Postfilter Rate': if inner_param.name() == 'Postfilter Rate' and data == None:
set_param_args = (*thermostat_param, *data) set_param_args = (*thermostat_param[:2], 'off')
elif inner_param.name() == 'Control Method': elif inner_param.name() == 'Control Method':
set_param_args = thermostat_param set_param_args = thermostat_param
else: else:
@ -831,10 +831,7 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
for postfilter_params in postfilter_data: for postfilter_params in postfilter_data:
channel = postfilter_params["channel"] channel = postfilter_params["channel"]
with QSignalBlocker(self.params[channel]): with QSignalBlocker(self.params[channel]):
if postfilter_params["rate"] == None: self.params[channel].child("Postfilter Config", "Postfilter Rate").setValue(postfilter_params["rate"])
self.params[channel].child("Postfilter Config", "Postfilter Rate").setValue(('off',))
else:
self.params[channel].child("Postfilter Config", "Postfilter Rate").setValue(('rate', postfilter_params["rate"]))
async def coro_main(): async def coro_main():