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

Prep for adding rule timers

Browse Source
This commit is contained in:
Cort Buffington 2016-08-05 09:20:06 -05:00
parent 70bf6d3dce
commit dba648bb89
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bridge.py
View File

@ -35,6 +35,9 @@ from twisted.internet import task
from binascii import b2a_hex as h from binascii import b2a_hex as h
from time import time from time import time
# For debugging
from pprint import pprint
import sys import sys
from dmrlink import IPSC, NETWORK, networks, REPORTS, reporting_loop, dmr_nat, logger, hex_str_3, hex_str_4, int_id from dmrlink import IPSC, NETWORK, networks, REPORTS, reporting_loop, dmr_nat, logger, hex_str_3, hex_str_4, int_id
@ -77,14 +80,17 @@ except ImportError:
for _ipsc in RULES_FILE: for _ipsc in RULES_FILE:
for _rule in RULES_FILE[_ipsc]['GROUP_VOICE']: for _rule in RULES_FILE[_ipsc]['GROUP_VOICE']:
_rule['SRC_GROUP'] = hex_str_3(_rule['SRC_GROUP']) _rule['SRC_GROUP'] = hex_str_3(_rule['SRC_GROUP'])
_rule['DST_GROUP'] = hex_str_3(_rule['DST_GROUP']) _rule['DST_GROUP'] = hex_str_3(_rule['DST_GROUP'])
_rule['SRC_TS'] = _rule['SRC_TS'] - 1 _rule['SRC_TS'] = _rule['SRC_TS'] - 1
_rule['DST_TS'] = _rule['DST_TS'] - 1 _rule['DST_TS'] = _rule['DST_TS'] - 1
for i, e in enumerate(_rule['ON']): for i, e in enumerate(_rule['ON']):
_rule['ON'][i] = hex_str_3(_rule['ON'][i]) _rule['ON'][i] = hex_str_3(_rule['ON'][i])
for i, e in enumerate(_rule['OFF']): for i, e in enumerate(_rule['OFF']):
_rule['OFF'][i] = hex_str_3(_rule['OFF'][i]) _rule['OFF'][i] = hex_str_3(_rule['OFF'][i])
_rule['ON_TIME'] = _rule['ON_TIME']*60
_rule['OFF_TIME'] = _rule['OFF_TIME']*60
_rule['TIMER'] = time()
if _ipsc not in NETWORK: if _ipsc not in NETWORK:
sys.exit('ERROR: Bridge rules found for an IPSC network not configured in main configuration') sys.exit('ERROR: Bridge rules found for an IPSC network not configured in main configuration')
for _ipsc in NETWORK: for _ipsc in NETWORK:
@ -136,8 +142,9 @@ else:
def allow_sub(_sub): def allow_sub(_sub):
return True return True
# Run this every minute for rule timer updates
def rule_timer_loop():
pass
class bridgeIPSC(IPSC): class bridgeIPSC(IPSC):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
@ -393,4 +400,8 @@ if __name__ == '__main__':
reporting = task.LoopingCall(reporting_loop) reporting = task.LoopingCall(reporting_loop)
reporting.start(REPORTS['REPORT_INTERVAL']) reporting.start(REPORTS['REPORT_INTERVAL'])
# INITIALIZE THE REPORTING LOOP IF CONFIGURED
rule_timer = task.LoopingCall(rule_timer_loop)
rule_timer.start(60)
reactor.run() reactor.run()