flake.nix

@@ -62,7 +62,6 @@
           inherit pname version;
           hash = "sha256-jqj8X6H1N5mJQ4OrY5ANqRB0YJByqg/bNneEALWmH1A=";
         };
-        patches = ./patches/0001-Add-option-for-setting-min-range-span-for-y-axis.patch;
         buildInputs = [ pkgs.python3Packages.poetry-core ];
         propagatedBuildInputs = with pkgs.python3Packages; [ pyqtgraph numpy ];
       };

patches/0001-Add-option-for-setting-min-range-span-for-y-axis.patch

@@ -1,61 +0,0 @@
-From 59a14e06320fd42d56cd7d953da337c0fe4357fa Mon Sep 17 00:00:00 2001
-From: linuswck <linuswck@m-labs.hk>
-Date: Tue, 22 Oct 2024 17:30:36 +0800
-Subject: [PATCH] Add option for setting min range span for y-axis
-
----
- pglive/sources/live_axis_range.py | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/pglive/sources/live_axis_range.py b/pglive/sources/live_axis_range.py
-index afbd806..9b62ba5 100644
---- a/pglive/sources/live_axis_range.py
-+++ b/pglive/sources/live_axis_range.py
-@@ -5,7 +5,7 @@ from typing import Optional, List, Tuple, Dict
- class LiveAxisRange:
- 
-     def __init__(self, roll_on_tick: int = 1, offset_left: float = 0., offset_right: float = 0., offset_top: float = 0.,
--                 offset_bottom: float = 0., fixed_range: Optional[List[float]] = None) -> None:
-+                 offset_bottom: float = 0., fixed_range: Optional[List[float]] = None, min_y_range_span: Optional[List[float]] = [None, None]) -> None:
-         self.roll_on_tick = roll_on_tick
-         self.offset_left = offset_left
-         self.offset_right = offset_right
-@@ -21,6 +21,7 @@ class LiveAxisRange:
-         self.final_x_range = [0., 0.]
-         self.final_y_range = [0., 0.]
-         self.ignored_data_connectors: List[str] = []
-+        self.min_y_range_span = min_y_range_span
- 
-     def get_x_range(self, data_connector, tick: int) -> List[float]:
-         x, _ = data_connector.plot.getData()
-@@ -116,6 +117,13 @@ class LiveAxisRange:
-             # therefore in that case we must set some range
-             final_range[0] -= 0.4
-             final_range[1] += 0.4
-+
-+        if self.min_y_range_span[0] is not None:
-+            final_range[0] = min(self.min_y_range_span[0], final_range[0])
-+
-+        if self.min_y_range_span[1] is not None:
-+            final_range[1] = max(self.min_y_range_span[1], final_range[1])
-+
-         if self.final_y_range != final_range:
-             self.final_y_range = final_range
-         return self.final_y_range
-@@ -139,6 +147,13 @@ class LiveAxisRange:
-             # therefore in that case we must set some range
-             final_range[0] -= 0.4
-             final_range[1] += 0.4
-+        
-+        if self.min_y_range_span[0] is not None:
-+            final_range[0] = min(self.min_y_range_span[0], final_range[0])
-+
-+        if self.min_y_range_span[1] is not None:
-+            final_range[1] = max(self.min_y_range_span[1], final_range[1])
-+
-         if self.final_y_range != final_range:
-             self.final_y_range = final_range
-         return self.final_y_range
--- 
-2.44.1
-

pykirdy/driver/kirdy.py

@@ -879,7 +879,7 @@ class Kirdy:
                     else:
                         self._report_sig.emit(response)
                 else:
-                    if self._msg_queue_get_report and response["msg_type"] == 'Report':
+                    if self._msg_queue_get_report:
                         self._msg_queue_get_report = False
                     self._int_msg_queue.put_nowait_overwrite(response)
         except asyncio.exceptions.CancelledError:

pykirdy/kirdy_qt.py

@@ -196,16 +196,14 @@ class Graphs:
         ld_i_set_graph.setAxisItems({'left': ld_i_set_axis})
         ld_i_set_graph.addItem(self._ld_i_set_plot)
         ld_i_set_graph.y_range_controller = LiveAxisRange(fixed_range=[0.0, 0.4])
-        self.ld_i_set_connector = DataConnector(self._ld_i_set_plot, plot_rate=10.0, update_rate=10.0, max_points=self.max_samples)
+        self.ld_i_set_connector = DataConnector(self._ld_i_set_plot, max_points=self.max_samples)
         self.connectors += [self.ld_i_set_connector]
 
         pd_mon_pwr_axis = LiveAxis('left', text="Power", units="W")
         pd_mon_pwr_axis.showLabel()
-        
-        pd_mon_pwr_graph.y_range_controller = LiveAxisRange(min_y_range_span=[0.0, 100 / 1000 / 1000])
         pd_mon_pwr_graph.setAxisItems({'left': pd_mon_pwr_axis})
         pd_mon_pwr_graph.addItem(self._pd_mon_pwr_plot)
