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

Compare commits

base: linuswck:21eb13ed6fceda32b87242704990b42c90dc881a
Branches Tags
linuswck:master
linuswck:gui_dev-ctrl_panel
linuswck:gui_dev
linuswck:fix_incorrect_dac_cal
linuswck:fix_wrong_current_limit_duty_cycle_cal
linuswck:save_i_set_into_ch_cfg
linuswck:clamp_set_fns_to_design_spec
linuswck:pid_setpoint_kick_fix
linuswck:improve_adc_readings
linuswck:GUI
linuswck:softspi
M-Labs:master
M-Labs:dev-gui
M-Labs:GUI
M-Labs:softspi
...
compare: linuswck:3552a582f8a74ba426fed61a4eda8bac18548905
Branches Tags
linuswck:gui_dev-ctrl_panel
linuswck:gui_dev
linuswck:fix_incorrect_dac_cal
linuswck:fix_wrong_current_limit_duty_cycle_cal
linuswck:save_i_set_into_ch_cfg
linuswck:clamp_set_fns_to_design_spec
linuswck:pid_setpoint_kick_fix
linuswck:improve_adc_readings
linuswck:master
linuswck:GUI
linuswck:softspi
M-Labs:master
M-Labs:dev-gui
M-Labs:GUI
M-Labs:softspi

15 Commits
21eb13ed6f ... 3552a582f8

Author SHA1 Message Date
atse
3552a582f8 ctrl_panel: Keep i_set visible when PID engaged 
Since i_set is also plotted, we would want to see its precise value too.
 2024-07-19 15:55:43 +08:00
atse
d7defecaaa ctrl_panel: Remove MutexParameter 
Use the standard ListParamenter instead, and hook up UI changes
elsewhere.
 2024-07-19 15:49:19 +08:00
atse
282f3d1e82 ctrl_panel: Limits fixes 
* PID Autotune test current should be positive

* Maximum absolute voltage should be 4 V not 5 V
 2024-07-19 15:49:19 +08:00
atse
d4171f002e ctrl_panel: Code cleanup 
* Remove unnecessary duplication of `THERMOSTAT_PARAMETERS`

* i -> ch

* Separate ParameterTree and Parameter initiation

* Remove extra "channel" option to root parameters, as the "value"
option is already the channel number
 2024-07-19 15:49:19 +08:00
atse
1221ac4436 ctrl_panel: PID Auto Tune -> PID Autotune 2024-07-19 15:49:19 +08:00
atse
abecac44d6 ctrl_panel: Stop crushing spinboxes 
It might not be the case on some themes, but on the default Qt theme the
spinbox are a bit too short for the containing numbers. See
https://github.com/pyqtgraph/pyqtgraph/issues/701.
 2024-07-19 15:49:19 +08:00
atse
8902052ee0 ctrl_panel: Appropriate units for measured current 
Allow the readonly display of current to vary its SI prefix in the unit,
since as a display entry it won't have the unit adjustment problem.
 2024-07-19 15:49:19 +08:00
atse
fd7e22fd23 ctrl_panel: Pin down units for editable fields 
Avoids awkward value editing
 2024-07-19 15:49:19 +08:00
atse
681a7539fe ctrl_panel: Improve postfilter description 2024-07-19 15:49:19 +08:00
atse
ed835ddfe6 ctrl_panel: Add tooltips 
For users' better understanding of what the parameters do
 2024-07-19 15:49:19 +08:00
atse
437c9cec34 ctrl_panel: Refer to Parameters by concise names 
For displayed string representations, use the `title` key, or for
`ListParameter`s, use the dictionary mapping method instead.
 2024-07-19 15:49:19 +08:00
atse
7829ce6adf ctrl_panel: Config -> Settings 2024-07-19 15:49:16 +08:00
atse
0f14212622 Format JSON 2024-07-19 15:48:57 +08:00
linuswck
b768d61e39 Merge pull request 'GUI: Text changes' (#3) from gui_dev-str_changes into gui_dev 
Reviewed-on: #3
 2024-07-19 15:36:01 +08:00
atse
d244ba392a Fix typos 2024-07-19 15:34:31 +08:00
4 changed files with 498 additions and 451 deletions
Show Stats Expand all files Collapse all files

4
pytec/pytec/gui/model/thermostat.py
View File

@ -117,14 +117,14 @@ class Thermostat(QObject, metaclass=PropertyMeta):
async def save_cfg(self, ch): async def save_cfg(self, ch):
await self._client.save_config(ch) await self._client.save_config(ch)
self.info_box_trigger.emit( self.info_box_trigger.emit(
"Config loaded", f"Channel {ch} Config has been loaded from flash." "Settings saved", f"Channel {ch} Settings has been saved to flash."
) )
@asyncSlot() @asyncSlot()
async def load_cfg(self, ch): async def load_cfg(self, ch):
await self._client.load_config(ch) await self._client.load_config(ch)
self.info_box_trigger.emit( self.info_box_trigger.emit(
"Config loaded", f"Channel {ch} Config has been loaded from flash." "Settings loaded", f"Channel {ch} Settings has been loaded from flash."
) )
async def dfu(self): async def dfu(self):

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

@ -6,40 +6,11 @@ from pyqtgraph.parametertree import (
) )
class MutexParameter(pTypes.ListParameter): def set_tree_label_tips(tree):
""" for item in tree.listAllItems():
Mutually exclusive parameter where only one of its children is visible at a time, list selectable. p = item.param
if "tip" in p.opts:
The ordering of the list items determines which children will be visible. item.setToolTip(0, p.opts["tip"])
"""
def __init__(self, **opts):
super().__init__(**opts)
self.sigValueChanged.connect(self.show_chosen_child)
self.sigValueChanged.emit(self, self.opts["value"])
def _get_param_from_value(self, value):
if isinstance(self.opts["limits"], dict):
values_list = list(self.opts["limits"].values())
else:
values_list = self.opts["limits"]
return self.children()[values_list.index(value)]
@pyqtSlot(object, object)
def show_chosen_child(self, value):
for param in self.children():
param.hide()
child_to_show = self._get_param_from_value(value.value())
child_to_show.show()
if child_to_show.opts.get("triggerOnShow", None):
child_to_show.sigValueChanged.emit(child_to_show, child_to_show.value())
registerParameterType("mutex", MutexParameter)
class CtrlPanel(QObject): class CtrlPanel(QObject):
@ -58,29 +29,40 @@ class CtrlPanel(QObject):
self.trees_ui = trees_ui self.trees_ui = trees_ui
self.NUM_CHANNELS = len(trees_ui) self.NUM_CHANNELS = len(trees_ui)
self.THERMOSTAT_PARAMETERS = [param_tree for i in range(self.NUM_CHANNELS)]
self.params = [ self.params = [
Parameter.create( Parameter.create(
name=f"Thermostat Channel {ch} Parameters", name=f"Thermostat Channel {ch} Parameters",
type="group", type="group",
value=ch, value=ch,
children=self.THERMOSTAT_PARAMETERS[ch], children=param_tree,
) )
for ch in range(self.NUM_CHANNELS) for ch in range(self.NUM_CHANNELS)
] ]
for i, param in enumerate(self.params): for ch, tree in enumerate(self.trees_ui):
param.channel = i
for i, tree in enumerate(self.trees_ui):
tree.setHeaderHidden(True) tree.setHeaderHidden(True)
tree.setParameters(self.params[i], showTop=False) tree.setParameters(self.params[ch], showTop=False)
self.params[i].setValue = self._setValue
self.params[i].sigTreeStateChanged.connect(sigTreeStateChanged_handle)
for handle in sigActivated_handles[i]: set_tree_label_tips(tree)
self.params[i].child(*handle[0]).sigActivated.connect(handle[1])
for ch, param in enumerate(self.params):
self.params[ch].setValue = self._setValue
param.sigTreeStateChanged.connect(sigTreeStateChanged_handle)
for handle in sigActivated_handles[ch]:
param.child(*handle[0]).sigActivated.connect(handle[1])
param.child("output", "control_method").sigValueChanged.connect(
lambda param, value: param.child("i_set").setWritable(
value == "constant_current"
)
)
param.child("output", "control_method").sigValueChanged.connect(
lambda param, value: param.child("target").show(
value == "temperature_pid"
)
)
def _setValue(self, value, blockSignal=None): def _setValue(self, value, blockSignal=None):
""" """
@ -116,23 +98,23 @@ class CtrlPanel(QObject):
for settings in pid_settings: for settings in pid_settings:
channel = settings["channel"] channel = settings["channel"]
with QSignalBlocker(self.params[channel]): with QSignalBlocker(self.params[channel]):
self.params[channel].child("PID Config", "Kp").setValue( self.params[channel].child("pid", "kp").setValue(
settings["parameters"]["kp"] settings["parameters"]["kp"]
) )
self.params[channel].child("PID Config", "Ki").setValue( self.params[channel].child("pid", "ki").setValue(
settings["parameters"]["ki"] settings["parameters"]["ki"]
) )
self.params[channel].child("PID Config", "Kd").setValue( self.params[channel].child("pid", "kd").setValue(
settings["parameters"]["kd"] settings["parameters"]["kd"]
) )
self.params[channel].child( self.params[channel].child(
"PID Config", "PID Output Clamping", "Minimum" "pid", "pid_output_clamping", "output_min"
).setValue(settings["parameters"]["output_min"] * 1000) ).setValue(settings["parameters"]["output_min"] * 1000)
self.params[channel].child( self.params[channel].child(
"PID Config", "PID Output Clamping", "Maximum" "pid", "pid_output_clamping", "output_max"
).setValue(settings["parameters"]["output_max"] * 1000) ).setValue(settings["parameters"]["output_max"] * 1000)
self.params[channel].child( self.params[channel].child(
"Output Config", "Control Method", "Set Temperature" "output", "control_method", "target"
).setValue(settings["target"]) ).setValue(settings["target"])
@pyqtSlot("QVariantList") @pyqtSlot("QVariantList")
@ -140,19 +122,19 @@ class CtrlPanel(QObject):
for settings in report_data: for settings in report_data:
channel = settings["channel"] channel = settings["channel"]
with QSignalBlocker(self.params[channel]): with QSignalBlocker(self.params[channel]):
self.params[channel].child("Output Config", "Control Method").setValue( self.params[channel].child("output", "control_method").setValue(
"Temperature PID" if settings["pid_engaged"] else "Constant Current" "temperature_pid" if settings["pid_engaged"] else "constant_current"
) )
self.params[channel].child( self.params[channel].child(
"Output Config", "Control Method", "Set Current" "output", "control_method", "i_set"
).setValue(settings["i_set"] * 1000) ).setValue(settings["i_set"] * 1000)
if settings["temperature"] is not None: if settings["temperature"] is not None:
self.params[channel].child("Temperature").setValue( self.params[channel].child("temperature").setValue(
settings["temperature"] settings["temperature"]
) )
if settings["tec_i"] is not None: if settings["tec_i"] is not None:
self.params[channel].child("Current through TEC").setValue( self.params[channel].child("tec_i").setValue(
settings["tec_i"] * 1000 settings["tec_i"]
) )
@pyqtSlot("QVariantList") @pyqtSlot("QVariantList")
@ -160,13 +142,13 @@ class CtrlPanel(QObject):
for sh_param in sh_data: for sh_param in sh_data:
channel = sh_param["channel"] channel = sh_param["channel"]
with QSignalBlocker(self.params[channel]): with QSignalBlocker(self.params[channel]):
self.params[channel].child("Thermistor Config", "T₀").setValue( self.params[channel].child("thermistor", "t0").setValue(
sh_param["params"]["t0"] - 273.15 sh_param["params"]["t0"] - 273.15
) )
self.params[channel].child("Thermistor Config", "R₀").setValue( self.params[channel].child("thermistor", "r0").setValue(
sh_param["params"]["r0"] sh_param["params"]["r0"]
) )
self.params[channel].child("Thermistor Config", "B").setValue( self.params[channel].child("thermistor", "b").setValue(
sh_param["params"]["b"] sh_param["params"]["b"]
) )
@ -177,15 +159,15 @@ class CtrlPanel(QObject):
for pwm_params in pwm_data: for pwm_params in pwm_data:
channel = pwm_params["channel"] channel = pwm_params["channel"]
with QSignalBlocker(self.params[channel]): with QSignalBlocker(self.params[channel]):
self.params[channel].child( self.params[channel].child("output", "limits", "max_v").setValue(
"Output Config", "Limits", "Max Voltage Difference" pwm_params["max_v"]["value"]
).setValue(pwm_params["max_v"]["value"]) )
self.params[channel].child( self.params[channel].child("output", "limits", "max_i_pos").setValue(
"Output Config", "Limits", "Max Cooling Current" pwm_params["max_i_pos"]["value"] * 1000
).setValue(pwm_params["max_i_pos"]["value"] * 1000) )
self.params[channel].child( self.params[channel].child("output", "limits", "max_i_neg").setValue(
"Output Config", "Limits", "Max Heating Current" pwm_params["max_i_neg"]["value"] * 1000
).setValue(pwm_params["max_i_neg"]["value"] * 1000) )
for limit in "max_i_pos", "max_i_neg", "max_v": for limit in "max_i_pos", "max_i_neg", "max_v":
if pwm_params[limit]["value"] == 0.0: if pwm_params[limit]["value"] == 0.0:
@ -197,6 +179,6 @@ class CtrlPanel(QObject):
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]):
self.params[channel].child( self.params[channel].child("thermistor", "rate").setValue(
"Thermistor Config", "Postfilter Rate" postfilter_params["rate"]
).setValue(postfilter_params["rate"]) )

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

