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

tidy up special openbridge handling

Browse Source
This commit is contained in:
Simon 2020-10-04 15:42:52 +01:00
parent 63195f928e
commit c4e1376aae
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bridge_master.py
View File

@ -132,7 +132,8 @@ def make_bridges(_rules):
# continue # continue
for _confsystem in CONFIG['SYSTEMS']: for _confsystem in CONFIG['SYSTEMS']:
if _confsystem == 'OBP-BM': #if _confsystem == 'OBP-BM':
if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE':
continue continue
ts1 = False ts1 = False
ts2 = False ts2 = False
@ -159,7 +160,8 @@ def make_single_bridge(_tgid,_sourcesystem,_slot):
_tgid_s = str(int_id(_tgid)) _tgid_s = str(int_id(_tgid))
BRIDGES[_tgid_s] = [] BRIDGES[_tgid_s] = []
for _system in CONFIG['SYSTEMS']: for _system in CONFIG['SYSTEMS']:
if _system != 'OBP-BM': #if _system != 'OBP-BM':
if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE':
_tmout = CONFIG['SYSTEMS'][_system]['DEFAULT_UA_TIMER'] _tmout = CONFIG['SYSTEMS'][_system]['DEFAULT_UA_TIMER']
if _system == _sourcesystem: if _system == _sourcesystem:
if _slot == 1: if _slot == 1:
@ -210,7 +212,8 @@ def make_single_reflector(_tgid,_sourcesystem):
_bridge = '#' + _tgid_s _bridge = '#' + _tgid_s
BRIDGES[_bridge] = [] BRIDGES[_bridge] = []
for _system in CONFIG['SYSTEMS']: for _system in CONFIG['SYSTEMS']:
if _system != 'OBP-BM': #if _system != 'OBP-BM':
if CONFIG['SYSTEMS'][system]['MODE'] != 'OPENBRIDGE':
_tmout = CONFIG['SYSTEMS'][_system]['DEFAULT_UA_TIMER'] _tmout = CONFIG['SYSTEMS'][_system]['DEFAULT_UA_TIMER']
if _system == _sourcesystem: if _system == _sourcesystem:
BRIDGES[_bridge].append({'SYSTEM': _system, 'TS': 2, 'TGID': bytes_3(9),'ACTIVE': True,'TIMEOUT': _tmout * 60,'TO_TYPE': 'ON','OFF': [],'ON': [_tgid,],'RESET': [], 'TIMER': time() + (_tmout * 60)}) BRIDGES[_bridge].append({'SYSTEM': _system, 'TS': 2, 'TGID': bytes_3(9),'ACTIVE': True,'TIMEOUT': _tmout * 60,'TO_TYPE': 'ON','OFF': [],'ON': [_tgid,],'RESET': [], 'TIMER': time() + (_tmout * 60)})