From 24121955d14745c1e12a60dd4749f1c0ba0f3ce4 Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 22 Jan 2024 18:09:52 +0000 Subject: [PATCH] fix dial bug - i hope --- bridge_master.py | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/bridge_master.py b/bridge_master.py index 6f73f4a..a7eb713 100644 --- a/bridge_master.py +++ b/bridge_master.py @@ -299,34 +299,34 @@ def reset_static_tg(tg,ts,_tmout,system): logger.exception('(%s) KeyError in reset_static_tg() - bridge gone away? TG: %s',system,tg) return -# def reset_default_reflector(reflector,_tmout,system): -# print(reflector) -# bridge = ''.join(['#',str(reflector)]) -# print(bridge) -# #_tmout = CONFIG['SYSTEMS'][system]['DEFAULT_UA_TIMER'] -# if bridge not in BRIDGES: -# BRIDGES[bridge] = [] -# make_single_reflector(bytes_3(reflector),_tmout, system) -# bridgetemp = deque() -# for bridgesystem in BRIDGES[bridge]: -# print(bridgesystem) -# if bridgesystem['SYSTEM'] == system and bridgesystem['TS'] == 2: -# print(bridgesystem) -# bridgetemp.append({'SYSTEM': system, 'TS': 2, 'TGID': bytes_3(9),'ACTIVE': False,'TIMEOUT': _tmout * 60,'TO_TYPE': 'ON','OFF': [],'ON': [bytes_3(reflector),],'RESET': [], 'TIMER': time() + (_tmout * 60)}) -# else: -# bridgetemp.append(bridgesystem) -# print(bridgetemp) -# BRIDGES[bridge] = bridgetemp -# print(BRIDGES[bridge]) - -def reset_all_reflector_system(_tmout,system): +#def reset_default_reflector(reflector,_tmout,system): + #print(reflector) + #bridge = ''.join(['#',str(reflector)]) + #print(bridge) + ##_tmout = CONFIG['SYSTEMS'][system]['DEFAULT_UA_TIMER'] + #if bridge not in BRIDGES: + #BRIDGES[bridge] = [] + #make_single_reflector(bytes_3(reflector),_tmout, system) + #bridgetemp = deque() + #for bridgesystem in BRIDGES[bridge]: + #print(bridgesystem) + #if bridgesystem['SYSTEM'] == system and bridgesystem['TS'] == 2: + #print(bridgesystem) + #bridgetemp.append({'SYSTEM': system, 'TS': 2, 'TGID': bytes_3(9),'ACTIVE': False,'TIMEOUT': _tmout * 60,'TO_TYPE': 'ON','OFF': [],'ON': [bytes_3(reflector),],'RESET': [], 'TIMER': time() + (_tmout * 60)}) + #else: + #bridgetemp.append(bridgesystem) + #print(bridgetemp) + #BRIDGES[bridge] = bridgetemp + print(BRIDGES[bridge]) + +def reset_all_reflector_system(_tmout,resetSystem): for system in CONFIG['SYSTEMS']: for bridge in BRIDGES: if bridge[0:1] == '#': for bridgesystem in BRIDGES[bridge]: bridgetemp = deque() - if bridgesystem['SYSTEM'] == system and bridgesystem['TS'] == 2: - bridgetemp.append({'SYSTEM': system, 'TS': 2, 'TGID': bytes_3(9),'ACTIVE': False,'TIMEOUT': _tmout * 60,'TO_TYPE': 'ON','OFF': [],'ON': [bytes_3(int(bridge[1:])),],'RESET': [], 'TIMER': time() + (_tmout * 60)}) + if bridgesystem['SYSTEM'] == resetSystem and bridgesystem['TS'] == 2: + bridgetemp.append({'SYSTEM': resetSystem, 'TS': 2, 'TGID': bytes_3(9),'ACTIVE': False,'TIMEOUT': _tmout * 60,'TO_TYPE': 'ON','OFF': [],'ON': [bytes_3(int(bridge[1:])),],'RESET': [], 'TIMER': time() + (_tmout * 60)}) else: bridgetemp.append(bridgesystem) BRIDGES[bridge] = bridgetemp