Merge branch 'master' into debug

bridge_master.py

@@ -795,7 +795,7 @@ def options_config():
                     if 'TS2_1' in _options:
                         _options['TS2_STATIC'] = _options.pop('TS2_1')
                         if 'TS2_2' in _options:
-                            _options['TS2_STATIC'] = ''.join([_options['TS2_STATIC'],','. _options.pop('TS2_2')])
+                            _options['TS2_STATIC'] = ''.join([_options['TS2_STATIC'],',', _options.pop('TS2_2')])
                         if 'TS2_3' in _options:
                             _options['TS2_STATIC'] = ''.join([_options['TS2_STATIC'],',',_options.pop('TS2_3')])
                         if 'TS2_4' in _options:

loro.cfg

@@ -117,15 +117,6 @@ SUB_MAP_FILE:
 SERVER_ID_URL: http://downloads.freedmr.uk/downloads/FreeDMR_Hosts.csv
 SERVER_ID_FILE: server_ids.tsv
 
-#Read further repeater configs from MySQL
-[MYSQL]
-USE_MYSQL: False
-USER: hblink
-PASS: mypassword
-DB: hblink
-SERVER: 127.0.0.1
-PORT: 3306
-TABLE: repeaters
 
 # OPENBRIDGE INSTANCES - DUPLICATE SECTION FOR MULTIPLE CONNECTIONS
 # OpenBridge is a protocol originall created by DMR+ for connection between an