pypicoboot 1.1.5__tar.gz → 1.3__tar.gz

{pypicoboot-1.1.5 → pypicoboot-1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypicoboot
-Version: 1.1.5
+Version: 1.3
 Summary: Pico Boot for Python
 Home-page: https://github.com/polhenarejos/pypicoboot
 Author: Pol Henarejos

pypicoboot-1.3/picoboot/__init__.py

@@ -0,0 +1,3 @@
+from ._version import __version__
+from .picoboot import PicoBoot, Model
+from .core.exceptions import PicoBootError, PicoBootNotFoundError, PicoBootInvalidStateError

{pypicoboot-1.1.5 → pypicoboot-1.3}/picoboot/_version.py

@@ -17,4 +17,4 @@
  */
 """
 
-__version__ = "1.1.5"
+__version__ = "1.3"

{pypicoboot-1.1.5 → pypicoboot-1.3}/picoboot/core/__init__.py

@@ -1 +1,2 @@
 from .enums import NamedIntEnum
+from .exceptions import *

pypicoboot-1.3/picoboot/core/exceptions.py

@@ -0,0 +1,28 @@
+"""
+/*
+ * This file is part of the pypicoboot distribution (https://github.com/polhenarejos/pypicoboot).
+ * Copyright (c) 2025 Pol Henarejos.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+"""
+
+
+class PicoBootError(Exception):
+    pass
+
+class PicoBootNotFoundError(PicoBootError):
+    pass
+
+class PicoBootInvalidStateError(PicoBootError):
+    pass

pypicoboot-1.3/picoboot/core/log.py

@@ -0,0 +1,58 @@
+"""
+/*
+ * This file is part of the pypicoboot distribution (https://github.com/polhenarejos/pypicoboot).
+ * Copyright (c) 2025 Pol Henarejos.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+"""
+
+import os
+import logging
+
+TRACE_LEVEL = 5
+logging.addLevelName(TRACE_LEVEL, "TRACE")
+
+def trace(self, message, *args, **kwargs):
+    if self.isEnabledFor(TRACE_LEVEL):
+        self._log(TRACE_LEVEL, message, args, **kwargs)
+
+# Afegeix logger.trace()
+logging.Logger.trace = trace
+
+def get_logger(name: str):
+    env_level = os.getenv("PICOBOOT_LOG", "CRITICAL").upper()
+
+    valid_levels = {
+        "TRACE": TRACE_LEVEL,
+        "DEBUG": logging.DEBUG,
+        "INFO": logging.INFO,
+        "WARNING": logging.WARNING,
+        "ERROR": logging.ERROR,
+        "CRITICAL": logging.CRITICAL,
+    }
+
+    level = valid_levels.get(env_level, logging.CRITICAL)
+
+    logger = logging.getLogger(name)
+    logger.setLevel(level)
+
+    if not logger.handlers:
+        handler = logging.StreamHandler()
+        handler.setFormatter(logging.Formatter(
+            fmt="%(asctime)s [%(levelname)s] %(name)s: %(message)s",
+            datefmt="%Y-%m-%d %H:%M:%S"
+        ))
+        logger.addHandler(handler)
+
+    return logger

{pypicoboot-1.1.5 → pypicoboot-1.3}/picoboot/picoboot.py

@@ -16,31 +16,6 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 """
-import os
-import logging
-
-def get_logger(name: str):
-    env_level = os.getenv("PICOBOOT_LOG", "CRITICAL").upper()
-
-    valid_levels = ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]
-    if env_level not in valid_levels:
-        print(f"[logger] Warning: nivell '{env_level}' invàlid. Usant INFO.")
-        env_level = "INFO"
-
-    logger = logging.getLogger(name)
-    logger.setLevel(env_level)
-
-    if not logger.handlers:
-        handler = logging.StreamHandler()
-        handler.setFormatter(logging.Formatter(
-            fmt="%(asctime)s [%(levelname)s] %(name)s: %(message)s",
-            datefmt="%Y-%m-%d %H:%M:%S"
-        ))
-        logger.addHandler(handler)
-
-    return logger
-
-logger = get_logger("picoboot")
 
 from binascii import hexlify
 from typing import Optional
@@ -51,6 +26,10 @@ import itertools
 from .utils import uint_to_int
 from .core.enums import NamedIntEnum
 from .picobootmonitor import PicoBootMonitor, PicoBootMonitorObserver
+from .core.log import get_logger
+from .core.exceptions import PicoBootError, PicoBootNotFoundError, PicoBootInvalidStateError
+
+logger = get_logger("PicoBoot")
 
 # Valors per defecte segons el datasheet (es poden canviar via OTP) :contentReference[oaicite:4]{index=4}
 DEFAULT_VID = 0x2E8A
@@ -156,9 +135,6 @@ class Model(NamedIntEnum):
 class Addresses(NamedIntEnum):
     BOOTROM_MAGIC = 0x00000010
 
-class PicoBootError(Exception):
-    pass
-
 class PicoBoot:
 
     def __init__(self, dev: usb.core.Device, intf, ep_out, ep_in) -> None:
@@ -215,7 +191,7 @@ class PicoBoot:
         devices = list(devices) if devices is not None else []
         if not devices:
             logger.error("No device found in PICOBOOT mode")
-            raise PicoBootError("No device found in PICOBOOT mode")
+            raise PicoBootNotFoundError("No device found in PICOBOOT mode")
 
         dev = None
         if serial is None:
@@ -233,7 +209,7 @@ class PicoBoot:
                     break
         if dev is None:
             logger.error("No device found with this serial number")
-            raise PicoBootError("No device found with this serial number")
+            raise PicoBootNotFoundError("No device found with this serial number")
 
         # Ensure active configuration
         # macOS does not allow detach_kernel_driver, and often returns Access Denied
@@ -262,7 +238,7 @@ class PicoBoot:
                 break
         if intf is None:
             logger.error("No interface found with PICOBOOT at the device")
-            raise PicoBootError("No interface found with PICOBOOT at the device")
+            raise PicoBootNotFoundError("No interface found with PICOBOOT at the device")
 
         #usb.util.claim_interface(dev, intf.bInterfaceNumber)
 
@@ -278,7 +254,7 @@ class PicoBoot:
 
         if ep_in is None or ep_out is None:
             logger.error("No PICOBOOT BULK_IN/BULK_OUT endpoints found")
-            raise PicoBootError("No PICOBOOT BULK_IN/BULK_OUT endpoints found")
+            raise PicoBootNotFoundError("No PICOBOOT BULK_IN/BULK_OUT endpoints found")
         logger.info("PICOBOOT device opened successfully.")
         return cls(dev, intf, ep_out, ep_in)
 
@@ -369,7 +345,12 @@ class PicoBoot:
             raise
         logger.debug(f"Sending command {cmd_id} (0x{cmd_id:02X}) with token {token} (0x{token:08X}) and transfer_length {transfer_length}")
 
-        self.ep_out.write(header, timeout=timeout)
+        logger.trace(f"Command header: {hexlify(header).decode()}")
+        try:
+            self.ep_out.write(header, timeout=timeout)
+        except usb.core.USBError as e:
+            logger.error(f"Failed to send command header: {e}")
+            raise PicoBootInvalidStateError("Failed to send command header: " + str(e))
         logger.debug(f"Command header sent: {hexlify(header).decode()}")
 
         data_in = b""
@@ -380,12 +361,17 @@ class PicoBoot:
                 chunks = []
                 maxpkt = self.ep_in.wMaxPacketSize
                 while remaining > 0:
-                    chunk = bytes(self.ep_in.read(min(maxpkt, remaining), timeout=timeout))
+                    try:
+                        chunk = bytes(self.ep_in.read(min(maxpkt, remaining), timeout=timeout))
+                    except usb.core.USBError as e:
+                        logger.error(f"Failed to read data_in: {e}")
+                        raise PicoBootInvalidStateError("Failed to read data_in: " + str(e))
                     if not chunk:
                         break
                     chunks.append(chunk)
                     remaining -= len(chunk)
                 data_in = b"".join(chunks)
+                logger.trace(f"Received data_in: {hexlify(data_in).decode()}")
                 if len(data_in) != transfer_length:
                     logger.error(f"Expected {transfer_length} bytes, got {len(data_in)}")
                     raise PicoBootError(f"Expected {transfer_length} bytes, got {len(data_in)}")
@@ -393,7 +379,12 @@ class PicoBoot:
                 if data_out is None or len(data_out) < transfer_length:
                     logger.error("data_out missing or too short for OUT command")
                     raise ValueError("data_out missing or too short for OUT command")
-                self.ep_out.write(data_out[:transfer_length], timeout=timeout)
+                logger.trace(f"Sending data_out: {hexlify(data_out[:transfer_length]).decode()}")
+                try:
+                    self.ep_out.write(data_out[:transfer_length], timeout=timeout)
+                except usb.core.USBError as e:
+                    logger.error(f"Failed to send data_out: {e}")
+                    raise PicoBootInvalidStateError("Failed to send data_out: " + str(e))
 
         try:
             logger.debug("Waiting for ACK...")
@@ -404,6 +395,7 @@ class PicoBoot:
         except usb.core.USBError:
             logger.error("No ACK received after command")
             raise PicoBootError("No ACK received after command")
+        logger.debug("ACK received.")
 
         return data_in
 

{pypicoboot-1.1.5 → pypicoboot-1.3}/pypicoboot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pypicoboot
-Version: 1.1.5
+Version: 1.3
 Summary: Pico Boot for Python
 Home-page: https://github.com/polhenarejos/pypicoboot
 Author: Pol Henarejos

{pypicoboot-1.1.5 → pypicoboot-1.3}/pypicoboot.egg-info/SOURCES.txt

@@ -9,6 +9,8 @@ picoboot/picobootmonitor.py
 picoboot/utils.py
 picoboot/core/__init__.py
 picoboot/core/enums.py
+picoboot/core/exceptions.py
+picoboot/core/log.py
 picoboot/tools/picotool.py
 pypicoboot.egg-info/PKG-INFO
 pypicoboot.egg-info/SOURCES.txt

pypicoboot-1.1.5/picoboot/__init__.py

@@ -1,2 +0,0 @@
-from ._version import __version__
-from .picoboot import PicoBoot, Model