pytec: Add thermostat_{autotune,plot} entry pts

Forms an interface to run the `plot.py` and `autotune.py` scripts.

flake.nix

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

pytec/example.py

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

pytec/plot.py

@@ -4,13 +4,15 @@ import matplotlib.animation as animation
 from threading import Thread, Lock
 from pytec.client import Client
 
-TIME_WINDOW = 300.0
 
-tec = Client()
+def main():
-target_temperature = tec.get_pid()[0]['target']
+    TIME_WINDOW = 300.0
-print("Channel 0 target temperature: {:.3f}".format(target_temperature))
 
-class Series:
+    tec = Client()
+    target_temperature = tec.get_pid()[0]['target']
+    print("Channel 0 target temperature: {:.3f}".format(target_temperature))
+
+    class Series:
         def __init__(self, conv=lambda x: x):
             self.conv = conv
             self.x_data = []
@@ -27,7 +29,7 @@ class Series:
             self.x_data = self.x_data[drop:]
             self.y_data = self.y_data[drop:]
 
-series = {
+    series = {
         # 'adc': Series(),
         # 'sens': Series(lambda x: x * 0.0001),
         'temperature': Series(),
@@ -40,12 +42,12 @@ series = {
         'tec_i': Series(),
         'tec_u_meas': Series(),
         # 'interval': Series(),
-}
+    }
-series_lock = Lock()
+    series_lock = Lock()
 
-quit = False
+    quit = False
 
-def recv_data(tec):
+    def recv_data(tec):
         global last_packet_time
         for data in tec.report_mode():
             ch0 = data[0]
@@ -62,16 +64,16 @@ def recv_data(tec):
             if quit:
                 break
 
-thread = Thread(target=recv_data, args=(tec,))
+    thread = Thread(target=recv_data, args=(tec,))
-thread.start()
+    thread.start()
 
-fig, ax = plt.subplots()
+    fig, ax = plt.subplots()
 
-for k, s in series.items():
+    for k, s in series.items():
         s.plot, = ax.plot([], [], label=k)
-legend = ax.legend()
+    legend = ax.legend()
 
-def animate(i):
+    def animate(i):
         min_x, max_x, min_y, max_y = None, None, None, None
         
         series_lock.acquire()
@@ -116,13 +118,17 @@ def animate(i):
             margin_y = 0.01 * (max_y - min_y)
             ax.set_ylim(min_y - margin_y, max_y + margin_y)
 
-    global legend
+        nonlocal legend
         legend.remove()
         legend = ax.legend()
 
-ani = animation.FuncAnimation(
+    ani = animation.FuncAnimation(
         fig, animate, interval=1, blit=False, save_count=50)
 
-plt.show()
+    plt.show()
-quit = True
+    quit = True
-thread.join()
+    thread.join()
+
+
+if __name__ == "__main__":
+    main()

pytec/pytec/client.py

@@ -1,7 +1,7 @@
 import socket
 import json
 import logging
-import time
+
 
 class CommandError(Exception):
     pass
@@ -147,36 +147,6 @@ class Client:
         """Get Thermostat hardware revision"""
         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=""):
         """Set configuration parameters
 

pytec/setup.py

@@ -9,4 +9,11 @@ setup(
     license="GPLv3",
     install_requires=["setuptools"],
     packages=find_packages(),
+    entry_points={
+        "gui_scripts": [
+            "thermostat_autotune = autotune:main",
+            "thermostat_plot = plot:main",
+        ]
+    },
+    py_modules=["autotune", "plot"],
 )