-        self.pd_mon_pwr_connector = DataConnector(self._pd_mon_pwr_plot, plot_rate=10.0, update_rate=10.0, max_points=self.max_samples)
+        self.pd_mon_pwr_connector = DataConnector(self._pd_mon_pwr_plot, max_points=self.max_samples)
         self.connectors += [self.pd_mon_pwr_connector]
 
         tec_temp_axis = LiveAxis('left', text="Temperature", units="℃")
@@ -213,8 +211,8 @@ class Graphs:
         tec_temp_graph.setAxisItems({'left': tec_temp_axis})
         tec_temp_graph.addItem(self._tec_setpoint_plot)
         tec_temp_graph.addItem(self._tec_temp_plot)
-        self.tec_setpoint_connector = DataConnector(self._tec_setpoint_plot, plot_rate=10.0, update_rate=10.0, max_points=1)
+        self.tec_setpoint_connector = DataConnector(self._tec_setpoint_plot, max_points=1)
-        self.tec_temp_connector = DataConnector(self._tec_temp_plot, plot_rate=10.0, update_rate=10.0, max_points=self.max_samples)
+        self.tec_temp_connector = DataConnector(self._tec_temp_plot, max_points=self.max_samples)
         self.connectors += [self.tec_temp_connector, self.tec_setpoint_connector]
 
         tec_i_axis = LiveAxis('left', text="Current", units="A")
@@ -223,8 +221,8 @@ class Graphs:
         tec_i_graph.addLegend(brush=(50, 50, 200, 150))
         tec_i_graph.addItem(self._tec_i_target_plot)
         tec_i_graph.addItem(self._tec_i_measure_plot)
-        self.tec_i_target_connector = DataConnector(self._tec_i_target_plot, plot_rate=10.0, update_rate=10.0, max_points=self.max_samples)
+        self.tec_i_target_connector = DataConnector(self._tec_i_target_plot, max_points=self.max_samples)
-        self.tec_i_measure_connector = DataConnector(self._tec_i_measure_plot, plot_rate=10.0, update_rate=10.0, max_points=self.max_samples)
+        self.tec_i_measure_connector = DataConnector(self._tec_i_measure_plot, max_points=self.max_samples)
         self.connectors += [self.tec_i_target_connector, self.tec_i_measure_connector]
     
     def set_max_samples(self, max_samples):
@@ -405,7 +403,7 @@ class MainWindow(QtWidgets.QMainWindow):
     LASER_DIODE_PARAMETERS = [
         {'name': 'Readings', 'expanded': True, 'type': 'group', 'children': [
             {'name': 'LD Current Set', 'type': 'float', 'unit': 'mA', 'readonly': True, "compactHeight": False},
-            {'name': 'PD Current', 'type': 'float', 'unit': 'uA', 'readonly': True, "compactHeight": False},
+            {'name': 'PD Current', 'type': 'float', 'unit': 'uA', 'siPrefix': True, 'readonly': True, "compactHeight": False},
             {'name': 'PD Power', 'type': 'float', 'unit': 'mW', 'readonly': True, "compactHeight": False},
             {'name': 'LF Mod Termination (50 Ohm)', 'type': 'list', 'limits': ['On', 'Off'], 'readonly': True, "compactHeight": False}
         ]},
@@ -816,10 +814,8 @@ class MainWindow(QtWidgets.QMainWindow):
         tree.setParameters(self.params[1], showTop=False)
         self.params[1].sigTreeStateChanged.connect(self.send_command)
 
-        self.prev_autotuner_state = None
         @asyncSlot()
         async def autotune(param):
-            self.prev_autotuner_state = None
             match self.autotuner.state():
                 case PIDAutotuneState.STATE_OFF:
                     settings = await self.kirdy.device.get_settings_summary()
@@ -829,7 +825,6 @@ class MainWindow(QtWidgets.QMainWindow):
                         param.parent().child('Temperature Swing').value(),
                         1.0 / settings['thermostat']['temp_adc_settings']['rate'],
                         param.parent().child('Lookback').value())
-                    print(param.parent().child('Lookback').value())
                     self.autotuner.setReady()
                     param.setOpts(title="Stop")
                     self.kirdy.task_dispatcher(self.kirdy.thermostat.set_constant_current_control_mode())
@@ -883,43 +878,40 @@ class MainWindow(QtWidgets.QMainWindow):
         self.info_box.setWindowTitle("Command fails to execute")
         self.info_box.show()
 
