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,125 +4,131 @@ 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()
-    def __init__(self, conv=lambda x: x):
+    target_temperature = tec.get_pid()[0]['target']
-        self.conv = conv
+    print("Channel 0 target temperature: {:.3f}".format(target_temperature))
-        self.x_data = []
-        self.y_data = []
 
-    def append(self, x, y):
+    class Series:
-        self.x_data.append(x)
+        def __init__(self, conv=lambda x: x):
-        self.y_data.append(self.conv(y))
+            self.conv = conv
+            self.x_data = []
+            self.y_data = []
 
-    def clip(self, min_x):
+        def append(self, x, y):
-        drop = 0
+            self.x_data.append(x)
-        while drop < len(self.x_data) and self.x_data[drop] < min_x:
+            self.y_data.append(self.conv(y))
-            drop += 1
+
-        self.x_data = self.x_data[drop:]
+        def clip(self, min_x):
-        self.y_data = self.y_data[drop:]
+            drop = 0
+            while drop < len(self.x_data) and self.x_data[drop] < min_x:
+                drop += 1
+            self.x_data = self.x_data[drop:]
+            self.y_data = self.y_data[drop:]
+
+    series = {
+        # 'adc': Series(),
+        # 'sens': Series(lambda x: x * 0.0001),
+        'temperature': Series(),
+        # 'i_set': Series(),
+        'pid_output': Series(),
+        # 'vref': Series(),
+        # 'dac_value': Series(),
+        # 'dac_feedback': Series(),
+        # 'i_tec': Series(),
+        'tec_i': Series(),
+        'tec_u_meas': Series(),
+        # 'interval': Series(),
+    }
+    series_lock = Lock()
+
+    quit = False
+
+    def recv_data(tec):
+        global last_packet_time
+        for data in tec.report_mode():
+            ch0 = data[0]
+            series_lock.acquire()
+            try:
+                for k, s in series.items():
+                    if k in ch0:
+                        v = ch0[k]
+                        if type(v) is float:
+                            s.append(ch0['time'], v)
+            finally:
+                series_lock.release()
+
+            if quit:
+                break
+
+    thread = Thread(target=recv_data, args=(tec,))
+    thread.start()
+
+    fig, ax = plt.subplots()
+
+    for k, s in series.items():
+        s.plot, = ax.plot([], [], label=k)
+    legend = ax.legend()
+
+    def animate(i):
+        min_x, max_x, min_y, max_y = None, None, None, None
         
-series = {
-    # 'adc': Series(),
-    # 'sens': Series(lambda x: x * 0.0001),
-    'temperature': Series(),
-    # 'i_set': Series(),
-    'pid_output': Series(),
-    # 'vref': Series(),
-    # 'dac_value': Series(),
-    # 'dac_feedback': Series(),
-    # 'i_tec': Series(),
-    'tec_i': Series(),
-    'tec_u_meas': Series(),
-    # 'interval': Series(),
-}
-series_lock = Lock()
-
-quit = False
-
-def recv_data(tec):
-    global last_packet_time
-    for data in tec.report_mode():
-        ch0 = data[0]
         series_lock.acquire()
         try:
             for k, s in series.items():
-                if k in ch0:
+                s.plot.set_data(s.x_data, s.y_data)
-                    v = ch0[k]
+                if len(s.y_data) > 0:
-                    if type(v) is float:
+                    s.plot.set_label("{}: {:.3f}".format(k, s.y_data[-1]))
-                        s.append(ch0['time'], v)
+
+                if len(s.x_data) > 0:
+                    min_x_ = min(s.x_data)
+                    if min_x is None:
+                        min_x = min_x_
+                    else:
+                        min_x = min(min_x, min_x_)
+                    max_x_ = max(s.x_data)
+                    if max_x is None:
+                        max_x = max_x_
+                    else:
+                        max_x = max(max_x, max_x_)
+                if len(s.y_data) > 0:
+                    min_y_ = min(s.y_data)
+                    if min_y is None:
+                        min_y = min_y_
+                    else:
+                        min_y = min(min_y, min_y_)
+                    max_y_ = max(s.y_data)
+                    if max_y is None:
+                        max_y = max_y_
+                    else:
+                        max_y = max(max_y, max_y_)
+
+            if min_x and max_x - TIME_WINDOW > min_x:
+                for s in series.values():
+                    s.clip(max_x - TIME_WINDOW)
         finally:
             series_lock.release()
 
-        if quit:
+        if min_x != max_x:
-            break
+            ax.set_xlim(min_x, max_x)
+        if min_y != max_y:
+            margin_y = 0.01 * (max_y - min_y)
+            ax.set_ylim(min_y - margin_y, max_y + margin_y)
 
-thread = Thread(target=recv_data, args=(tec,))
+        nonlocal legend
-thread.start()
+        legend.remove()
+        legend = ax.legend()
 
-fig, ax = plt.subplots()
+    ani = animation.FuncAnimation(
+        fig, animate, interval=1, blit=False, save_count=50)
 
-for k, s in series.items():
+    plt.show()
-    s.plot, = ax.plot([], [], label=k)
+    quit = True
-legend = ax.legend()
+    thread.join()
 
-def animate(i):
-    min_x, max_x, min_y, max_y = None, None, None, None
-    
-    series_lock.acquire()
-    try:
-        for k, s in series.items():
-            s.plot.set_data(s.x_data, s.y_data)
-            if len(s.y_data) > 0:
-                s.plot.set_label("{}: {:.3f}".format(k, s.y_data[-1]))
 
-            if len(s.x_data) > 0:
+if __name__ == "__main__":
-                min_x_ = min(s.x_data)
+    main()
-                if min_x is None:
-                    min_x = min_x_
-                else:
-                    min_x = min(min_x, min_x_)
-                max_x_ = max(s.x_data)
-                if max_x is None:
-                    max_x = max_x_
-                else:
-                    max_x = max(max_x, max_x_)
-            if len(s.y_data) > 0:
-                min_y_ = min(s.y_data)
-                if min_y is None:
-                    min_y = min_y_
-                else:
-                    min_y = min(min_y, min_y_)
-                max_y_ = max(s.y_data)
-                if max_y is None:
-                    max_y = max_y_
-                else:
-                    max_y = max(max_y, max_y_)
-
-        if min_x and max_x - TIME_WINDOW > min_x:
-            for s in series.values():
-                s.clip(max_x - TIME_WINDOW)
-    finally:
-        series_lock.release()
-
-    if min_x != max_x:
-        ax.set_xlim(min_x, max_x)
-    if min_y != max_y:
-        margin_y = 0.01 * (max_y - min_y)
-        ax.set_ylim(min_y - margin_y, max_y + margin_y)
-
-    global legend
-    legend.remove()
-    legend = ax.legend()
-
-ani = animation.FuncAnimation(
-    fig, animate, interval=1, blit=False, save_count=50)
-
-plt.show()
-quit = True
-thread.join()

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"],
 )