move the Modbus instance to the parent class
This commit is contained in:
@@ -42,7 +42,6 @@ class Talent(Message):
|
|||||||
self.contact_name = b''
|
self.contact_name = b''
|
||||||
self.contact_mail = b''
|
self.contact_mail = b''
|
||||||
self.db = InfosG3()
|
self.db = InfosG3()
|
||||||
self.mb = Modbus()
|
|
||||||
self.forward_modbus_resp = False
|
self.forward_modbus_resp = False
|
||||||
self.switch = {
|
self.switch = {
|
||||||
0x00: self.msg_contact_info,
|
0x00: self.msg_contact_info,
|
||||||
|
|||||||
@@ -60,7 +60,6 @@ class SolarmanV5(Message):
|
|||||||
self.snr = 0
|
self.snr = 0
|
||||||
self.db = InfosG3P()
|
self.db = InfosG3P()
|
||||||
self.time_ofs = 0
|
self.time_ofs = 0
|
||||||
self.mb = Modbus()
|
|
||||||
self.forward_modbus_resp = False
|
self.forward_modbus_resp = False
|
||||||
self.switch = {
|
self.switch = {
|
||||||
|
|
||||||
|
|||||||
@@ -3,8 +3,10 @@ import weakref
|
|||||||
|
|
||||||
if __name__ == "app.src.messages":
|
if __name__ == "app.src.messages":
|
||||||
from app.src.infos import Infos
|
from app.src.infos import Infos
|
||||||
|
from app.src.modbus import Modbus
|
||||||
else: # pragma: no cover
|
else: # pragma: no cover
|
||||||
from infos import Infos
|
from infos import Infos
|
||||||
|
from modbus import Modbus
|
||||||
|
|
||||||
logger = logging.getLogger('msg')
|
logger = logging.getLogger('msg')
|
||||||
|
|
||||||
@@ -58,6 +60,9 @@ class Message(metaclass=IterRegistry):
|
|||||||
self._registry.append(weakref.ref(self))
|
self._registry.append(weakref.ref(self))
|
||||||
|
|
||||||
self.server_side = server_side
|
self.server_side = server_side
|
||||||
|
if server_side:
|
||||||
|
self.mb = Modbus()
|
||||||
|
|
||||||
self.header_valid = False
|
self.header_valid = False
|
||||||
self.header_len = 0
|
self.header_len = 0
|
||||||
self.data_len = 0
|
self.data_len = 0
|
||||||
|
|||||||
Reference in New Issue
Block a user