Merge remote-tracking branch 'origin/consolidate-master-client' into consolidate-master-client

# Conflicts:
#	hb_router.py

.gitignore

@@ -7,6 +7,7 @@ Icon
 *.lcl
 *.conf
 hblink.cfg
+hb_routing_rules.py
 *.config
 *.json
 *.pickle

hb_router.py

@@ -124,9 +124,9 @@ if __name__ == '__main__':
     for system in CONFIG['SYSTEMS']:
         if CONFIG['SYSTEMS'][system]['ENABLED']:
             if CONFIG['SYSTEMS'][system]['MODE'] == 'MASTER':
-                systems[system] = HBMASTER(system)
+                systems[system] = routerMASTER(system)
             elif CONFIG['SYSTEMS'][system]['MODE'] == 'CLIENT':
-                systems[system] = HBCLIENT(system)     
+                systems[system] = routerCLIENT(system)     
             reactor.listenUDP(CONFIG['SYSTEMS'][system]['PORT'], systems[system], interface=CONFIG['SYSTEMS'][system]['IP'])
             logger.debug('%s instance created: %s, %s', CONFIG['SYSTEMS'][system]['MODE'], system, systems[system])
 

hblink.py

@@ -235,7 +235,6 @@ class HBMASTER(DatagramProtocol):
                 else:
                     _frame_type = 'none'
                 _stream_id = _data[16:20]
-                
                 #logger.debug('(%s) DMRD - Seqence: %s, RF Source: %s, Destination ID: %s', self._master, int_id(_seq), int_id(_rf_src), int_id(_dst_id))
     
                 # If AMBE audio exporting is configured...