Make UC2Client serial-only; deprecate WiFi

Remove/disable WiFi/HTTP communication and favor serial-only communication for UC2Client. Key changes:

- Added/renamed binary builds in binaries/latest.
- examples/can_ota_streaming_example.py: changed canid to 40 and appended commented JSON OTA start messages for canid 11 and 40.
- uc2rest/UC2Client.py: requests kept as optional import; explicit deprecation/warning for host-based (WiFi) usage; removed wifi/http code paths and made serial the primary channel; improved logging and PyScript/SerialManager handling.
- uc2rest/motor.py: simplify is_blocking check to rely on serial connection only.
- uc2rest/mserial.py: store discovered serial port, set serialport from opened device, clear is_connected on thread stop, and add clarifying comments to device readiness handling.
- uc2rest/rotator.py: remove obsolete wifi-related blocking branch.
- uc2rest/wifi.py: mark methods deprecated and replace implementations with pass/docstrings to disable HTTP functionalities.

These changes simplify the codebase by removing legacy WiFi support and make serial the supported communication path. Adjustments to examples and serial handling ensure compatibility with the serial-only workflow.

Author: beniroquai

binaries/latest/esp32_UC2_3_CAN_HAT_Master_v2.bin

@@ -48,6 +48,7 @@ def main():
 
     port = "/dev/cu.SLAB_USBtoUART"
     canid = 11
+    canid = 40
     firmware = "/Users/bene/Dropbox/Dokumente/Promotion/PROJECTS/UC2-REST/binaries/latest/esp32_seeed_xiao_esp32s3_can_slave_motor.bin"
     baud = 921600
 
@@ -95,7 +96,10 @@ def main():
     print("=" * 70)
 
     return 0 if success else 1
+'''
+{"task": "/can_ota_stream", "canid": 11, "action": "start", "firmware_size": 876784, "page_size": 4096, "chunk_size": 512, "md5": "43ba96b4d18c010201762b840476bf83"}
+{"task": "/can_ota_stream", "canid": 40, "action": "start", "firmware_size": 876784, "page_size": 4096, "chunk_size": 512, "md5": "43ba96b4d18c010201762b840476bf83"}
 
-
+'''
 if __name__ == "__main__":
     sys.exit(main())

…2_seeed_xiao_esp32s3_can_slave_motor.bin …_seeed_xiao_esp32s3_can_slave_motor.bin_binaries/latest/esp32_seeed_xiao_esp32s3_can_slave_motor.bin renamed to binaries/latest/esp32_seeed_xiao_esp32s3_can_slave_motor.bin_ binaries/latest/esp32_seeed_xiao_esp32s3_can_slave_motor.bin renamed to binaries/latest/esp32_seeed_xiao_esp32s3_can_slave_motor.bin_

