sdwire 0.2.3__py3-none-any.whl → 0.2.5__py3-none-any.whl

sdwire/backend/detect.py

@@ -1,7 +1,5 @@
 import logging
 from typing import List
-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, SDWIRE_GENERATION_SDWIRE3
@@ -47,7 +45,6 @@ def get_sdwirec_devices() -> List[SDWireC]:
 
 
 def get_sdwire_devices() -> List[SDWire]:
-
     # Badgerd SDWire3
     # VID = 0bda PID = 0316
     # Badgerd SDWireC
@@ -62,20 +59,17 @@ def get_sdwire_devices() -> List[SDWire]:
         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)
+            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 = ""
+            serial = f"{device.get('ID_USB_SERIAL_SHORT')}:{bus}.{address}"
         except Exception as e:
             log.debug(
                 "not able to get usb product, serial_number and manufacturer information, err: %s",

sdwire/backend/device/sdwire.py

@@ -1,5 +1,4 @@
 import logging
-from serial import Serial
 from .usb_device import USBDevice, PortInfo
 
 log = logging.getLogger(__name__)
@@ -13,12 +12,12 @@ class SDWire(USBDevice):
     def __init__(self, port_info: PortInfo, generation: int):
         super().__init__(port_info)
         self.generation = generation
-        for sibling in self.dev_string.parent.children:
+        for child in self.dev_string.children:
             if (
-                self.dev_string.device_path != sibling.device_path
-                and sibling.device_type == "disk"
+                self.dev_string.device_path != child.device_path
+                and child.device_type == "disk"
             ):
-                self.__block_dev = f"/dev/{sibling.device_path.split("/")[-1]}"
+                self.__block_dev = f"/dev/{child.device_path.split('/')[-1]}"
                 break
 
     def switch_ts(self):

sdwire/backend/device/sdwirec.py

@@ -1,6 +1,5 @@
 import logging
 from pyftdi.ftdi import Ftdi
-from serial import Serial
 from .usb_device import USBDevice, PortInfo
 
 log = logging.getLogger(__name__)
@@ -19,7 +18,7 @@ class SDWireC(USBDevice):
                         d.device_path != sibling.device_path
                         and sibling.device_type == "disk"
                     ):
-                        self.__block_dev = f"/dev/{sibling.device_path.split("/")[-1]}"
+                        self.__block_dev = f"/dev/{sibling.device_path.split('/')[-1]}"
                         break
                 break
 

sdwire/backend/device/usb_device.py

@@ -1,6 +1,5 @@
 from collections import namedtuple
 import pyudev
