sdwire 0.2.1__tar.gz → 0.2.3__tar.gz

{sdwire-0.2.1 → sdwire-0.2.3}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: sdwire
-Version: 0.2.1
-Summary: CLI application to interact with Badgerd SDWire Gen2 devices
+Version: 0.2.3
+Summary: CLI application to interact with Badgerd SDWire devices
 License: GPL-3
 Author: Talha Can Havadar
 Author-email: havadartalha@gmail.com
@@ -12,6 +12,7 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: adafruit-board-toolkit (>=1.1.1,<2.0.0)
 Requires-Dist: click (>=8.1.7,<9.0.0)
 Requires-Dist: pyftdi (>=0.55.4,<0.56.0)
+Requires-Dist: pyudev (>=0.24.3,<0.25.0)
 Requires-Dist: pyusb (>=1.2.1,<2.0.0)
 Requires-Dist: semver (>=3.0.2,<4.0.0)
 Description-Content-Type: text/markdown

{sdwire-0.2.1 → sdwire-0.2.3}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "sdwire"
-version = "0.2.1"
-description = "CLI application to interact with Badgerd SDWire Gen2 devices"
+version = "0.2.3"
+description = "CLI application to interact with Badgerd SDWire devices"
 authors = ["Talha Can Havadar <havadartalha@gmail.com>"]
 license = "GPL-3"
 readme = "README.md"
@@ -14,6 +14,7 @@ adafruit-board-toolkit = "^1.1.1"
 semver = "^3.0.2"
 pyusb = "^1.2.1"
 pyftdi = "^0.55.4"
+pyudev = "^0.24.3"
 
 
 [tool.poetry.group.dev.dependencies]

{sdwire-0.2.1 → sdwire-0.2.3}/sdwire/backend/detect.py

@@ -4,10 +4,11 @@ from adafruit_board_toolkit import circuitpython_serial as cpserial
 from serial.tools.list_ports_common import ListPortInfo
 
 from sdwire import constants
-from .device.sdwire import SDWire
+from .device.sdwire import SDWire, SDWIRE_GENERATION_SDWIRE3
 from .device.sdwirec import SDWireC
 from .device.usb_device import PortInfo
 
+import pyudev
 import usb.core
 import usb.util
 from usb.core import Device
@@ -46,20 +47,49 @@ def get_sdwirec_devices() -> List[SDWireC]:
 
 
 def get_sdwire_devices() -> List[SDWire]:
-    ports = cpserial.data_comports()
 
-    # Badgerd SDWire Gen2
-    # VID = 0x1209 PID = 0x2404
+    # Badgerd SDWire3
+    # VID = 0bda PID = 0316
     # Badgerd SDWireC
     # VID = 0x04e8 PID = 0x6001
     result = []
-    for p in ports:
-        if p.vid == constants.SDWIRE_GEN2_VID and p.pid == constants.SDWIRE_GEN2_PID:
+    devices: List[Device] = pyudev.Context().list_devices(
+        subsystem="usb",
+        ID_VENDOR_ID=f"{constants.SDWIRE3_VID:04x}",
+        ID_MODEL_ID=f"{constants.SDWIRE3_PID:04x}",
+    )
+    if not devices:
+        log.info("no usb devices found while searching for SDWire..")
+        return []
+
+    device_list = []
+    for device in devices:
+        product = None
+        serial = None
+        manufacturer = None
+        bus = None
+        address = None
+        try:
+            product = int(f"0x{device.get("ID_MODEL_ID")}", 16)
+            vendor = int(f"0x{device.get("ID_VENDOR_ID")}", 16)
+            bus = int(device.get("BUSNUM"))
+            address = int(device.get("DEVNUM"))
+            serial = f"{device.get("ID_USB_SERIAL_SHORT")}:{bus}.{address}"
+            manufacturer = ""
+        except Exception as e:
+            log.debug(
+                "not able to get usb product, serial_number and manufacturer information, err: %s",
+                e,
+            )
+
+        if product == constants.SDWIRE3_PID and vendor == constants.SDWIRE3_VID:
+            usb_device: List[Device] = usb.core.find(
+                idVendor=vendor, idProduct=product, bus=bus, address=address
+            )
             result.append(
                 SDWire(
-                    port_info=PortInfo(
-                        p.device, p.product, p.manufacturer, p.serial_number, p
-                    )
+                    port_info=PortInfo(device, product, vendor, serial, usb_device),
+                    generation=SDWIRE_GENERATION_SDWIRE3,
                 )
             )
     # Search for legacy SDWireC devices

sdwire-0.2.3/sdwire/backend/device/sdwire.py

@@ -0,0 +1,52 @@
+import logging
+from serial import Serial
+from .usb_device import USBDevice, PortInfo
+
+log = logging.getLogger(__name__)
+
+SDWIRE_GENERATION_SDWIRE3 = 2
+
+
+class SDWire(USBDevice):
+    __block_dev = None
+
+    def __init__(self, port_info: PortInfo, generation: int):
+        super().__init__(port_info)
+        self.generation = generation
+        for sibling in self.dev_string.parent.children:
+            if (
+                self.dev_string.device_path != sibling.device_path
+                and sibling.device_type == "disk"
+            ):
+                self.__block_dev = f"/dev/{sibling.device_path.split("/")[-1]}"
+                break
+
+    def switch_ts(self):
+        try:
+            self.usb_device.attach_kernel_driver(0)
+            self.usb_device.reset()
+        except Exception as e:
+            log.debug(
+                "not able to switch to ts mode. Device might be already in ts mode, err: %s",
+                e,
+            )
+
+    def switch_dut(self):
+        try:
+            self.usb_device.detach_kernel_driver(0)
+            self.usb_device.reset()
+        except Exception as e:
+            log.debug(
+                "not able to switch to dut mode. Device might be already in dut mode, err: %s",
+                e,
+            )
+
+    @property
+    def block_dev(self):
+        return self.__block_dev
+
+    def __str__(self):
+        return f"{self.serial_string}\t[{int(self.manufacturer_string):04x}::{int(self.product_string):04x}]\t\t{self.block_dev}"
+
+    def __repr__(self):
+        return self.__str__()

