sdwire 0.2.0__tar.gz → 0.2.2__tar.gz

{sdwire-0.2.0 → sdwire-0.2.2}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: sdwire
-Version: 0.2.0
-Summary: CLI application to interact with Badgerd SDWire Gen2 devices
+Version: 0.2.2
+Summary: CLI application to interact with Badgerd SDWire devices
 License: GPL-3
 Author: Talha Can Havadar
 Author-email: havadartalha@gmail.com
@@ -56,6 +56,21 @@ Commands:
   ts      ts/host => connects the sdcard interface to host machine
 ```
 
+## Installing
+
+Using pip
+
+```
+pip install sdwire
+```
+
+Using apt
+
+```
+sudo add-apt-repository ppa:tchavadar/badgerd
+sudo apt install python3-sdwire
+```
+
 ## Listing SDWire Devices
 
 `sdwire list` command will search through usb devices connected to the system

{sdwire-0.2.0 → sdwire-0.2.2}/README.md

@@ -38,6 +38,21 @@ Commands:
   ts      ts/host => connects the sdcard interface to host machine
 ```
 
+## Installing
+
+Using pip
+
+```
+pip install sdwire
+```
+
+Using apt
+
+```
+sudo add-apt-repository ppa:tchavadar/badgerd
+sudo apt install python3-sdwire
+```
+
 ## Listing SDWire Devices
 
 `sdwire list` command will search through usb devices connected to the system

{sdwire-0.2.0 → sdwire-0.2.2}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "sdwire"
-version = "0.2.0"
-description = "CLI application to interact with Badgerd SDWire Gen2 devices"
+version = "0.2.2"
+description = "CLI application to interact with Badgerd SDWire devices"
 authors = ["Talha Can Havadar <havadartalha@gmail.com>"]
 license = "GPL-3"
 readme = "README.md"

{sdwire-0.2.0 → sdwire-0.2.2}/sdwire/backend/detect.py

@@ -4,7 +4,7 @@ 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
 
@@ -46,20 +46,41 @@ 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] = usb.core.find(find_all=True)
+    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
+        try:
+            product = device.idProduct
+            vendor = device.idVendor
+            serial = (
+                usb.util.get_string(device, device.iSerialNumber, None)
+                + f"{device.bus}{device.port_number}"
+            )
+            manufacturer = device.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:
             result.append(
                 SDWire(
-                    port_info=PortInfo(
-                        p.device, p.product, p.manufacturer, p.serial_number, p
-                    )
+                    port_info=PortInfo(device, product, vendor, serial, device),
+                    generation=SDWIRE_GENERATION_SDWIRE3,
                 )
             )
     # Search for legacy SDWireC devices

sdwire-0.2.2/sdwire/backend/device/sdwire.py

@@ -0,0 +1,40 @@
+import logging
+from serial import Serial
+from .usb_device import USBDevice, PortInfo
+
+log = logging.getLogger(__name__)
+
+SDWIRE_GENERATION_SDWIRE3 = 2
+
+
+class SDWire(USBDevice):
+
+    def __init__(self, port_info: PortInfo, generation: int):
+        super().__init__(port_info)
+        self.generation = generation
+
+    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,
+            )
+
+    def __str__(self):
+        return f"{self.serial_string}\t[{int(self.manufacturer_string):04x}::{int(self.product_string):04x}]"
+
+    def __repr__(self):
+        return self.__str__()

{sdwire-0.2.0 → sdwire-0.2.2}/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.0 → sdwire-0.2.2}/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.0/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__()