-from serial.tools.list_ports_common import ListPortInfo
 
 PortInfo = namedtuple(
     "PortInfo", ("device", "product", "manufacturer", "serial", "usb_device")

sdwire/backend/utils.py

@@ -20,9 +20,11 @@ def handle_switch_target_command(ctx):
 
 def handle_switch_off_command(ctx):
     device = ctx.obj["device"]
-    if isinstance(device, SDWireC):
-        log.info("SDWireC or legacy sdwire devices dont have off functionality")
-        print("SDWireC dont have off functionality")
+    if isinstance(device, SDWireC) or isinstance(device, SDWire):
+        log.info(
+            "SDWire3, SDWireC or legacy sdwire devices dont have off functionality"
+        )
+        print("SDWireC and SDWire3 dont have off functionality implemented")
         sys.exit(1)
 
 

sdwire/main.py

@@ -3,7 +3,6 @@ import logging
 import click
 from .backend import utils
 from .backend import detect
-from .backend.device.sdwire import SDWire
 
 
 @click.group()
@@ -15,7 +14,7 @@ def main(debug=None):
 
 @main.command()
 def list():
-    print(f"Serial\t\t\tProduct Info\t\tBlock Dev")
+    print("Serial\t\t\tProduct Info\t\tBlock Dev")
     for sdwire in detect.get_sdwire_devices():
         print(sdwire)
 
@@ -90,10 +89,5 @@ def off(ctx: click.Context):
     utils.handle_switch_off_command(ctx)
 
 
-# investigate further to use click in circuitpython
-# def invoke():
-#     main.main("switch ts".split(), "sdwire", "_SDWIRE_COMPLETE")
-
-
 if __name__ == "__main__":
     main()

{sdwire-0.2.3.dist-info → sdwire-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sdwire
-Version: 0.2.3
+Version: 0.2.5
 Summary: CLI application to interact with Badgerd SDWire devices
 License: GPL-3
 Author: Talha Can Havadar
@@ -9,12 +9,10 @@ Requires-Python: >=3.12,<4.0
 Classifier: License :: Other/Proprietary License
 Classifier: Programming Language :: Python :: 3
 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: pyftdi (>=0.56.0,<0.57.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
 
 # CLI for Badgerd SDWire Devices

sdwire-0.2.5.dist-info/RECORD

@@ -0,0 +1,14 @@
+sdwire/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sdwire/backend/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+sdwire/backend/detect.py,sha256=jiQ2JS9sMGUuymwyUO4FaGzIkXK3J7Ci45V1X8c94b4,2931
+sdwire/backend/device/sdwire.py,sha256=nhjBjmxjjaM_rGYyXXdjr_85lEGny7c7-BC3KVcWoz4,1503
+sdwire/backend/device/sdwirec.py,sha256=imkj2ObrgowiM7DP9TnVbCES-8bju0T69Qzdw5OURgE,1657
+sdwire/backend/device/usb_device.py,sha256=5sdyOyPikIpFydKywzDkvvgLHFdMcsBC8tKosHRhfvQ,808
+sdwire/backend/utils.py,sha256=kMEyBbRO91REgvgICuBONGiImO6jTr6EpqkZaxQH4aU,1507
+sdwire/constants.py,sha256=s5mCx5NlJUM3aBbCPq2y3oOFoPPJ5wA3BR1snyK-cMg,119
+sdwire/main.py,sha256=G1WaVd4kBR3bTfbmHekjx1yObiz4f1NLGqznFepd2NY,2132
+sdwire-0.2.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+sdwire-0.2.5.dist-info/METADATA,sha256=OfCzihIvL2GUz8NhN-brLXW2EjUBZrp5Ov8HeUOXX4Q,3104
+sdwire-0.2.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+sdwire-0.2.5.dist-info/entry_points.txt,sha256=pxy0zJKVcNWXPk5PtNjTLExOBpqFNth37wtdYdYRXCE,43
+sdwire-0.2.5.dist-info/RECORD,,

sdwire-0.2.3.dist-info/RECORD

@@ -1,14 +0,0 @@
-sdwire/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sdwire/backend/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sdwire/backend/detect.py,sha256=5lvoMjgBSAp9egNP7HwsdVAAEoA92_tw7YqcYtNKiSo,3135
-sdwire/backend/device/sdwire.py,sha256=LevVtz-RkvuJLAxSVok9ftpfIw-HrFSckltg6ur6TIU,1544
-sdwire/backend/device/sdwirec.py,sha256=62g8ujRXRj7PEJZPNXAUWiVUOqDcyQ8bwSWvQN2YDDw,1683
-sdwire/backend/device/usb_device.py,sha256=udfCkHZxnLX4m3FwsVuN04e1S4bA3BWBs7t7Kct_k5I,864
-sdwire/backend/utils.py,sha256=D_eO9LiMCWM9UPPumXfmqY30UxsHn-PvpURKJYFdmEY,1422
-sdwire/constants.py,sha256=s5mCx5NlJUM3aBbCPq2y3oOFoPPJ5wA3BR1snyK-cMg,119
-sdwire/main.py,sha256=HVXRAVj2VKkzIeH0ghW9z3VytdaiaB3dQlXFcIFc3xU,2312
-sdwire-0.2.3.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-sdwire-0.2.3.dist-info/METADATA,sha256=czV1BkIDgIjRCp4VcbTvAzRbSfh0FHG7sLcFZ2Y7FWE,3198
-sdwire-0.2.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-sdwire-0.2.3.dist-info/entry_points.txt,sha256=pxy0zJKVcNWXPk5PtNjTLExOBpqFNth37wtdYdYRXCE,43
-sdwire-0.2.3.dist-info/RECORD,,