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

Fixed logic for adding UA systems to rules

Browse Source
This commit is contained in:
Simon G7RZU 2020-08-26 10:48:44 +01:00
parent de0ee31001
commit 248453ddf3
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bridge_master.py
View File

@ -111,21 +111,23 @@ def make_bridges(_rules):
_system['TIMER'] = time() + _system['TIMEOUT'] _system['TIMER'] = time() + _system['TIMEOUT']
else: else:
_system['TIMER'] = time() _system['TIMER'] = time()
for _confsystem in CONFIG['SYSTEMS']: for _confsystem in CONFIG['SYSTEMS']:
if _confsystem == 'OBP-BM': if _confsystem == 'OBP-BM':
continue continue
ts1 = False ts1 = False
ts2 = False ts2 = False
for i,e in enumerate(_rules[_bridge]): for i,e in enumerate(_rules[_bridge]):
if e['SYSTEM'] == _confsystem and e['TS'] == 1: if e['SYSTEM'] == _confsystem and e['TS'] == 1:
ts1 = True ts1 = True
if e['SYSTEM'] == _confsystem and e['TS'] == 2: if e['SYSTEM'] == _confsystem and e['TS'] == 2:
ts2 = True ts2 = True
if ts1 == False:
_rules[_bridge].append({'SYSTEM': _confsystem, 'TS': 1, 'TGID': bytes_3(int(_bridge)),'ACTIVE': False,'TIMEOUT': 240,'TO_TYPE': 'ON','OFF': [],'ON': [bytes_3(int(_bridge)),],'RESET': [], 'TIMER': time()}) if ts1 == False:
if ts2 == False: _rules[_bridge].append({'SYSTEM': _confsystem, 'TS': 1, 'TGID': bytes_3(int(_bridge)),'ACTIVE': False,'TIMEOUT': 240,'TO_TYPE': 'ON','OFF': [],'ON': [bytes_3(int(_bridge)),],'RESET': [], 'TIMER': time()})
_rules[_bridge].append({'SYSTEM': _confsystem, 'TS': 2, 'TGID': bytes_3(int(_bridge)),'ACTIVE': False,'TIMEOUT': 240,'TO_TYPE': 'ON','OFF': [],'ON': [bytes_3(int(_bridge)),],'RESET': [], 'TIMER': time()}) if ts2 == False:
break _rules[_bridge].append({'SYSTEM': _confsystem, 'TS': 2, 'TGID': bytes_3(int(_bridge)),'ACTIVE': False,'TIMEOUT': 240,'TO_TYPE': 'ON','OFF': [],'ON': [bytes_3(int(_bridge)),],'RESET': [], 'TIMER': time()})
return _rules return _rules
#Make a single bridge - used for on-the-fly UA bridges #Make a single bridge - used for on-the-fly UA bridges