diff --git a/pytec/pytec/gui/view/param_tree.json b/pytec/pytec/gui/view/param_tree.json index 64b9839..3beb9d3 100644 --- a/pytec/pytec/gui/view/param_tree.json +++ b/pytec/pytec/gui/view/param_tree.json @@ -37,7 +37,7 @@ null, [ "pwm", - "ch", + "$ch", "pid" ] ], @@ -58,7 +58,7 @@ "compactHeight":false, "param":[ "pwm", - "ch", + "$ch", "i_set" ], "tip": "Set current through output", @@ -78,7 +78,7 @@ "compactHeight":false, "param":[ "pid", - "ch", + "$ch", "target" ], "tip": "Set target temperature", @@ -106,7 +106,7 @@ ], "param":[ "pwm", - "ch", + "$ch", "max_i_pos" ], "tip": "The maximum cooling (+ve) current through the output pins", @@ -126,7 +126,7 @@ ], "param":[ "pwm", - "ch", + "$ch", "max_i_neg" ], "tip": "The maximum heating (-ve) current through the output pins", @@ -146,7 +146,7 @@ "compactHeight":false, "param":[ "pwm", - "ch", + "$ch", "max_v" ], "tip": "The maximum voltage across the output pins", @@ -177,7 +177,7 @@ "compactHeight":false, "param":[ "s-h", - "ch", + "$ch", "t0" ], "tip": "The origin temperature for the B-Parameter equation", @@ -193,7 +193,7 @@ "compactHeight":false, "param":[ "s-h", - "ch", + "$ch", "r0" ], "tip": "The origin resistance for the B-Parameter equation", @@ -209,7 +209,7 @@ "compactHeight":false, "param":[ "s-h", - "ch", + "$ch", "b" ], "tip": "The B-Parameter", @@ -222,7 +222,7 @@ "value":16.67, "param":[ "postfilter", - "ch", + "$ch", "rate" ], "limits":{ @@ -253,7 +253,7 @@ "compactHeight":false, "param":[ "pid", - "ch", + "$ch", "kp" ], "tip": "Proportional gain", @@ -268,7 +268,7 @@ "compactHeight":false, "param":[ "pid", - "ch", + "$ch", "ki" ], "tip": "Integral gain", @@ -283,7 +283,7 @@ "compactHeight":false, "param":[ "pid", - "ch", + "$ch", "kd" ], "tip": "Differential gain", @@ -309,7 +309,7 @@ "compactHeight":false, "param":[ "pid", - "ch", + "$ch", "output_min" ], "tip": "Minimum PID output", @@ -328,7 +328,7 @@ "compactHeight":false, "param":[ "pid", - "ch", + "$ch", "output_max" ], "tip": "Maximum PID output", @@ -353,7 +353,7 @@ "compactHeight":false, "pid_autotune":[ "target_temp", - "ch" + "$ch" ], "tip": "The target temperature to autotune for" }, @@ -371,7 +371,7 @@ ], "pid_autotune":[ "test_current", - "ch" + "$ch" ], "tip": "The testing current when autotuning" }, @@ -386,7 +386,7 @@ "compactHeight":false, "pid_autotune":[ "temp_swing", - "ch" + "$ch" ], "tip": "The temperature swing around the target" }, @@ -400,7 +400,7 @@ "compactHeight":false, "pid_autotune":[ "lookback", - "ch" + "$ch" ], "tip": "Amount of time to lookback" }, diff --git a/pytec/tec_qt.py b/pytec/tec_qt.py index 248fe04..bfd39b0 100644 --- a/pytec/tec_qt.py +++ b/pytec/tec_qt.py @@ -271,7 +271,7 @@ class MainWindow(QtWidgets.QMainWindow): data /= 1000 # Given in mA thermostat_param = inner_param.opts["param"] - if thermostat_param[1] == "ch": + if thermostat_param[1] == "$ch": thermostat_param[1] = ch if inner_param.name() == "rate" and data is None: @@ -284,7 +284,7 @@ class MainWindow(QtWidgets.QMainWindow): if inner_param.opts.get("pid_autotune", None) is not None: auto_tuner_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] self.autotuners.set_params(auto_tuner_param, ch, data) @@ -293,7 +293,7 @@ class MainWindow(QtWidgets.QMainWindow): inner_param.reverse[0].index(data) # ListParameter.reverse = list of codename values ] if activater is not None: - if activater[1] == "ch": + if activater[1] == "$ch": activater[1] = ch await self.client.set_param(*activater)