From 6fb3a86361de02b1f5ba6d743f59992d485ed043 Mon Sep 17 00:00:00 2001 From: Simon G7RZU Date: Wed, 26 Aug 2020 15:24:06 +0100 Subject: [PATCH] Add config option for UA timer to hblink.cfg --- bridge_master.py | 6 +++--- config.py | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bridge_master.py b/bridge_master.py index 664d3cc..ed89b58 100755 --- a/bridge_master.py +++ b/bridge_master.py @@ -122,11 +122,11 @@ def make_bridges(_rules): ts1 = True if e['SYSTEM'] == _confsystem and e['TS'] == 2: ts2 = True - + _tmout = CONFIG['SYSTEMS'][_confsystem]['DEFAULT_UA_TIMER'] 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()}) + _rules[_bridge].append({'SYSTEM': _confsystem, 'TS': 1, 'TGID': bytes_3(int(_bridge)),'ACTIVE': False,'TIMEOUT': _tmout * 60,'TO_TYPE': 'ON','OFF': [],'ON': [bytes_3(int(_bridge)),],'RESET': [], 'TIMER': time()}) if ts2 == False: - _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()}) + _rules[_bridge].append({'SYSTEM': _confsystem, 'TS': 2, 'TGID': bytes_3(int(_bridge)),'ACTIVE': False,'TIMEOUT': _tmout * 60,'TO_TYPE': 'ON','OFF': [],'ON': [bytes_3(int(_bridge)),],'RESET': [], 'TIMER': time()}) return _rules diff --git a/config.py b/config.py index f86628c..bbea43e 100755 --- a/config.py +++ b/config.py @@ -259,7 +259,9 @@ def build_config(_config_file): 'REG_ACL': config.get(section, 'REG_ACL'), 'SUB_ACL': config.get(section, 'SUB_ACL'), 'TG1_ACL': config.get(section, 'TGID_TS1_ACL'), - 'TG2_ACL': config.get(section, 'TGID_TS2_ACL') + 'TG2_ACL': config.get(section, 'TGID_TS2_ACL'), + 'DEFAULT_UA_TIMER': config.getint(section, 'DEFAULT_UA_TIMER'), + 'SINGLE_MODE': config.getboolean(section, 'SINGLE_MODE') }}) CONFIG['SYSTEMS'][section].update({'PEERS': {}})