Unknown talkgroups from repeater side automatically create bridges

and set as user-activated.
This commit is contained in:
Simon 2020-08-22 19:18:26 +01:00
parent 94d48c8396
commit 676e3efe88

View File

@ -115,12 +115,12 @@ def make_bridges(_rules):
#Make a single bridge - used for on-the-fly UA bridges #Make a single bridge - used for on-the-fly UA bridges
def make_single_bridge(_tgid): def make_single_bridge(_tgid):
BRIDGES[_tgid] = [] _tgid_s = str(int_id(_tgid))
BRIDGES[_tgid_s] = []
for _system in CONFIG['SYSTEMS']: for _system in CONFIG['SYSTEMS']:
if _system['MODE'] == 'OPENBRIDGE': # if _system['MODE'] == 'OPENBRIDGE':
continue # continue
BRIDGES[_tgid_s].append({'SYSTEM': _system, 'TS': 2, 'TGID': _tgid,'ACTIVE': True,'TIMEOUT': 240,'TO_TYPE': 'NONE','OFF': [],'ON': [],'RESET': []})
BRIDGES[_tgid].append = {'SYSTEM': _tgid, 'TS': 1, 'TGID': _tgid,'ACTIVE': True,'TIMEOUT': 240,'TO_TYPE': 'NONE','OFF': [],'ON': [],'RESET': []}
# Run this every minute for rule timer updates # Run this every minute for rule timer updates
@ -406,7 +406,6 @@ class routerHBP(HBSYSTEM):
def __init__(self, _name, _config, _report): def __init__(self, _name, _config, _report):
HBSYSTEM.__init__(self, _name, _config, _report) HBSYSTEM.__init__(self, _name, _config, _report)
# Status information for the system, TS1 & TS2 # Status information for the system, TS1 & TS2
# 1 & 2 are "timeslot" # 1 & 2 are "timeslot"
# In TX_EMB_LC, 2-5 are burst B-E # In TX_EMB_LC, 2-5 are burst B-E
@ -496,8 +495,9 @@ class routerHBP(HBSYSTEM):
self.STATUS[_slot]['RX_LC'] = LC_OPT + _dst_id + _rf_src self.STATUS[_slot]['RX_LC'] = LC_OPT + _dst_id + _rf_src
#Create default bridge for unknown TG #Create default bridge for unknown TG
if _dst_id not in BRIDGES: if _dst_id not in BRIDGES:
make_single_bridge(_dst_id) logger.info('*** Making single bridge')
make_single_bridge(_dst_id)
for _bridge in BRIDGES: for _bridge in BRIDGES:
for _system in BRIDGES[_bridge]: for _system in BRIDGES[_bridge]: