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

simplify heartbeat handler

Browse Source
This commit is contained in:
Stefan Allius
2024-10-10 00:00:32 +02:00
parent 18c3020282
commit 724f6f3b22
1 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,7 +66,7 @@ class Talent(Message):
0x00: self.msg_contact_info, 0x00: self.msg_contact_info,
0x13: self.msg_ota_update, 0x13: self.msg_ota_update,
0x22: self.msg_get_time, 0x22: self.msg_get_time,
0x99: self.msg_act_time, 0x99: self.msg_heartbeat,
0x71: self.msg_collector_data, 0x71: self.msg_collector_data,
# 0x76: # 0x76:
0x77: self.msg_modbus, 0x77: self.msg_modbus,
@@ -188,22 +188,6 @@ class Talent(Message):
logger.info(self.__flow_str(self.server_side, 'forwrd') + logger.info(self.__flow_str(self.server_side, 'forwrd') +
f' Ctl: {int(self.ctrl):#02x} Msg: {fnc.__name__!r}') f' Ctl: {int(self.ctrl):#02x} Msg: {fnc.__name__!r}')
def forward_snd(self) -> None:
'''add the build send msg to the forwarding queue'''
tsun = Config.get('tsun')
rest = self.ifc.tx_get(self.send_msg_ofs)
buffer = self.ifc.tx_get()
if tsun['enabled']:
_len = len(buffer)
struct.pack_into('!l', buffer, 0, _len-4)
self.ifc.fwd_add(buffer)
self.ifc.fwd_log(logging.INFO, 'Store for forwarding:')
fnc = self.switch.get(self.msg_id, self.msg_unknown)
logger.info(self.__flow_str(self.server_side, 'forwrd') +
f' Ctl: {int(self.ctrl):#02x} Msg: {fnc.__name__!r}')
self.ifc.tx_add(rest)
def send_modbus_cb(self, modbus_pdu: bytearray, log_lvl: int, state: str): def send_modbus_cb(self, modbus_pdu: bytearray, log_lvl: int, state: str):
if self.state != State.up: if self.state != State.up:
logger.warning(f'[{self.node_id}] ignore MODBUS cmd,' logger.warning(f'[{self.node_id}] ignore MODBUS cmd,'
@@ -447,7 +431,7 @@ class Talent(Message):
self.forward() self.forward()
def msg_act_time(self): def msg_heartbeat(self):
if self.ctrl.is_ind(): if self.ctrl.is_ind():
if self.data_len == 9: if self.data_len == 9:
self.state = State.up # allow MODBUS cmds self.state = State.up # allow MODBUS cmds
@@ -466,15 +450,13 @@ class Talent(Message):
logger.debug(f'inv-time: {int(result[1]):08x}' logger.debug(f'inv-time: {int(result[1]):08x}'
f' tsun-time: {ts:08x}' f' tsun-time: {ts:08x}'
f' offset: {self.ts_offset}') f' offset: {self.ts_offset}')
self.__build_header(0x91) struct.pack_into('!Bq', self.ifc.rx_peek(),
self.ifc.tx_add(struct.pack('!Bq', resp_code, ts)) self.header_len, resp_code, ts)
self.forward_snd()
return
elif self.ctrl.is_resp(): elif self.ctrl.is_resp():
result = struct.unpack_from('!B', self.ifc.rx_peek(), result = struct.unpack_from('!B', self.ifc.rx_peek(),
self.header_len) self.header_len)
resp_code = result[0] resp_code = result[0]
logging.debug(f'TimeActRespCode: {resp_code}') logging.debug(f'Heartbeat-RespCode: {resp_code}')
return return
else: else:
logger.warning(self.TXT_UNKNOWN_CTRL) logger.warning(self.TXT_UNKNOWN_CTRL)