From 57a8a76ad31353d2398463d034ea8ec3ff57fd04 Mon Sep 17 00:00:00 2001 From: Heiko Mathes Date: Sun, 16 Jun 2019 00:54:18 +0200 Subject: [PATCH 1/4] allow enabling of tls usage for mqtt connection --- bridge.py | 3 +++ config.default.ini | 3 +++ 2 files changed, 6 insertions(+) diff --git a/bridge.py b/bridge.py index 7b14e5e..e3afb76 100755 --- a/bridge.py +++ b/bridge.py @@ -18,6 +18,7 @@ 'prefix': 'media', 'user': os.environ.get('MQTT_USER'), 'password': os.environ.get('MQTT_PASSWORD'), + 'tls': False, }, 'cec': { 'enabled': 0, @@ -353,6 +354,8 @@ def cleanup(): mqtt_client.on_message = mqtt_on_message if config['mqtt']['user']: mqtt_client.username_pw_set(config['mqtt']['user'], password=config['mqtt']['password']); + if config['mqtt']['tls']: + mqtt_client.tls_set(); mqtt_client.will_set(config['mqtt']['prefix'] + '/bridge/status', 'offline', qos=1, retain=True) mqtt_client.connect(config['mqtt']['broker'], int(config['mqtt']['port']), 60) mqtt_client.loop_start() diff --git a/config.default.ini b/config.default.ini index 76e6626..701b569 100644 --- a/config.default.ini +++ b/config.default.ini @@ -11,6 +11,9 @@ ; Port to connect to (default=1883) ;port=1883 +; Use tls +;tls=False + ; Username and password ;user= ;password= From 0d7a054f5ac37515c208f8eba4891642fe2648fa Mon Sep 17 00:00:00 2001 From: Heiko Mathes Date: Sun, 16 Jun 2019 01:09:31 +0200 Subject: [PATCH 2/4] use numbers instead of booleans for config --- bridge.py | 4 ++-- config.default.ini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bridge.py b/bridge.py index e3afb76..5c32e81 100755 --- a/bridge.py +++ b/bridge.py @@ -18,7 +18,7 @@ 'prefix': 'media', 'user': os.environ.get('MQTT_USER'), 'password': os.environ.get('MQTT_PASSWORD'), - 'tls': False, + 'tls': 0, }, 'cec': { 'enabled': 0, @@ -354,7 +354,7 @@ def cleanup(): mqtt_client.on_message = mqtt_on_message if config['mqtt']['user']: mqtt_client.username_pw_set(config['mqtt']['user'], password=config['mqtt']['password']); - if config['mqtt']['tls']: + if int(config['mqtt']['tls']) == 1: mqtt_client.tls_set(); mqtt_client.will_set(config['mqtt']['prefix'] + '/bridge/status', 'offline', qos=1, retain=True) mqtt_client.connect(config['mqtt']['broker'], int(config['mqtt']['port']), 60) diff --git a/config.default.ini b/config.default.ini index 701b569..9be5f60 100644 --- a/config.default.ini +++ b/config.default.ini @@ -12,7 +12,7 @@ ;port=1883 ; Use tls -;tls=False +;tls=0 ; Username and password ;user= From 6a5496b10e678630d65a1767ae1351a2da3da2f1 Mon Sep 17 00:00:00 2001 From: Heiko Mathes Date: Tue, 18 Jun 2019 00:49:53 +0200 Subject: [PATCH 3/4] add config for ir sleep time --- bridge.py | 4 +++- config.default.ini | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bridge.py b/bridge.py index 5c32e81..0e24ac2 100755 --- a/bridge.py +++ b/bridge.py @@ -28,6 +28,7 @@ }, 'ir': { 'enabled': 0, + 'sleep': 0.2 } } @@ -247,6 +248,7 @@ def cec_send(cmd, id=None): def ir_listen_thread(): try: + sleep_time = float(config['ir']['sleep']) while True: try: code = lirc.nextcode() @@ -261,7 +263,7 @@ def ir_listen_thread(): code = code[1].strip() mqtt_send(config['mqtt']['prefix'] + '/ir/' + remote + '/rx', code) else: - time.sleep(0.2) + time.sleep(sleep_time) except: return diff --git a/config.default.ini b/config.default.ini index 9be5f60..7c5d375 100644 --- a/config.default.ini +++ b/config.default.ini @@ -43,3 +43,6 @@ [ir] ; Enable LIRC ;enabled=1 + +; Set sleep time between ir code fetches +;sleep=0.2 From cd9007ef5ea5f3f1aefa45584181ce770c32e289 Mon Sep 17 00:00:00 2001 From: Heiko Mathes Date: Tue, 18 Jun 2019 00:53:36 +0200 Subject: [PATCH 4/4] add missing comma a end of list --- bridge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridge.py b/bridge.py index 0e24ac2..a70f6e1 100755 --- a/bridge.py +++ b/bridge.py @@ -28,7 +28,7 @@ }, 'ir': { 'enabled': 0, - 'sleep': 0.2 + 'sleep': 0.2, } }