From 036af8e127f8fbfd2743551d7cadf9fead36d3be Mon Sep 17 00:00:00 2001 From: Stefan Allius Date: Mon, 13 May 2024 19:49:00 +0200 Subject: [PATCH] move the Modbus instance to the parent class --- app/src/gen3/talent.py | 1 - app/src/gen3plus/solarman_v5.py | 1 - app/src/messages.py | 5 +++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/gen3/talent.py b/app/src/gen3/talent.py index c007295..976d468 100644 --- a/app/src/gen3/talent.py +++ b/app/src/gen3/talent.py @@ -42,7 +42,6 @@ class Talent(Message): self.contact_name = b'' self.contact_mail = b'' self.db = InfosG3() - self.mb = Modbus() self.forward_modbus_resp = False self.switch = { 0x00: self.msg_contact_info, diff --git a/app/src/gen3plus/solarman_v5.py b/app/src/gen3plus/solarman_v5.py index 8e926ac..cd1e5d7 100644 --- a/app/src/gen3plus/solarman_v5.py +++ b/app/src/gen3plus/solarman_v5.py @@ -60,7 +60,6 @@ class SolarmanV5(Message): self.snr = 0 self.db = InfosG3P() self.time_ofs = 0 - self.mb = Modbus() self.forward_modbus_resp = False self.switch = { diff --git a/app/src/messages.py b/app/src/messages.py index 615c054..01e3429 100644 --- a/app/src/messages.py +++ b/app/src/messages.py @@ -3,8 +3,10 @@ import weakref if __name__ == "app.src.messages": from app.src.infos import Infos + from app.src.modbus import Modbus else: # pragma: no cover from infos import Infos + from modbus import Modbus logger = logging.getLogger('msg') @@ -58,6 +60,9 @@ class Message(metaclass=IterRegistry): self._registry.append(weakref.ref(self)) self.server_side = server_side + if server_side: + self.mb = Modbus() + self.header_valid = False self.header_len = 0 self.data_len = 0