@@ -30,18 +30,19 @@
 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 +53,13 @@ def __init__(self, host=None, port=31950, serialport=None, identity="UC2_Feather
         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 +69,27 @@ def __init__(self, host=None, port=31950, serialport=None, identity="UC2_Feather
         # 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
@@ -169,19 +170,12 @@ def post_json(self, path, payload, getReturn=True, nResponses=1, timeout=1):
         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):

binaries/latest/seeed_xiao_esp32s3_can_slave_motor.bin

@@ -630,7 +630,7 @@ def move_stepper(self, steps=(0,0,0,0), speed=(1000,1000,1000,1000), is_absolute
 
         # drive motor
         self.isRunning = True
-        is_blocking = not self._parent.is_wifi and is_blocking and self._parent.serial.is_connected
+        is_blocking =  is_blocking and self._parent.serial.is_connected
         timeout = timeout if is_blocking else 0
         nResponses = len(payload["motor"]["steppers"]) + 1
         # if we get a return, we will receive the latest position feedback from the driver  by means of the axis that moves the longest

examples/can_ota_streaming_example.py

@@ -181,6 +181,7 @@ def findCorrectSerialDevice(self):
                     self.is_connected = True
                     self.manufacturer = port.manufacturer
                     self._logger.debug(f"Found correct USB device: {port.device} - {port.description}")
+                    self.serialport = port
                     return self.serialdevice
 
         self.is_connected = False
@@ -292,7 +293,7 @@ def _process_commands(self):
 
                 # device not ready yet
                 if self.serialdevice is None:
-                    self.is_connected = False
+                    self.is_connected = False # TODO: We have to indicate if the device is not connected or if it is just not ready yet - otherwise we will have a lot of "Failed to Send" messages in the beginning
                     continue
                 else:
                     self.is_connected = True
@@ -389,6 +390,7 @@ def _process_commands(self):
             except Exception as e:
                 self._logger.error("Error in processing serial commands: "+str(e))
         self.running = False
+        self.is_connected = False
 
     def get_json(self, path, timeout=1):
         message = {"task":path}
@@ -519,7 +521,9 @@ def reconnect(self, baudrate=None):
         except:
             pass
         self.serialdevice = self.openDevice(port = self.serialport, baud_rate = self.baudrate)
-        if self.serialdevice: return True
+        if self.serialdevice: 
+            self.serialport = self.serialdevice.port
+            return True
         return False
 
 

uc2rest/UC2Client.py

@@ -283,7 +283,7 @@ def move_stepper(self, steps=(0,0,0,0), speed=(1000,1000,1000,1000), is_absolute
             steppersRunning = isAbsoluteArray
         else:
             steppersRunning = np.abs(np.array(steps))>0
-        if False: #not self._parent.is_wifi and is_blocking and self._parent.serial.is_connected:
+        if False:
             while True:
                 time.sleep(0.05) # don'T overwhelm the CPU
                 # see if already done

uc2rest/motor.py

@@ -5,87 +5,33 @@ def __init__(self, parent):
         self._parent = parent
 
     def isConnected(self):
-        # check if client is connected to the same network
-        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        try:
-            s.connect((self.host, int(self.port)))
-            s.settimeout(2)
-            s.shutdown(2)
-            return True
-        except:
-            return False
-
+        '''
+        deprecated 
+        '''
+        pass 
 
     def get_json(self, path):
-        if self.is_connected and self.is_wifi:
-            if not path.startswith("http"):
-                path = self.base_uri + path
-            try:
-                r = requests.get(path)
-                r.raise_for_status()
-                self.is_connected = True
-
-                self.getmessage = r.json()
-                self.is_sending = False
-                return self.getmessage
-
-            except Exception as e:
-                if IS_IMSWITCH: self.__logger.error(e)
-                self.is_connected = False
-                self.is_sending = False
-                # not connected
-                return None
+        '''
+        deprecated 
+        '''
+        pass 
 
     def post_json(self, path, payload={}, headers=None, isInit=False, timeout=1):
-        """Make an HTTP POST request and return the JSON response"""
-        if self.is_connected and self.is_wifi:
-            if not path.startswith("http"):
-                path = self.base_uri + path
-            if headers is None:
-                headers = self.headers
-            try:
-                r = requests.post(path, json=payload, headers=headers,timeout=timeout)
-                r.raise_for_status()
-                r = r.json()
-                self.is_connected = True
-                self.is_sending = False
-                return r
-            except Exception as e:
-                if IS_IMSWITCH: self.__logger.error(e)
-                self.is_connected = False
-                self.is_sending = False
-                # not connected
-                return None
-
+        '''
+        deprecated 
+        '''
+        pass 
 
     @property
     def base_uri(self):
         return f"http://{self.host}:{self.port}"
 
 
     def send_jpeg(self, image):
-        if is_cv2:
-            temp = NamedTemporaryFile()
-
-            #add JPEG format to the NamedTemporaryFile
-            iName = "".join([str(temp.name),".jpg"])
-
-            #save the numpy array image onto the NamedTemporaryFile
-            cv2.imwrite(iName,image)
-            _, img_encoded = cv2.imencode('test.jpg', image)
-
-            content_type = 'image/jpeg'
-            headers = {'content-type': content_type}
-            payload = img_encoded.tostring()
-            path = '/uploadimage'
-
-            #r = self.post_json(path, payload=payload, headers = headers)
-            #requests.post(self.base_uri + path, data=img_encoded.tostring(), headers=headers)
-            files = {'media': open(iName, 'rb')}
-            if self.is_connected:
-                requests.post(self.base_uri + path, files=files)
-
-
+        '''
+        deprecated 
+        '''
+        pass 
 
     def scanWifi(self, timeout=3):
         path = '/wifi/scan'