{sdwire-0.2.1 → sdwire-0.2.3}/sdwire/backend/device/sdwirec.py

@@ -7,18 +7,32 @@ log = logging.getLogger(__name__)
 
 
 class SDWireC(USBDevice):
+    __block_dev = None
 
     def __init__(self, port_info: PortInfo):
         super().__init__(port_info)
+        for d in self._pyudev_context.list_devices(ID_MODEL="sd-wire"):
+            d_serial = d.get("ID_USB_SERIAL_SHORT", None)
+            if d_serial is not None and d_serial == self.serial_string:
+                for sibling in d.parent.children:
+                    if (
+                        d.device_path != sibling.device_path
+                        and sibling.device_type == "disk"
+                    ):
+                        self.__block_dev = f"/dev/{sibling.device_path.split("/")[-1]}"
+                        break
+                break
 
     def __str__(self):
-        return (
-            f"{self.serial_string}\t[{self.product_string}::{self.manufacturer_string}]"
-        )
+        return f"{self.serial_string}\t[{self.product_string}::{self.manufacturer_string}]\t{self.block_dev}"
 
     def __repr__(self):
         return self.__str__()
 
+    @property
+    def block_dev(self):
+        return self.__block_dev
+
     def switch_ts(self):
         self._set_sdwire(1)
 

{sdwire-0.2.1 → sdwire-0.2.3}/sdwire/backend/device/usb_device.py

@@ -1,4 +1,5 @@
 from collections import namedtuple
+import pyudev
 from serial.tools.list_ports_common import ListPortInfo
 
 PortInfo = namedtuple(
@@ -8,9 +9,11 @@ PortInfo = namedtuple(
 
 class USBDevice:
     __port_info = None
+    _pyudev_context = None
 
     def __init__(self, port_info: PortInfo):
         self.__port_info = port_info
+        self._pyudev_context = pyudev.Context()
 
     @property
     def usb_device(self):

{sdwire-0.2.1 → sdwire-0.2.3}/sdwire/backend/utils.py

@@ -10,14 +10,12 @@ log = logging.getLogger(__name__)
 
 def handle_switch_host_command(ctx):
     device = ctx.obj["device"]
-    if isinstance(device, SDWireC):
-        device.switch_ts()
+    device.switch_ts()
 
 
 def handle_switch_target_command(ctx):
     device = ctx.obj["device"]
-    if isinstance(device, SDWireC):
-        device.switch_dut()
+    device.switch_dut()
 
 
 def handle_switch_off_command(ctx):
@@ -50,7 +48,3 @@ def handle_switch_command(ctx, serial):
             raise click.UsageError(
                 f"There is no such sdwire device connected with serial={serial}"
             )
-
-    device = ctx.obj["device"]
-    if isinstance(device, SDWire):
-        device.invoke(" ".join(sys.argv[1:]))

{sdwire-0.2.1 → sdwire-0.2.3}/sdwire/constants.py

@@ -1,5 +1,5 @@
-SDWIRE_GEN2_VID = 0x1209
-SDWIRE_GEN2_PID = 0x2404
+SDWIRE3_VID = 0x0BDA
+SDWIRE3_PID = 0x0316
 SDWIREC_VID = 0x04E8
 SDWIREC_PID = 0x6001
 SDWIREC_PRODUCT_STRING = "sd-wire"

{sdwire-0.2.1 → sdwire-0.2.3}/sdwire/main.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+import logging
 import click
 from .backend import utils
 from .backend import detect
@@ -6,14 +7,15 @@ from .backend.device.sdwire import SDWire
 
 
 @click.group()
-def main():
-    pass
+@click.option("--debug", required=False, is_flag=True, help="Enable debug output")
+def main(debug=None):
+    if debug:
+        logging.basicConfig(level=logging.DEBUG)
 
 
 @main.command()
 def list():
-
-    print(f"Serial\t\t\tProduct Info")
+    print(f"Serial\t\t\tProduct Info\t\tBlock Dev")
     for sdwire in detect.get_sdwire_devices():
         print(sdwire)
 

sdwire-0.2.1/sdwire/backend/device/sdwire.py

@@ -1,25 +0,0 @@
-from serial import Serial
-from .usb_device import USBDevice, PortInfo
-
-
-class SDWire(USBDevice):
-
-    def __init__(self, port_info: PortInfo):
-        super().__init__(port_info)
-
-    @property
-    def serial_string(self) -> str:
-        return "sdwire_gen2_101"
-
-    def invoke(self, command: str) -> None:
-        with Serial(self.dev_string) as channel:
-            channel.timeout = 0.05
-            data = command.encode() + b"\n"
-            print(f"data={data}")
-            channel.write(data)
-
-    def __str__(self):
-        return f"{self.serial_string}\t\t[{self.product_string}::{self.manufacturer_string}]"
-
-    def __repr__(self):
-        return self.__str__()