pypicoboot 1.1.4__py3-none-any.whl → 1.2__py3-none-any.whl

picoboot/_version.py

@@ -17,4 +17,4 @@
  */
 """
 
-__version__ = "1.1.4"
+__version__ = "1.2"

picoboot/core/enums.py

@@ -24,6 +24,11 @@ class NamedIntEnum(enum.IntEnum):
     def __str__(self):
         return self.name
 
+    def __format__(self, fmt):
+        if any(c in fmt for c in "xXod"):
+            return format(self.value, fmt)
+        return self.name
+
     @classmethod
     def from_string(cls, value: Union[str, int]) -> "NamedIntEnum":
         if not value:

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

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,9 @@ import itertools
 from .utils import uint_to_int
 from .core.enums import NamedIntEnum
 from .picobootmonitor import PicoBootMonitor, PicoBootMonitorObserver
+from .core.log import get_logger
+
+logger = get_logger("PicoBoot")
 
 # Valors per defecte segons el datasheet (es poden canviar via OTP) :contentReference[oaicite:4]{index=4}
 DEFAULT_VID = 0x2E8A
@@ -369,6 +347,7 @@ 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}")
 
+        logger.trace(f"Command header: {hexlify(header).decode()}")
         self.ep_out.write(header, timeout=timeout)
         logger.debug(f"Command header sent: {hexlify(header).decode()}")
 
@@ -386,6 +365,7 @@ class PicoBoot:
                     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,6 +373,7 @@ 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")
+                logger.trace(f"Sending data_out: {hexlify(data_out[:transfer_length]).decode()}")
                 self.ep_out.write(data_out[:transfer_length], timeout=timeout)
 
         try:
@@ -404,6 +385,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.4.dist-info → pypicoboot-1.2.dist-info}/METADATA

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

pypicoboot-1.2.dist-info/RECORD

@@ -0,0 +1,13 @@
+picoboot/__init__.py,sha256=cQPxH_qPx7ph9SQ-Z4Jc2YCU3SKYnDta6wzU-Q65suc,72
+picoboot/_version.py,sha256=j-dtPcfbhr1IMhFhudY5UZVclyBgMpxp0yoDa7RLwT4,776
+picoboot/picoboot.py,sha256=uzmd9W9JLNXCMSk4U0NzCnMCNAc4xnQg7es1lEJeN9A,24831
+picoboot/picobootmonitor.py,sha256=3msEP2S8ZS7P8QVgKpq9Z9Rcud78XygmG1_0L_OZOvs,2443
+picoboot/utils.py,sha256=SjpAoPZrgyD9Ws7NIFVBHt0zPOb8Lpu2_lsmfeT2rXE,1083
+picoboot/core/__init__.py,sha256=fmoYRI4KbzhLjXblEs_H9zgdCs7oDuSKeNEG_-kMgYo,32
+picoboot/core/enums.py,sha256=ugXS-dbdnusLib_ge0vT1OugHVG9ZjJfpUR073MhwdQ,1353
+picoboot/core/log.py,sha256=XWtN_hgmOtvpDMGDg-9f2BDLUe8elqUAbWti5yCJAA0,1768
+picoboot/tools/picotool.py,sha256=e2xjIxP5UZn9yfjxUWkJXq6KQHyw4YsGbuQbTauo0-Q,94
+pypicoboot-1.2.dist-info/METADATA,sha256=GgnGeLWZEcQDGmvC7stKpgCrMxdlbKXF4h1UxGamc30,41109
+pypicoboot-1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pypicoboot-1.2.dist-info/top_level.txt,sha256=sjegZQO5-kQdFOXXJHm0P7Hg1Nw4Ri0WKHnRYDTsa4I,9
+pypicoboot-1.2.dist-info/RECORD,,

pypicoboot-1.1.4.dist-info/RECORD

@@ -1,12 +0,0 @@
-picoboot/__init__.py,sha256=cQPxH_qPx7ph9SQ-Z4Jc2YCU3SKYnDta6wzU-Q65suc,72
-picoboot/_version.py,sha256=txKmvspbYF-uZ89KC9P5WlSJ9yxzTJtHQoWDGcqbpfc,778
-picoboot/picoboot.py,sha256=1jmeh8XWI1P3rGqDAsGRUdNcI7DkEVeXov1Siz6Wn74,25206
-picoboot/picobootmonitor.py,sha256=3msEP2S8ZS7P8QVgKpq9Z9Rcud78XygmG1_0L_OZOvs,2443
-picoboot/utils.py,sha256=SjpAoPZrgyD9Ws7NIFVBHt0zPOb8Lpu2_lsmfeT2rXE,1083
-picoboot/core/__init__.py,sha256=fmoYRI4KbzhLjXblEs_H9zgdCs7oDuSKeNEG_-kMgYo,32
-picoboot/core/enums.py,sha256=YQnCtiX3XwG5RtAIhTmD37DMZMEGmcPIaTiwsW3ckxw,1211
-picoboot/tools/picotool.py,sha256=e2xjIxP5UZn9yfjxUWkJXq6KQHyw4YsGbuQbTauo0-Q,94
-pypicoboot-1.1.4.dist-info/METADATA,sha256=zRIdNOpvKdzMObg200_OMOZlByW1ZdvCGqNwkMiTtQw,41111
-pypicoboot-1.1.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pypicoboot-1.1.4.dist-info/top_level.txt,sha256=sjegZQO5-kQdFOXXJHm0P7Hg1Nw4Ri0WKHnRYDTsa4I,9
-pypicoboot-1.1.4.dist-info/RECORD,,