From 4b2f39665cde50ebd7fbb8d8249bc4b2a648a1af Mon Sep 17 00:00:00 2001 From: Benjamin Braatz Date: Wed, 15 Dec 2021 00:03:04 +0100 Subject: [PATCH] Use new-style register. --- controlpi_plugins/modbus.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/controlpi_plugins/modbus.py b/controlpi_plugins/modbus.py index 85cf16b..1476595 100644 --- a/controlpi_plugins/modbus.py +++ b/controlpi_plugins/modbus.py @@ -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: -- 2.34.1