Compare commits

..

4 Commits

Author SHA1 Message Date
1fc5f7d5ae pytec: Add thermostat_{autotune,plot} entry pts
Forms an interface to run the `plot.py` and `autotune.py` scripts.
2024-11-18 11:47:33 +08:00
c632a85ce8 pytec: plot.py: Add main function 2024-11-18 11:47:11 +08:00
9af86be674 pytec: Remove artificial report mode in client
Encourage polling usage instead, as shown in example.
2024-11-16 13:11:59 +08:00
eabc7f6a12 flake: Register the pytec Python package 2024-11-11 17:11:37 +08:00
4 changed files with 20 additions and 36 deletions

View File

@ -57,10 +57,22 @@
dontFixup = true; dontFixup = true;
auditable = false; auditable = false;
}; };
pytec = pkgs.python3Packages.buildPythonPackage {
pname = "pytec";
version = "0.0.0";
src = "${self}/pytec";
propagatedBuildInputs =
with pkgs.python3Packages; [
numpy
matplotlib
];
};
in in
{ {
packages.x86_64-linux = { packages.x86_64-linux = {
inherit thermostat; inherit thermostat pytec;
default = thermostat; default = thermostat;
}; };

View File

@ -1,3 +1,4 @@
import time
from pytec.client import Client from pytec.client import Client
tec = Client() #(host="localhost", port=6667) tec = Client() #(host="localhost", port=6667)
@ -7,5 +8,6 @@ print(tec.get_pid())
print(tec.get_output()) print(tec.get_output())
print(tec.get_postfilter()) print(tec.get_postfilter())
print(tec.get_b_parameter()) print(tec.get_b_parameter())
for data in tec.report_mode(): while True:
print(data) print(tec.get_report())
time.sleep(0.05)

View File

@ -1,7 +1,7 @@
import socket import socket
import json import json
import logging import logging
import time
class CommandError(Exception): class CommandError(Exception):
pass pass
@ -147,36 +147,6 @@ class Client:
"""Get Thermostat hardware revision""" """Get Thermostat hardware revision"""
return self._command("hwrev") return self._command("hwrev")
def report_mode(self):
"""Start reporting measurement values
Example of yielded data::
{'channel': 0,
'time': 2302524,
'adc': 0.6199188965423515,
'sens': 6138.519310282602,
'temperature': 36.87032392655527,
'pid_engaged': True,
'i_set': 2.0635816680889123,
'vref': 1.494,
'dac_value': 2.527790834044456,
'dac_feedback': 2.523,
'i_tec': 2.331,
'tec_i': 2.0925,
'tec_u_meas': 2.5340000000000003,
'pid_output': 2.067581958092247}
"""
while True:
self._socket.sendall("report\n".encode('utf-8'))
line = self._read_line()
if not line:
break
try:
yield json.loads(line)
except json.decoder.JSONDecodeError:
pass
time.sleep(0.05)
def set_param(self, topic, channel, field="", value=""): def set_param(self, topic, channel, field="", value=""):
"""Set configuration parameters """Set configuration parameters

View File

@ -11,8 +11,8 @@ setup(
packages=find_packages(), packages=find_packages(),
entry_points={ entry_points={
"gui_scripts": [ "gui_scripts": [
"autotune = autotune:main", "thermostat_autotune = autotune:main",
"plot = plot:main", "thermostat_plot = plot:main",
] ]
}, },
py_modules=["autotune", "plot"], py_modules=["autotune", "plot"],