UC2-REST 0.2.0.33__tar.gz → 0.2.0.35__tar.gz

{uc2_rest-0.2.0.33 → uc2_rest-0.2.0.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UC2-REST
-Version: 0.2.0.33
+Version: 0.2.0.35
 Summary: This pacage will help you to drive the ESP32-driven microscopy control modules from UC2
 Home-page: https://github.com/openUC2/UC2-REST
 Author: Benedict Diederich

{uc2_rest-0.2.0.33 → uc2_rest-0.2.0.35}/UC2_REST.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UC2-REST
-Version: 0.2.0.33
+Version: 0.2.0.35
 Summary: This pacage will help you to drive the ESP32-driven microscopy control modules from UC2
 Home-page: https://github.com/openUC2/UC2-REST
 Author: Benedict Diederich

{uc2_rest-0.2.0.33 → uc2_rest-0.2.0.35}/UC2_REST.egg-info/SOURCES.txt

@@ -19,6 +19,7 @@ uc2rest/canota.py
 uc2rest/cmdrecorder.py
 uc2rest/digitalin.py
 uc2rest/digitalout.py
+uc2rest/fan.py
 uc2rest/galvo.py
 uc2rest/gripper.py
 uc2rest/home.py

{uc2_rest-0.2.0.33 → uc2_rest-0.2.0.35}/uc2rest/UC2Client.py

@@ -26,6 +26,7 @@ from .rotator import Rotator
 from .logger import Logger
 from .cmdrecorder import cmdRecorder
 from .temperature import Temperature
+from .fan import Fan
 from .message import Message
 from .can import CAN
 from .canota import CANOTA
@@ -131,8 +132,8 @@ class UC2Client(object):
         # initialize temperature
         self.temperature = Temperature(self)
 
-        # initialize laser
-        self.state = State(self)
+        # initialize fan controller
+        self.fan = Fan(self)
 
         # initialize galvo
         self.galvo = Galvo(self)

{uc2_rest-0.2.0.33 → uc2_rest-0.2.0.35}/uc2rest/__version__.py

@@ -6,7 +6,7 @@ __version__.py
 
 __title__ = 'UC2-REST'
 __description__ = 'This pacage will help you to drive the ESP32-driven microscopy control modules from UC2'
-__version__ = "v0.2.0.33"
+__version__ = "v0.2.0.35"
 __author__ = 'Benedict Diederich'
 __author_email__ = 'benedictdied@gmail.com'
 __license__ = 'GPL v3'

{uc2_rest-0.2.0.33 → uc2_rest-0.2.0.35}/uc2rest/can.py

@@ -57,15 +57,29 @@ class CAN(object):
         """Register a callback function for a specific key."""
         self._callbackPerKey[key] = callbackfct
 
+    def get_can_ids(self):
+        """Return CAN node IDs from the latest scan (e.g. for OTA flashing)."""
+        return [entry.get("canId") for entry in self.scanResults
+                if entry.get("canId") is not None]
+
     def reboot_remote(self, qid=1, can_address=0, isBlocking=False, timeout=2):
         """
-        Send a reboot signal to the remote CAN device.
+        Reboot a CAN device.
 
-        :param qid: Query ID for the CAN command (default: 1)
+        - ``can_address == 0`` reboots the master (this ESP32) itself.
+        - ``can_address in 1..127`` reboots a remote slave by SDO-writing 1
+          to OD index 0x2507 sub 0 on the target node. The slave's
+          CO_tmr_task observes the write and calls ESP.restart() ~200 ms
+          later.
+
+        :param qid: Query ID for the CAN command (unused by firmware, kept
+            for API compatibility)
+        :param can_address: 0 = master, 1..127 = remote slave nodeId
         :param isBlocking: If True, wait for response
         :param timeout: Timeout for the command in seconds
-        :param can_address: Address of the CAN device to reboot (0 is master)
-        :return: Response from the device
+        :return: Response from the device, e.g.
+            ``{"status":"ok","nodeId":11}`` or
+            ``{"status":"error","error":"SDO write failed","nodeId":11}``.
         """
         path = "/can_act"
         payload = {
@@ -98,7 +112,7 @@ class CAN(object):
                      "count": 2
                  }
         """
-        path = "/can_act"
+        path = "/can_act" #         {"task":"/can_act", "scan": true}
         payload = {
             "task": path,
             "scan": True,
@@ -109,7 +123,7 @@ class CAN(object):
             payload,
             getReturn=True,
             timeout=timeout,
-            nResponses=2
+            nResponses=1
         )
 
     def get_available_devices(self, timeout=2):