@ -1,31 +1,39 @@
{ {
"ctrl_panel":[ "ctrl_panel": [
{ {
"name":"Temperature", "name": "temperature",
"type":"float", "title": "Temperature",
"format":"{value:.4f} °C", "type": "float",
"readonly":true "format": "{value:.4f} °C",
"readonly": true,
"tip": "The measured temperature at the thermistor"
}, },
{ {
"name":"Current through TEC", "name": "tec_i",
"type":"float", "title": "Current through TEC",
"suffix":"mA", "type": "float",
"decimals":6, "siPrefix": true,
"readonly":true "suffix": "A",
"decimals": 6,
"readonly": true,
"tip": "The measured current through the TEC"
}, },
{ {
"name":"Output Config", "name": "output",
"expanded":true, "title": "Output Settings",
"type":"group", "expanded": true,
"children":[ "type": "group",
"tip": "Settings of the output to the TEC",
"children": [
{ {
"name":"Control Method", "name": "control_method",
"type":"mutex", "title": "Control Method",
"limits":[ "type": "list",
"Constant Current", "limits": {
"Temperature PID" "Constant Current": "constant_current",
], "Temperature PID": "temperature_pid"
"activaters":[ },
"activaters": [
null, null,
[ [
"pwm", "pwm",
@ -33,333 +41,390 @@
"pid" "pid"
] ]
], ],
"children":[ "tip": "Select control method of output",
"children": [
{ {
"name":"Set Current", "name": "i_set",
"type":"float", "title": "Set Current (mA)",
"value":0, "type": "float",
"step":100, "value": 0,
"limits":[ "step": 100,
"limits": [
-2000, -2000,
2000 2000
], ],
"triggerOnShow":true, "triggerOnShow": true,
"decimals":6, "decimals": 6,
"suffix":"mA", "compactHeight": false,
"param":[ "param": [
"pwm", "pwm",
"ch", "ch",
"i_set" "i_set"
], ],
"lock":false "tip": "The set current through TEC",
"lock": false
}, },
{ {
"name":"Set Temperature", "name": "target",
"type":"float", "title": "Setpoint (°C)",
"value":25, "type": "float",
"step":0.1, "visible": false,
"limits":[ "value": 25,
"step": 0.1,
"limits": [
-273, -273,
300 300
], ],
"format":"{value:.4f} °C", "format": "{value:.4f}",
"param":[ "compactHeight": false,
"param": [
"pid", "pid",
"ch", "ch",
"target" "target"
], ],
"lock":false "tip": "The temperature setpoint of the TEC",
"lock": false
} }
] ]
}, },
{ {
"name":"Limits", "name": "limits",
"expanded":true, "title": "Limits",
"type":"group", "expanded": true,
"children":[ "type": "group",
"tip": "The limits of output, with the polarity at the front panel as reference",
"children": [
{ {
"name":"Max Cooling Current", "name": "max_i_pos",
"type":"float", "title": "Max Cooling Current (mA)",
"value":0, "type": "float",
"step":100, "value": 0,
"decimals":6, "step": 100,
"limits":[ "decimals": 6,
"compactHeight": false,
"limits": [
0, 0,
2000 2000
], ],
"suffix":"mA", "param": [
"param":[
"pwm", "pwm",
"ch", "ch",
"max_i_pos" "max_i_pos"
], ],
"lock":false "tip": "The maximum cooling (+ve) current through the output pins",
"lock": false
}, },
{ {
"name":"Max Heating Current", "name": "max_i_neg",
"type":"float", "title": "Max Heating Current (mA)",
"value":0, "type": "float",
"step":100, "value": 0,
"decimals":6, "step": 100,
"limits":[ "decimals": 6,
"compactHeight": false,
"limits": [
0, 0,
2000 2000
], ],
"suffix":"mA", "param": [
"param":[
"pwm", "pwm",
"ch", "ch",
"max_i_neg" "max_i_neg"
], ],
"lock":false "tip": "The maximum heating (-ve) current through the output pins",
"lock": false
}, },
{ {
"name":"Max Voltage Difference", "name": "max_v",
"type":"float", "title": "Max Absolute Voltage (V)",
"value":0, "type": "float",
"step":0.1, "value": 0,
"limits":[ "step": 0.1,
"limits": [
0, 0,
5 4
], ],
"siPrefix":true, "siPrefix": true,
"suffix":"V", "compactHeight": false,
"param":[ "param": [
"pwm", "pwm",
"ch", "ch",
"max_v" "max_v"
], ],
"lock":false "tip": "The maximum voltage (in both directions) across the output pins",
"lock": false
} }
] ]
} }
] ]
}, },
{ {
"name":"Thermistor Config", "name": "thermistor",
"expanded":true, "title": "Thermistor Settings",
"type":"group", "expanded": true,
"children":[ "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",
"children": [
{ {
"name":"T₀", "name": "t0",
"type":"float", "title": "T₀ (°C)",
"value":25, "type": "float",
"step":0.1, "value": 25,
"limits":[ "step": 0.1,
"limits": [
-100, -100,
100 100
], ],
"format":"{value:.4f} °C", "format": "{value:.4f}",
"param":[ "compactHeight": false,
"param": [
"s-h", "s-h",
"ch", "ch",
"t0" "t0"
], ],
"lock":false "tip": "The base temperature",
"lock": false
}, },
{ {
"name":"R₀", "name": "r0",
"type":"float", "title": "R₀ (Ω)",
"value":10000, "type": "float",
"step":1, "value": 10000,
"siPrefix":true, "step": 1,
"suffix":"Ω", "siPrefix": true,
"param":[ "compactHeight": false,
"param": [
"s-h", "s-h",
"ch", "ch",
"r0" "r0"
], ],
"lock":false "tip": "The resistance of the thermistor at base temperature T₀",
"lock": false
}, },
{ {
"name":"B", "name": "b",
"type":"float", "title": "B (K)",
"value":3950, "type": "float",
"step":1, "value": 3950,
"suffix":"K", "step": 1,
"decimals":4, "decimals": 4,
"param":[ "compactHeight": false,
"param": [
"s-h", "s-h",
"ch", "ch",
"b" "b"
], ],
"lock":false "tip": "The Beta Parameter",
"lock": false
}, },
{ {
"name":"Postfilter Rate", "name": "rate",
"type":"list", "title": "50/60 Hz filter rejection",
"value":16.67, "type": "list",
"param":[ "value": 16.67,
"param": [
"postfilter", "postfilter",
"ch", "ch",
"rate" "rate"
], ],
"limits":{ "limits": {
"Off":null, "Off": null,
"16.67 Hz":16.67, "47 dB @ 10.41 Hz": 27.0,
"20 Hz":20.0, "62 dB @ 9.1 Hz": 21.25,
"21.25 Hz":21.25, "86 dB @ 10 Hz": 20.0,
"27 Hz":27.0 "92 dB @ 8.4 Hz": 16.67
}, },
"lock":false "tip": "Trade off effective sampling rate and rejection of (50±1) Hz and (60±1) Hz",
"lock": false
} }
] ]
}, },
{ {
"name":"PID Config", "name": "pid",
"expanded":true, "title": "PID Settings",
"type":"group", "expanded": true,
"children":[ "type": "group",
"tip": "Settings of PID parameters and clamping",
"children": [
{ {
"name":"Kp", "name": "kp",
"type":"float", "title": "Kp",
"step":0.1, "type": "float",
"suffix":"", "step": 0.1,
"param":[ "suffix": "",
"compactHeight": false,
"param": [
"pid", "pid",
"ch", "ch",
"kp" "kp"
], ],
"lock":false "tip": "Proportional gain",
"lock": false
}, },
{ {
"name":"Ki", "name": "ki",
"type":"float", "title": "Ki (Hz)",
"step":0.1, "type": "float",
"suffix":"Hz", "step": 0.1,
"param":[ "compactHeight": false,
"param": [
"pid", "pid",
"ch", "ch",
"ki" "ki"
], ],
"lock":false "tip": "Integral gain",
"lock": false
}, },
{ {
"name":"Kd", "name": "kd",
"type":"float", "title": "Kd (s)",
"step":0.1, "type": "float",
"suffix":"s", "step": 0.1,
"param":[ "compactHeight": false,
"param": [
"pid", "pid",
"ch", "ch",
"kd" "kd"
], ],
"lock":false "tip": "Differential gain",
"lock": false
}, },
{ {
"name":"PID Output Clamping", "name": "pid_output_clamping",
"expanded":true, "title": "PID Output Clamping",
"type":"group", "expanded": true,
"children":[ "type": "group",
"tip": "Clamps PID outputs to specified range\nCould be different than output limits",
"children": [
{ {
"name":"Minimum", "name": "output_min",
"type":"float", "title": "Minimum (mA)",
"step":100, "type": "float",
"limits":[ "step": 100,
"limits": [
-2000, -2000,
2000 2000
], ],
"decimals":6, "decimals": 6,
"suffix":"mA", "compactHeight": false,
"param":[ "param": [
"pid", "pid",
"ch", "ch",
"output_min" "output_min"
], ],
"lock":false "tip": "Minimum PID output",
"lock": false
}, },
{ {
"name":"Maximum", "name": "output_max",
"type":"float", "title": "Maximum (mA)",
"step":100, "type": "float",
"limits":[ "step": 100,
"limits": [
-2000, -2000,
2000 2000
], ],
"decimals":6, "decimals": 6,
"suffix":"mA", "compactHeight": false,
"param":[ "param": [
"pid", "pid",
"ch", "ch",
"output_max" "output_max"
], ],
"lock":false "tip": "Maximum PID output",
"lock": false
} }
] ]
}, },
{ {
"name":"PID Auto Tune", "name": "pid_autotune",
"expanded":false, "title": "PID Autotune",
"type":"group", "expanded": false,
"children":[ "type": "group",
"tip": "Automatically tune PID parameters",
"children": [
{ {
"name":"Target Temperature", "name": "target_temp",
"type":"float", "title": "Target Temperature (°C)",
"value":20, "type": "float",
"step":0.1, "value": 20,
"format":"{value:.4f} °C", "step": 0.1,
"pid_autotune":[ "format": "{value:.4f}",
"compactHeight": false,
"pid_autotune": [
"target_temp", "target_temp",
"ch" "ch"
] ],
"tip": "The target temperature to autotune for"
}, },
{ {
"name":"Test Current", "name": "test_current",
"type":"float", "title": "Test Current (mA)",
"value":0, "type": "float",
"decimals":6, "value": 0,
"step":100, "decimals": 6,
"limits":[ "compactHeight": false,
-2000, "step": 100,
"limits": [
0,
2000 2000
], ],
"suffix":"mA", "pid_autotune": [
"pid_autotune":[
"test_current", "test_current",
"ch" "ch"
] ],
"tip": "The testing current when autotuning"
}, },
{ {
"name":"Temperature Swing", "name": "temp_swing",
"type":"float", "title": "Temperature Swing (°C)",
"value":1.5, "type": "float",
"step":0.1, "value": 1.5,
"prefix":"±", "step": 0.1,
"format":"{value:.4f} °C", "prefix": "±",
"pid_autotune":[ "format": "{value:.4f}",
"compactHeight": false,
"pid_autotune": [
"temp_swing", "temp_swing",
"ch" "ch"
] ],
"tip": "The temperature swing around the target"
}, },
{ {
"name":"Lookback", "name": "lookback",
"type":"float", "title": "Lookback (s)",
"value":3.0, "type": "float",
"step":0.1, "value": 3.0,
"format":"{value:.4f} s", "step": 0.1,
"pid_autotune":[ "format": "{value:.4f}",
"compactHeight": false,
"pid_autotune": [
"lookback", "lookback",
"ch" "ch"
] ],
"tip": "Amount of time referenced for tuning"
}, },
{ {
"name":"Run", "name": "run_pid",
"type":"action", "title": "Run",
"tip":"Run" "type": "action",
"tip": "Run PID Autotune with above settings"
} }
] ]
} }
] ]
}, },
{ {
"name":"Save to flash", "name": "save",
"type":"action", "title": "Save to flash",
"tip":"Save config to thermostat, applies on reset" "type": "action",
"tip": "Save settings to thermostat, applies on reset"
}, },
{ {
"name":"Load from flash", "name": "load",
"type":"action", "title": "Load from flash",
"tip":"Load config from flash" "type": "action",
"tip": "Load settings from thermostat"
} }
] ]
} }

