From dd521eb385df1be4c8b770b4ebb65a7342dd5300 Mon Sep 17 00:00:00 2001 From: KF7EEL Date: Mon, 6 Sep 2021 11:54:59 -0700 Subject: [PATCH] fix SVRD UNIT --- bridge.py | 1 + data_gateway.py | 4 +++- hblink.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bridge.py b/bridge.py index dc7d91f..5d65da1 100755 --- a/bridge.py +++ b/bridge.py @@ -496,6 +496,7 @@ class routerOBP(OPENBRIDGE): self._targets = [] def svrd_received(self, _mode, _data): + print(UNIT_MAP) logger.info('SVRD Received. Mode: ' + str(_mode) + ' Data: ' + str(_data)) if _mode == b'UNIT': UNIT_MAP[_data] = (self._system, time()) diff --git a/data_gateway.py b/data_gateway.py index a995f12..0a8c511 100644 --- a/data_gateway.py +++ b/data_gateway.py @@ -1171,8 +1171,9 @@ def rule_timer_loop(): global UNIT_MAP logger.debug('(ROUTER) routerHBP Rule timer loop started') _now = time() - _then = _now - 60 + _then = _now - 3600 remove_list = [] + print(UNIT_MAP) for unit in UNIT_MAP: if UNIT_MAP[unit][1] < (_then): remove_list.append(unit) @@ -1197,6 +1198,7 @@ class OBP(OPENBRIDGE): def svrd_received(self, _mode, _data): if _mode == b'UNIT': UNIT_MAP[_data] = (self._system, time()) + print(UNIT_MAP) class HBP(HBSYSTEM): diff --git a/hblink.py b/hblink.py index 5ab2bae..cf250cb 100755 --- a/hblink.py +++ b/hblink.py @@ -288,7 +288,7 @@ class OPENBRIDGE(DatagramProtocol): _stream_id = _data[16:20] self.dmrd_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data) else: - self.svrd_received(_d_pkt[:4], _d_pkt[4:]) + self.svrd_received(_d_pkt[4:8], _d_pkt[4:]) #************************************************ # HB MASTER CLASS