pypicoboot 1.4__tar.gz → 1.5__tar.gz

{pypicoboot-1.4 → pypicoboot-1.5}/PKG-INFO

@@ -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 → pypicoboot-1.5}/picoboot/_version.py

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

{pypicoboot-1.4 → pypicoboot-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(

{pypicoboot-1.4 → pypicoboot-1.5}/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 → pypicoboot-1.5}/pypicoboot.egg-info/PKG-INFO

@@ -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