30
pytec/tec_qt.py
View File

@ -78,11 +78,11 @@ class MainWindow(QtWidgets.QMainWindow):
param_tree_sigActivated_handles = [ param_tree_sigActivated_handles = [
[ [
[["Save to flash"], partial(self.thermostat.save_cfg, ch)], [["save"], partial(self.thermostat.save_cfg, ch)],
[["Load from flash"], partial(self.thermostat.load_cfg, ch)], [["load"], partial(self.thermostat.load_cfg, ch)],
[ [
["PID Config", "PID Auto Tune", "Run"], ["pid", "pid_autotune", "run_pid"],
partial(self.pid_auto_tune_request, ch), partial(self.pid_autotune_request, ch),
], ],
] ]
for ch in range(self.NUM_CHANNELS) for ch in range(self.NUM_CHANNELS)
@ -262,19 +262,19 @@ class MainWindow(QtWidgets.QMainWindow):
@asyncSlot(object, object) @asyncSlot(object, object)
async def send_command(self, param, changes): async def send_command(self, param, changes):
"""Translates parameter tree changes into thermostat set_param calls""" """Translates parameter tree changes into thermostat set_param calls"""
ch = param.channel ch = param.value()
for inner_param, change, data in changes: for inner_param, change, data in changes:
if change == "value": if change == "value":
if inner_param.opts.get("param", None) is not None: if inner_param.opts.get("param", None) is not None:
if inner_param.opts.get("suffix", None) == "mA": if inner_param.opts.get("title", None).endswith(" (mA)"):
data /= 1000 # Given in mA data /= 1000 # Given in mA
thermostat_param = inner_param.opts["param"] thermostat_param = inner_param.opts["param"]
if thermostat_param[1] == "ch": if thermostat_param[1] == "ch":
thermostat_param[1] = ch thermostat_param[1] = ch
if inner_param.name() == "Postfilter Rate" and data is None: if inner_param.name() == "rate" and data is None:
set_param_args = (*thermostat_param[:2], "off") set_param_args = (*thermostat_param[:2], "off")
else: else:
set_param_args = (*thermostat_param, data) set_param_args = (*thermostat_param, data)
@ -283,14 +283,14 @@ class MainWindow(QtWidgets.QMainWindow):
param.child(*param.childPath(inner_param)).setOpts(lock=False) param.child(*param.childPath(inner_param)).setOpts(lock=False)
if inner_param.opts.get("pid_autotune", None) is not None: if inner_param.opts.get("pid_autotune", None) is not None:
auto_tuner_param = inner_param.opts["pid_autotune"][0] autotuner_param = inner_param.opts["pid_autotune"][0]
if inner_param.opts["pid_autotune"][1] != "ch": if inner_param.opts["pid_autotune"][1] != "ch":
ch = inner_param.opts["pid_autotune"][1] ch = inner_param.opts["pid_autotune"][1]
self.autotuners.set_params(auto_tuner_param, ch, data) self.autotuners.set_params(autotuner_param, ch, data)
if inner_param.opts.get("activaters", None) is not None: if inner_param.opts.get("activaters", None) is not None:
activater = inner_param.opts["activaters"][ activater = inner_param.opts["activaters"][
inner_param.opts["limits"].index(data) inner_param.reverse[0].index(data) # ListParameter.reverse = list of codename values
] ]
if activater is not None: if activater is not None:
if activater[1] == "ch": if activater[1] == "ch":
@ -298,7 +298,7 @@ class MainWindow(QtWidgets.QMainWindow):
await self.client.set_param(*activater) await self.client.set_param(*activater)
@asyncSlot() @asyncSlot()
async def pid_auto_tune_request(self, ch=0): async def pid_autotune_request(self, ch=0):
match self.autotuners.get_state(ch): match self.autotuners.get_state(ch):
case PIDAutotuneState.STATE_OFF | PIDAutotuneState.STATE_FAILED: case PIDAutotuneState.STATE_OFF | PIDAutotuneState.STATE_FAILED:
self.autotuners.load_params_and_set_ready(ch) self.autotuners.load_params_and_set_ready(ch)
@ -315,24 +315,24 @@ class MainWindow(QtWidgets.QMainWindow):
match self.autotuners.get_state(ch): match self.autotuners.get_state(ch):
case PIDAutotuneState.STATE_OFF: case PIDAutotuneState.STATE_OFF:
self.ctrl_panel_view.change_params_title( self.ctrl_panel_view.change_params_title(
ch, ("PID Config", "PID Auto Tune", "Run"), "Run" ch, ("pid", "pid_autotune", "run_pid"), "Run"
) )
case PIDAutotuneState.STATE_READY | PIDAutotuneState.STATE_RELAY_STEP_UP | PIDAutotuneState.STATE_RELAY_STEP_DOWN: case PIDAutotuneState.STATE_READY | PIDAutotuneState.STATE_RELAY_STEP_UP | PIDAutotuneState.STATE_RELAY_STEP_DOWN:
self.ctrl_panel_view.change_params_title( self.ctrl_panel_view.change_params_title(
ch, ("PID Config", "PID Auto Tune", "Run"), "Stop" ch, ("pid", "pid_autotune", "run_pid"), "Stop"
) )
ch_tuning.append(ch) ch_tuning.append(ch)
case PIDAutotuneState.STATE_SUCCEEDED: case PIDAutotuneState.STATE_SUCCEEDED:
self.info_box.display_info_box( self.info_box.display_info_box(
"PID Autotune Success", "PID Autotune Success",
f"Channel {ch} PID Config has been loaded to Thermostat. Regulating temperature.", f"Channel {ch} PID Settings has been loaded to Thermostat. Regulating temperature.",
) )
self.info_box.show() self.info_box.show()
case PIDAutotuneState.STATE_FAILED: case PIDAutotuneState.STATE_FAILED:
self.info_box.display_info_box( self.info_box.display_info_box(
"PID Autotune Failed", f"Channel {ch} PID Autotune is failed." "PID Autotune Failed", f"Channel {ch} PID Autotune has failed."
) )
self.info_box.show() self.info_box.show()