Switch to libusb_package

Signed-off-by: Jos Verlinde <Jos_Verlinde@hotmail.com>

Author: Josverl

mpflash/flash/stm32_dfu.py

@@ -13,21 +13,22 @@ def init_libusb_windows():
     """
     Initializes the libusb backend on Windows and caches it module-wide.
 
+    Uses libusb_package, which bundles pre-built libusb shared libraries and
+    exposes a ready-to-use pyusb backend, removing the need to locate the DLL.
+
     Returns:
         The usb backend object if successful, None otherwise.
     """
     global _libusb_backend
     if _libusb_backend is not None:
         return _libusb_backend
+    try:
+        import libusb_package  # type: ignore
+    except ImportError:
+        log.error("libusb_package not found, please install it with 'pip install libusb-package'")
+        return None
 
-    import libusb  # type: ignore
-    import usb.backend.libusb1 as libusb1
-
-    arch = "x86_64" if platform.architecture()[0] == "64bit" else "x86"
-    libusb1_dll = Path(libusb.__file__).parent / "_platform" / "windows" / arch / "libusb-1.0.dll"
-    if not libusb1_dll.exists():
-        raise FileNotFoundError(f"libusb1.dll not found at {libusb1_dll}")
-    _libusb_backend = libusb1.get_backend(find_library=lambda x: libusb1_dll.as_posix())
+    _libusb_backend = libusb_package.get_libusb1_backend()
     return _libusb_backend
 
 
@@ -95,11 +96,11 @@ def flash_stm32_dfu(
     try:
         pydfu.list_dfu_devices(**kwargs)
     except ValueError as e:
-        log.error(f"Insuffient permissions to access usb DFU devices: {e}")
+        log.error(f"Insufficient permissions to access usb DFU devices: {e}")
         return None
 
     # Needs to be a list of serial ports
-    log.debug("Inititialize pydfu...")
+    log.debug("Initialize pydfu...")
     pydfu.init(**kwargs)
 
     if erase:

pyproject.toml

@@ -37,7 +37,6 @@ dependencies = [
     "questionary>=2.0.0",
     "jsonlines>=4.0.0",
     "jsons>=1.6.3",
-    "libusb>=1.0.27; sys_platform == 'win32'",
     "pywin32>=310; sys_platform == 'win32'",
     "loguru>=0.7.2",
     "mpremote>=1.22.0",
@@ -54,6 +53,7 @@ dependencies = [
     "tomli>=2.2.1",
     "pytest-cov>=7.0.0",
     "peewee>=4.0.3",
+    "libusb-package>=1.0.26.0; sys_platform == 'win32'",
 ]
 
 [project.optional-dependencies]