uphy-controller 0.1.0.dev2794__tar.gz → 0.1.0.dev2895__tar.gz

{uphy_controller-0.1.0.dev2794/src/uphy_controller.egg-info → uphy_controller-0.1.0.dev2895}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: uphy-controller
-Version: 0.1.0.dev2794
+Version: 0.1.0.dev2895
 Summary: Add your description here
 License: Copyright rt-labs AB, Sweden.
         All rights reserved.
@@ -15,7 +15,8 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: dearpygui>=2.0.0
-Requires-Dist: pymodbus>=3.7.3
+Requires-Dist: pymodbus<3.9.0,>=3.8.3
+Requires-Dist: requests>=2.32.3
 Requires-Dist: rich>=13.9.2
 Requires-Dist: typer>=0.12.5
 Requires-Dist: zeroconf>=0.135.0
@@ -26,7 +27,7 @@ This contain a python based U-Phy device controller that act as a fieldbus maste
 
 Supported fieldbuses:
 
-- modbus-tcp
+- modbus
 
 ## Install
 
@@ -38,5 +39,12 @@ uv pip install uphy-controller
 
 ```sh
 # Start up controller against an existing device
-uphy-controller modbus-tcp --model [PATH_TO_MODEL] --target [UUID]:[HOST]:[PORT]
+uphy-controller modbus --model [PATH_TO_MODEL] --target [UUID]:[HOST]:[PORT]
+```
+
+
+```sh
+# Start up controller against discovered devices that expose their model via
+# mdns.
+uphy-controller mdns
 ```

{uphy_controller-0.1.0.dev2794 → uphy_controller-0.1.0.dev2895}/README.md

@@ -4,7 +4,7 @@ This contain a python based U-Phy device controller that act as a fieldbus maste
 
 Supported fieldbuses:
 
-- modbus-tcp
+- modbus
 
 ## Install
 
@@ -16,5 +16,12 @@ uv pip install uphy-controller
 
 ```sh
 # Start up controller against an existing device
-uphy-controller modbus-tcp --model [PATH_TO_MODEL] --target [UUID]:[HOST]:[PORT]
+uphy-controller modbus --model [PATH_TO_MODEL] --target [UUID]:[HOST]:[PORT]
+```
+
+
+```sh
+# Start up controller against discovered devices that expose their model via
+# mdns.
+uphy-controller mdns
 ```

{uphy_controller-0.1.0.dev2794 → uphy_controller-0.1.0.dev2895}/pyproject.toml

@@ -1,12 +1,13 @@
 [project]
 name = "uphy-controller"
-version = "0.1.0.dev2794"
+version = "0.1.0.dev2895"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
     "dearpygui>=2.0.0",
-    "pymodbus>=3.7.3",
+    "pymodbus (>=3.8.3,<3.9.0)",
+    "requests>=2.32.3",
     "rich>=13.9.2",
     "typer>=0.12.5",
     "zeroconf>=0.135.0",

{uphy_controller-0.1.0.dev2794 → uphy_controller-0.1.0.dev2895}/src/uphy/controller/__main__.py

@@ -30,7 +30,7 @@ def parse_target(value: str):
     return Target(*value.split(":"))
 
 
-@app.command()
+@app.command(name="modbus")
 def modbus_tcp(
     model: Annotated[list[Path], Option()],
     target: Annotated[
@@ -42,10 +42,11 @@ def modbus_tcp(
         ),
     ] = None,
 ):
+    """Run controller against a set of fixed uphy devices."""
     models = [RootModel.parse_file(file) for file in model]
 
     devices_by_id = {
-        device.id: (root, device) for root in models for device in root.devices
+        str(device.id): (root, device) for root in models for device in root.devices
     }
 
     devices_by_name = {
@@ -57,8 +58,8 @@ def modbus_tcp(
         table.add_column("ID")
         table.add_column("Name")
 
-        for _, device in devices_by_id.values():
-            table.add_row(str(device.id), device.name)
+        for id, (_, device) in devices_by_id.items():
+            table.add_row(id, device.name)
 
         print(table)
         print()
@@ -78,6 +79,7 @@ def modbus_tcp(
                 root, device = devices_by_name.get(target_obj.id, (None, None))
                 if not device:
                     LOG.warning("Unable to find device %s", target_obj.id)
+                    continue
 
             device_gui = gui.add_device(
                 root, device, f"{target_obj.host}:{target_obj.port}"
@@ -96,6 +98,7 @@ def modbus_tcp(
 
 @app.command()
 def mdns():
+    """Run controller against devices automatically discovered via mdns."""
     from zeroconf import (
         Zeroconf,
         ServiceBrowser,

{uphy_controller-0.1.0.dev2794 → uphy_controller-0.1.0.dev2895}/src/uphy/controller/modbus.py

@@ -51,7 +51,7 @@ def target_runner(stop: Event, target: Target, device_gui: gui.DeviceGUI):
                     index = base
                     base += count
                     try:
-                        response = client.read_holding_registers(index, count)
+                        response = client.read_holding_registers(index, count=count)
                         if response.isError():
                             raise pymodbus.ModbusException("Error")
                     except pymodbus.exceptions.ConnectionException:

{uphy_controller-0.1.0.dev2794 → uphy_controller-0.1.0.dev2895/src/uphy_controller.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: uphy-controller
-Version: 0.1.0.dev2794
+Version: 0.1.0.dev2895
 Summary: Add your description here
 License: Copyright rt-labs AB, Sweden.
         All rights reserved.
@@ -15,7 +15,8 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: dearpygui>=2.0.0
-Requires-Dist: pymodbus>=3.7.3
+Requires-Dist: pymodbus<3.9.0,>=3.8.3
+Requires-Dist: requests>=2.32.3
 Requires-Dist: rich>=13.9.2
 Requires-Dist: typer>=0.12.5
 Requires-Dist: zeroconf>=0.135.0
@@ -26,7 +27,7 @@ This contain a python based U-Phy device controller that act as a fieldbus maste
 
 Supported fieldbuses:
 
-- modbus-tcp
+- modbus
 
 ## Install
 
@@ -38,5 +39,12 @@ uv pip install uphy-controller
 
 ```sh
 # Start up controller against an existing device
-uphy-controller modbus-tcp --model [PATH_TO_MODEL] --target [UUID]:[HOST]:[PORT]
+uphy-controller modbus --model [PATH_TO_MODEL] --target [UUID]:[HOST]:[PORT]
+```
+
+
+```sh
+# Start up controller against discovered devices that expose their model via
+# mdns.
+uphy-controller mdns
 ```

{uphy_controller-0.1.0.dev2794 → uphy_controller-0.1.0.dev2895}/src/uphy_controller.egg-info/requires.txt

@@ -1,5 +1,6 @@
 dearpygui>=2.0.0
-pymodbus>=3.7.3
+pymodbus<3.9.0,>=3.8.3
+requests>=2.32.3
 rich>=13.9.2
 typer>=0.12.5
 zeroconf>=0.135.0