-    @asyncSlot(dict)
+    @pyqtSlot(dict)
-    async def autotune_tick(self, report):
+    def autotune_tick(self, report):
-        self.autotuner.run(report['thermostat']['temperature'], report['ts']/1000)
+        match self.autotuner.state():
-        if self.prev_autotuner_state != self.autotuner.state():
+            case PIDAutotuneState.STATE_READY | PIDAutotuneState.STATE_RELAY_STEP_UP | PIDAutotuneState.STATE_RELAY_STEP_DOWN:
-            match self.autotuner.state():
+                self.autotuner.run(report['thermostat']['temperature'], report['ts']/1000)
-                case PIDAutotuneState.STATE_READY | PIDAutotuneState.STATE_RELAY_STEP_UP | PIDAutotuneState.STATE_RELAY_STEP_DOWN:
+                self.kirdy.task_dispatcher(self.kirdy.thermostat.set_tec_i_out(self.autotuner.output()))
-                    await self.kirdy.thermostat.set_tec_i_out(self.autotuner.output())
+            case PIDAutotuneState.STATE_SUCCEEDED:
-                    self.prev_autotuner_state = self.autotuner.state()
+                kp, ki, kd = self.autotuner.get_tec_pid()
-                case PIDAutotuneState.STATE_SUCCEEDED:
+                self.autotuner.setOff()
-                    kp, ki, kd = self.autotuner.get_tec_pid()
+                self.params[1].child('PID Config', 'PID Auto Tune', 'Run').setOpts(title="Run")
-                    self.autotuner.setOff()
+                self.kirdy.task_dispatcher(self.kirdy.thermostat.set_pid_kp(kp))
-                    self.params[1].child('PID Config', 'PID Auto Tune', 'Run').setOpts(title="Run")
+                self.kirdy.task_dispatcher(self.kirdy.thermostat.set_pid_ki(ki))
-                    self.kirdy.task_dispatcher(self.kirdy.thermostat.set_pid_kp(kp))
+                self.kirdy.task_dispatcher(self.kirdy.thermostat.set_pid_kd(kd))
-                    self.kirdy.task_dispatcher(self.kirdy.thermostat.set_pid_ki(ki))
+                self.kirdy.task_dispatcher(self.kirdy.thermostat.set_pid_control_mode())
-                    self.kirdy.task_dispatcher(self.kirdy.thermostat.set_pid_kd(kd))
+                self.kirdy.task_dispatcher(self.kirdy.thermostat.set_temperature_setpoint(self.params[1].child('PID Config', 'PID Auto Tune', 'Target Temperature').value()))
-                    self.kirdy.task_dispatcher(self.kirdy.thermostat.set_pid_control_mode())
+                self.kirdy_handler.report_update_sig.disconnect(self.autotune_tick)
-                    self.kirdy.task_dispatcher(self.kirdy.thermostat.set_temperature_setpoint(self.params[1].child('PID Config', 'PID Auto Tune', 'Target Temperature').value()))
+                self.background_task_lbl.setText("Ready.")
-                    self.kirdy_handler.report_update_sig.disconnect(self.autotune_tick)
+                self.loading_spinner.stop()
-                    self.background_task_lbl.setText("Ready.")
+                self.loading_spinner.hide()
-                    self.loading_spinner.stop()
+                self.info_box.setWindowTitle("PID AutoTune Success")
-                    self.loading_spinner.hide()
+                self.info_box.setText("PID Config has been loaded to Thermostat.\nRegulating temperature.")
-                    self.info_box.setWindowTitle("PID AutoTune Success")
+                self.info_box.show()
-                    self.info_box.setText("PID Config has been loaded to Thermostat.\nRegulating temperature.")
+
-                    self.info_box.show()
+            case PIDAutotuneState.STATE_FAILED:
-                    self.prev_autotuner_state = None
+                self.autotuner.setOff()
-                case PIDAutotuneState.STATE_FAILED:
+                self.params[1].child('PID Config', 'PID Auto Tune', 'Run').setOpts(title="Run")
-                    self.autotuner.setOff()
+                self.kirdy.task_dispatcher(self.kirdy.thermostat.set_tec_i_out(0.0))
-                    self.params[1].child('PID Config', 'PID Auto Tune', 'Run').setOpts(title="Run")
+                self.kirdy_handler.report_update_sig.disconnect(self.autotune_tick)
-                    self.kirdy.task_dispatcher(self.kirdy.thermostat.set_tec_i_out(0.0))
+                self.background_task_lbl.setText("Ready.")
-                    self.kirdy_handler.report_update_sig.disconnect(self.autotune_tick)
+                self.loading_spinner.stop()
-                    self.background_task_lbl.setText("Ready.")
+                self.loading_spinner.hide()
-                    self.loading_spinner.stop()
+                self.info_box.setWindowTitle("PID Autotune Failed")
-                    self.loading_spinner.hide()
+                self.info_box.setText("PID Autotune is failed.")
-                    self.info_box.setWindowTitle("PID Autotune Failed")
+                self.info_box.show()
-                    self.info_box.setText("PID Autotune is failed.")
-                    self.info_box.show()
-                    self.prev_autotuner_state = None
 
     @pyqtSlot(bool)
     def _on_connection_changed(self, result):