Merge pull request #878 from quartiq/miniconf-rev

fix miniconf rev

Cargo.toml

@@ -92,9 +92,11 @@ rev = "ccff77578925942e40e0a2c7b6d397ad164fdedb"
 
 [patch.crates-io.miniconf]
 git = "https://github.com/quartiq/miniconf"
+rev = "15c2bb9"
 
 [patch.crates-io.miniconf_mqtt]
 git = "https://github.com/quartiq/miniconf"
+rev = "15c2bb9"
 
 [features]
 nightly = []

hitl/loopback.py

@@ -85,17 +85,17 @@ async def test():
         """ The actual testing being completed. """
         prefix = args.prefix
         if not args.prefix:
-            devices = await miniconf.discover(args.broker, 'dt/sinara/dual-iir/+', 1)
+            devices = await miniconf.discover(args.broker, 'dt/sinara/dual-iir/+')
             if not devices:
                 raise Exception('No Stabilizer (Dual-iir) devices found')
             assert len(devices) == 1, \
                 f'Multiple Stabilizers found: {devices}. Please specify one with --prefix'
 
             prefix = devices.pop()
 
-        tele = await Telemetry.create(prefix, args.broker)
+        tele = await Telemetry.create(args.broker, prefix)
 
-        stabilizer = await miniconf.Miniconf.create(prefix, args.broker)
+        stabilizer = await miniconf.Miniconf.create(args.broker, prefix)
 
         # Disable IIR holds and configure the telemetry rate.
         await stabilizer.set('/allow_hold', False)

hitl/streaming.py

@@ -30,7 +30,7 @@ async def _main():
 
     prefix = args.prefix
     if not args.prefix:
-        devices = await miniconf.discover(args.broker, 'dt/sinara/dual-iir/+', 1)
+        devices = await miniconf.discover(args.broker, 'dt/sinara/dual-iir/+')
         if not devices:
             raise Exception('No Stabilizer (Dual-iir) devices found')
         assert len(devices) == 1, \
@@ -40,7 +40,7 @@ async def _main():
 
     logging.basicConfig(level=logging.INFO)
 
-    conf = await miniconf.Miniconf.create(prefix, args.broker)
+    conf = await miniconf.Miniconf.create(args.broker, prefix)
 
     stream_target = [int(x) for x in args.ip.split('.')]
     if ipaddress.ip_address(args.ip).is_unspecified:

py/setup.py

@@ -15,6 +15,6 @@
         "matplotlib",
         "gmqtt",
         # Keep this synced with the miniconf version in Cargo.toml
-        "miniconf-mqtt@git+https://github.com/quartiq/miniconf@v0.9.0#subdirectory=py/miniconf-mqtt",
+        "miniconf-mqtt@git+https://github.com/quartiq/miniconf@15c2bb9#subdirectory=py/miniconf-mqtt",
     ],
 )

py/stabilizer/iir_coefficients.py

@@ -294,7 +294,7 @@ def _main():
 
     async def configure():
         logger.info("Connecting to broker")
-        interface = await miniconf.Miniconf.create(prefix, args.broker)
+        interface = await miniconf.Miniconf.create(args.broker, prefix)
 
         # Set the filter coefficients.
         # Note: In the future, we will need to Handle higher-order cascades.

py/stabilizer/telemetry.py

@@ -22,7 +22,7 @@ class Telemetry:
     When the queue is full the oldest messages will be dropped.
     """
     @classmethod
-    async def create(cls, prefix, broker, maxsize=1):
+    async def create(cls, broker, prefix, maxsize=1):
         """
         Connect to the MQTT broker at `broker` and start listening for Stabilizer
         telemetry messages under the prefix `prefix`.