sv/tsun-gen3-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reduce code duplications

Browse Source
This commit is contained in:
Stefan Allius
2024-10-17 21:51:26 +02:00
parent 6122f40718
commit ce5bd6eb0a
3 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/gen3/talent.py
View File

@@ -205,16 +205,6 @@ class Talent(Message):
self.ifc.tx_log(log_lvl, f'Send Modbus {state}:{self.addr}:') self.ifc.tx_log(log_lvl, f'Send Modbus {state}:{self.addr}:')
self.ifc.tx_flush() self.ifc.tx_flush()
def _send_modbus_cmd(self, func, addr, val, log_lvl) -> None:
if self.state != State.up:
logger.log(log_lvl, f'[{self.node_id}] ignore MODBUS cmd,'
' as the state is not UP')
return
self.mb.build_msg(Modbus.INV_ADDR, func, addr, val, log_lvl)
async def send_modbus_cmd(self, func, addr, val, log_lvl) -> None:
self._send_modbus_cmd(func, addr, val, log_lvl)
def mb_timout_cb(self, exp_cnt): def mb_timout_cb(self, exp_cnt):
self.mb_timer.start(self.mb_timeout) self.mb_timer.start(self.mb_timeout)

10
app/src/gen3plus/solarman_v5.py
View File

@@ -435,16 +435,6 @@ class SolarmanV5(Message):
self.ifc.tx_log(log_lvl, f'Send Modbus {state}:{self.addr}:') self.ifc.tx_log(log_lvl, f'Send Modbus {state}:{self.addr}:')
self.ifc.tx_flush() self.ifc.tx_flush()
def _send_modbus_cmd(self, func, addr, val, log_lvl) -> None:
if self.state != State.up:
logger.log(log_lvl, f'[{self.node_id}] ignore MODBUS cmd,'
' as the state is not UP')
return
self.mb.build_msg(Modbus.INV_ADDR, func, addr, val, log_lvl)
async def send_modbus_cmd(self, func, addr, val, log_lvl) -> None:
self._send_modbus_cmd(func, addr, val, log_lvl)
def mb_timout_cb(self, exp_cnt): def mb_timout_cb(self, exp_cnt):
self.mb_timer.start(self.mb_timeout) self.mb_timer.start(self.mb_timeout)

10
app/src/messages.py
View File

@@ -152,6 +152,16 @@ class Message(ProtocolIfc):
to = self.MAX_DEF_IDLE_TIME to = self.MAX_DEF_IDLE_TIME
return to return to
def _send_modbus_cmd(self, func, addr, val, log_lvl) -> None:
if self.state != State.up:
logger.log(log_lvl, f'[{self.node_id}] ignore MODBUS cmd,'
' as the state is not UP')
return
self.mb.build_msg(Modbus.INV_ADDR, func, addr, val, log_lvl)
async def send_modbus_cmd(self, func, addr, val, log_lvl) -> None:
self._send_modbus_cmd(func, addr, val, log_lvl)
''' '''
Our puplic methods Our puplic methods
''' '''