pypicoboot 1.4__py3-none-any.whl → 1.5__py3-none-any.whl

picoboot/_version.py

@@ -17,4 +17,4 @@
  */
 """
 
-__version__ = "1.4"
+__version__ = "1.5"

picoboot/picoboot.py

@@ -23,7 +23,7 @@ import usb.core
 import usb.util
 import struct
 import itertools
-from .utils import uint_to_int
+from .utils import uint_to_int, crc32_ieee
 from .core.enums import NamedIntEnum
 from .picobootmonitor import PicoBootMonitor, PicoBootMonitorObserver
 from .core.log import get_logger
@@ -134,6 +134,7 @@ class Platform(NamedIntEnum):
 
 class Addresses(NamedIntEnum):
     BOOTROM_MAGIC = 0x00000010
+    PHYMARKER     = 0x10100000
 
 class PicoBoot:
 
@@ -277,19 +278,30 @@ class PicoBoot:
     def has_device(self):
         return self.dev is not None
 
-    @property
-    def serial_number(self) -> int:
-        s = usb.util.get_string(self.dev, self.dev.iSerialNumber)
-        return int(s, 16)
-
     @property
     def serial_number_str(self) -> str:
         try:
-            s = usb.util.get_string(self.dev, self.dev.iSerialNumber)
+            s = None
+            if self.platform == Platform.RP2040:
+                r = self.flash_read(Addresses.PHYMARKER, 24)
+                magic = struct.unpack_from("<Q", r, 0)[0]
+                if (magic == 0x5049434F4B455953):  # "PICOKEYS"
+                    crc32 = crc32_ieee(r[0:20])
+                    if crc32 == struct.unpack_from("<I", r, 20)[0]:
+                        s = hexlify(r[12:20]).decode().upper()
+            if not s:
+                s = usb.util.get_string(self.dev, self.dev.iSerialNumber)
         except Exception:
             s = "unknown"
         return s
 
+    @property
+    def serial_number(self) -> int:
+        if self.dev is None:
+            raise PicoBootInvalidStateError("Device not connected")
+        s = self.serial_number_str
+        return int(s, 16)
+
     def interface_reset(self) -> None:
         logger.debug("Resetting interface...")
         self.dev.ctrl_transfer(

picoboot/utils.py

@@ -22,4 +22,18 @@ def uint_to_int(value: int, bits: int = 8) -> int:
     mask = (1 << bits) - 1
     value &= mask                     # ensure value fits in `bits`
     sign_bit = 1 << (bits - 1)
-    return value - (1 << bits) if (value & sign_bit) else value
+    return value - (1 << bits) if (value & sign_bit) else value
+
+def crc32_ieee(data: bytes) -> int:
+    crc = 0xFFFFFFFF
+
+    for b in data:
+        crc ^= b
+        for _ in range(8):
+            if crc & 1:
+                crc = (crc >> 1) ^ 0xEDB88320
+            else:
+                crc >>= 1
+
+    return crc ^ 0xFFFFFFFF
+

{pypicoboot-1.4.dist-info → pypicoboot-1.5.dist-info}/METADATA

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

{pypicoboot-1.4.dist-info → pypicoboot-1.5.dist-info}/RECORD

@@ -1,14 +1,14 @@
 picoboot/__init__.py,sha256=c49mZU1EUgBbiMUKo7sLsZE4u1RKmBXjXHmCSgeM5vw,168
-picoboot/_version.py,sha256=tWPsQhFrjT59dLP64luJ8y6WZADnjkMctyD_4fue4Uk,776
-picoboot/picoboot.py,sha256=_4p7rWr8ck-laYc1Jh-HHsqtoNFRVqzHDP46HRcnN4c,26358
+picoboot/_version.py,sha256=S-eokld2tlibADYtsq4K91uxjtIu6SYu30ozInVJoBU,776
+picoboot/picoboot.py,sha256=Q1Ur-4-Dv-cepL-Qd4S6PUtrp1srD0kWJeQLHLjp_k8,26925
 picoboot/picobootmonitor.py,sha256=3msEP2S8ZS7P8QVgKpq9Z9Rcud78XygmG1_0L_OZOvs,2443
-picoboot/utils.py,sha256=SjpAoPZrgyD9Ws7NIFVBHt0zPOb8Lpu2_lsmfeT2rXE,1083
+picoboot/utils.py,sha256=7dtF_QEXGLuJispFlrotOuTeyU5FiK26759108k_H8w,1350
 picoboot/core/__init__.py,sha256=c1kJprnljn0eP1NR3wEw-wJSCSxSRF3DA2jF5MowHXk,57
 picoboot/core/enums.py,sha256=ugXS-dbdnusLib_ge0vT1OugHVG9ZjJfpUR073MhwdQ,1353
 picoboot/core/exceptions.py,sha256=AXilq0ViaXyA6Ls9aGx6DHE9TQyPacQbwnHBXgFD3EQ,909
 picoboot/core/log.py,sha256=XWtN_hgmOtvpDMGDg-9f2BDLUe8elqUAbWti5yCJAA0,1768
 picoboot/tools/picotool.py,sha256=e2xjIxP5UZn9yfjxUWkJXq6KQHyw4YsGbuQbTauo0-Q,94
-pypicoboot-1.4.dist-info/METADATA,sha256=R9YQ9fgWbr5z2ITgJtM-BsRqgRQ8uSuyiyBLVcOY5Gs,41109
-pypicoboot-1.4.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-pypicoboot-1.4.dist-info/top_level.txt,sha256=sjegZQO5-kQdFOXXJHm0P7Hg1Nw4Ri0WKHnRYDTsa4I,9
-pypicoboot-1.4.dist-info/RECORD,,
+pypicoboot-1.5.dist-info/METADATA,sha256=-0G8dMhaIcb-IT3GY5N8_y2uDh4PYWqq0wE-AwvZLnU,41109
+pypicoboot-1.5.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pypicoboot-1.5.dist-info/top_level.txt,sha256=sjegZQO5-kQdFOXXJHm0P7Hg1Nw4Ri0WKHnRYDTsa4I,9
+pypicoboot-1.5.dist-info/RECORD,,