revert change, remove UNIT_MAP changes

This commit is contained in:
KF7EEL 2020-11-26 15:23:33 -08:00
parent e736893543
commit a21393313f
1 changed files with 7 additions and 18 deletions

View File

@ -165,7 +165,7 @@ def rule_timer_loop():
_then = _now - 60 * UNIT_TIME _then = _now - 60 * UNIT_TIME
remove_list = [] remove_list = []
logger.info(UNIT_MAP) #logger.info(UNIT_MAP)
for unit in UNIT_MAP: for unit in UNIT_MAP:
if UNIT_MAP[unit][1] < (_then): if UNIT_MAP[unit][1] < (_then):
remove_list.append(unit) remove_list.append(unit)
@ -439,14 +439,9 @@ class routerOBP(OPENBRIDGE):
pkt_time = time() pkt_time = time()
dmrpkt = _data[20:53] dmrpkt = _data[20:53]
_bits = _data[15] _bits = _data[15]
if time_20 == UNIT_MAP[_rf_src][1]: # Make/update this unit in the UNIT_MAP cache
logger.info('Static Unit, no change in UNIT_MAP') UNIT_MAP[_rf_src] = (self.name, pkt_time)
pass
else:
# Make/update this unit in the UNIT_MAP cache
logger.ingo('Updated subscriber system')
UNIT_MAP[_rf_src] = (self.name, pkt_time)
# Is this a new call stream? # Is this a new call stream?
@ -926,15 +921,9 @@ class routerHBP(HBSYSTEM):
pkt_time = time() pkt_time = time()
dmrpkt = _data[20:53] dmrpkt = _data[20:53]
_bits = _data[15] _bits = _data[15]
# If time matches time in static units, do not update. # Make/update this unit in the UNIT_MAP cache
if time_20 == UNIT_MAP[_rf_src][1]: UNIT_MAP[_rf_src] = (self.name, pkt_time)
logger.info('Static Unit, no change in UNIT_MAP')
pass
else:
# Make/update this unit in the UNIT_MAP cache
logger.ingo('Updated subscriber system')
UNIT_MAP[_rf_src] = (self.name, pkt_time)
# Is this a new call stream? # Is this a new call stream?