ShaYmez/DMRlink
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Timers Should Work - Not Heavily Tested

Browse Source 
NEEDS MORE TESTING email me with problems.
This commit is contained in:
Cort Buffington 2016-08-06 19:02:28 -05:00
parent 9b72e99a60
commit 80f9224d8d
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bridge.py
View File

@ -333,24 +333,34 @@ class bridgeIPSC(IPSC):
# Action happens on un-key # Action happens on un-key
if _burst_data_type == BURST_DATA_TYPE['VOICE_TERM']: if _burst_data_type == BURST_DATA_TYPE['VOICE_TERM']:
_now = time()
# Iterate the rules dictionary # Iterate the rules dictionary
for rule in RULES[_network]['GROUP_VOICE']: for rule in RULES[_network]['GROUP_VOICE']:
_target = rule['DST_NET']
# TGID matches a rule source, reset its timer
if _ts == rule['SRC_TS'] and _dst_group == rule['SRC_GROUP']:
rule['TIMER'] = now + rule['TIMEOUT']
logger.info('(%s) Source group transmission match for rule \"%s\". Reset timeout to %s', _network, rule['NAME'], rule['TIMER'])
# Scan for reciprocal rules and reset their timers as well.
for target_rule in RULES[_target]['GROUP_VOICE']:
if target_rule['NAME'] == rule['NAME']:
target_rule['TIMER'] = now + target_rule['TIMEOUT']
logger.info('(%s) Reciprocal group transmission match for rule \"%s\" for IPSC %s. Reset timeout to %s', _network, target_rule['NAME'], _target, rule['TIMER'])
# TGID matches an ACTIVATION trigger # TGID matches an ACTIVATION trigger
if _dst_group in rule['ON']: if _dst_group in rule['ON']:
# Set the matching rule as ACTIVE # Set the matching rule as ACTIVE
rule['ACTIVE'] = True rule['ACTIVE'] = True
rule['TIMER'] = _now + rule['TIMEOUT'] rule['TIMER'] = now + rule['TIMEOUT']
logger.info('(%s) Primary Bridge Rule \"%s\" changed to state: %s', _network, rule['NAME'], rule['ACTIVE']) logger.info('(%s) Primary Bridge Rule \"%s\" changed to state: %s', _network, rule['NAME'], rule['ACTIVE'])
# Set reciprocal rules for other IPSCs as ACTIVE # Set reciprocal rules for other IPSCs as ACTIVE
_target = rule['DST_NET']
for target_rule in RULES[_target]['GROUP_VOICE']: for target_rule in RULES[_target]['GROUP_VOICE']:
if target_rule['NAME'] == rule['NAME']: if target_rule['NAME'] == rule['NAME']:
target_rule['ACTIVE'] = True target_rule['ACTIVE'] = True
target_rule['TIMER'] = _now + target_rule['TIMEOUT'] target_rule['TIMER'] = now + target_rule['TIMEOUT']
logger.info('(%s) Reciprocal Bridge Rule \"%s\" in IPSC \"%s\" changed to state: %s', _network, target_rule['NAME'], _target, rule['ACTIVE']) logger.info('(%s) Reciprocal Bridge Rule \"%s\" in IPSC \"%s\" changed to state: %s', _network, target_rule['NAME'], _target, rule['ACTIVE'])
# TGID matches an DE-ACTIVATION trigger # TGID matches an DE-ACTIVATION trigger