Use new-style register.
authorBenjamin Braatz <bb@bbraatz.eu>
Tue, 14 Dec 2021 23:03:04 +0000 (00:03 +0100)
committerBenjamin Braatz <bb@bbraatz.eu>
Tue, 14 Dec 2021 23:03:04 +0000 (00:03 +0100)
controlpi_plugins/modbus.py

index 85cf16b019cbe084e481ef56300fd329ff2c58fd..1476595d4cc06f4346f4b68a42d9bb88ee4808db 100644 (file)
@@ -1202,8 +1202,8 @@ class ModbusMaster(BasePlugin):
         # Error messages:
         sends.append(MessageTemplate(
             {'event': {'const': 'error'}}))
-        self.bus.register(self.name, 'ModbusMaster',
-                          sends, receives, self._receive)
+        self.bus.register(self.name, 'ModbusMaster', sends,
+                          [(receives, self._receive)])
 
     async def _receive(self, message: Message) -> None:
         await self._queue.put(message)
@@ -1344,10 +1344,7 @@ class ModbusSlave(BasePlugin):
         sends = [MessageTemplate({'event': {'const': 'received'}}),
                  MessageTemplate({'event': {'const': 'crc error'}}),
                  MessageTemplate({'event': {'const': 'sent'}})]
-        self.bus.register(self.name, 'ModbusSlave', sends, [], self._receive)
-
-    async def _receive(self, message: Message) -> None:
-        pass
+        self.bus.register(self.name, 'ModbusSlave', sends, [])
 
     async def _process_request(self, modbus_request: bytes) -> bytes:
         if len(modbus_request) < 4: