UC2-REST 0.2.0.32__tar.gz → 0.2.0.34__tar.gz

{uc2_rest-0.2.0.32 → uc2_rest-0.2.0.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UC2-REST
-Version: 0.2.0.32
+Version: 0.2.0.34
 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.32 → uc2_rest-0.2.0.34}/UC2_REST.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UC2-REST
-Version: 0.2.0.32
+Version: 0.2.0.34
 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.32 → uc2_rest-0.2.0.34}/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.32 → uc2_rest-0.2.0.34}/uc2rest/UC2Client.py

@@ -26,22 +26,24 @@ 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
 from .camera_trigger import CameraTrigger
+
+# requests is no longer used for direct ESP communication (serial-only).
+# Kept as optional import for other modules that may need HTTP (e.g. firmware downloads).
 try:
     import requests
-except:
-    print("No requests available - running on pyscript?")
+except Exception:
+    requests = None
 
 class UC2Client(object):
-    # headers = {'ESP32-version': '*'}
     headers={"Content-Type":"application/json"}
     getmessage = ""
     is_connected = False
 
-    is_wifi = False
     is_serial = False
     BAUDRATE = 115200
 
@@ -52,12 +54,13 @@ class UC2Client(object):
         This client connects to the UC2-REST microcontroller that can be found here
         https://github.com/openUC2/UC2-REST
 
+        Communication is via USB/serial only.
+        The host/port parameters are deprecated and will be ignored.
+
         generally speaking you send/receive JSON documents that will cause an:
         1. action => "/XXX_act"
         2. getting => "/XXX_get"
         3. setting => "/XXX_set"
-
-        you can send commands through wifi/http or usb/serial
         '''
         if True: #logger is None:
             self.logger = Logger()
@@ -67,28 +70,27 @@ class UC2Client(object):
         # perhaps we are in the browser?
         self.isPyScript = isPyScript
 
-        # initialize communication channel (# connect to wifi or usb)
+        # Deprecation notice for WiFi mode
+        if host is not None and serialport is None and SerialManager is None:
+            self.logger.warning(
+                "WiFi/HTTP communication has been removed. "
+                "Please use serialport= instead. Ignoring host parameter."
+            )
+
+        # initialize communication channel (serial only)
         if serialport is not None:
             # use USB connection
             self.serial = Serial(serialport, baudrate, parent=self, identity=identity, DEBUG=DEBUG, skipFirmwareCheck=skipFirmwareCheck)
             self.is_serial = True
             self.is_connected = self.serial.is_connected
             self.serial.DEBUG = DEBUG
-        elif host is not None:
-            # use client in wireless mode
-            self.is_wifi = True
-            self.host = host
-            self.port = port
-
-            # check if host is up
-            self.logger.debug(f"Connecting to microscope {self.host}:{self.port}")
-            #self.is_connected = self.isConnected()
         elif SerialManager is not None:
-            # we are trying to access the controller from .a web browser
+            # we are trying to access the controller from a web browser
             self.serial = SerialManagerWrapper(SerialManager, parent=self)
             self.isPyScript = True
+            self.is_serial = True
         else:
-            self.logger.error("No ESP32 device is connected - check IP or Serial port!")
+            self.logger.error("No ESP32 device is connected - please provide a serialport!")
         
                         
         # import libraries depending on API version
@@ -130,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)
@@ -164,42 +166,17 @@ class UC2Client(object):
         self.modules = Modules(parent=self)
     
     def post_json(self, path, payload, getReturn=True, nResponses=1, timeout=1):
-        if self.is_wifi:
-            # FIXME: this is not working
-            url = f"http://{self.host}:{self.port}{path}"
-            try:
-                if timeout==0: timeout=.2
-                r = requests.post(url, json=payload, headers=self.headers,  timeout=timeout)
-                returnMessage = r.json()
-                returnMessage["success"] = r.status_code==200
-            except Exception as e:
-                print(e)
-                returnMessage = {}
-                returnMessage["error"] = str(e)
-                returnMessage["success"] = 0
-            return returnMessage
-        elif self.is_serial or self.isPyScript:
-            if timeout <=0:
-                getReturn = False
-            return self.serial.post_json(path, payload, getReturn=getReturn, nResponses=nResponses, timeout=timeout)
-        else:
-            self.logger.error("No ESP32 device is connected - check IP or Serial port!")
-            return None
+        if timeout <=0:
+            getReturn = False
+        return self.serial.post_json(path, payload, getReturn=getReturn, nResponses=nResponses, timeout=timeout)
 
     def get_json(self, path, getReturn=True, timeout=1):
-        if self.is_wifi:
-            # FIXME: this is not working
-            url = f"http://{self.host}:{self.port}{path}"
-            r = requests.get(url, headers=self.headers, timeout=timeout)
-            return r.json()
-        elif self.is_serial or self.isPyScript:
-            # timeout is not used anymore
-            if timeout <=0:
+        if self.is_serial or self.isPyScript:
+            if timeout <= 0:
                 getReturn = False
             return self.serial.post_json(path, payload=None, getReturn=getReturn, nResponses=1, timeout=timeout)
-            #return self.serial.read_json()<
         else:
-            self.logger.error("No ESP32 device is connected - check IP or Serial port!")
+            self.logger.error("No ESP32 device is connected - serial not initialized!")
             return None
 
     def setDebugging(self, debug=False):

{uc2_rest-0.2.0.32 → uc2_rest-0.2.0.34}/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.32"
+__version__ = "v0.2.0.34"
 __author__ = 'Benedict Diederich'
 __author_email__ = 'benedictdied@gmail.com'
 __license__ = 'GPL v3'

{uc2_rest-0.2.0.32 → uc2_rest-0.2.0.34}/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):