ShaYmez/HBLink
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

preparing to merge master

Browse Source
This commit is contained in:
Cort Buffington 2016-08-25 21:29:58 -05:00
parent 539d4b852a
commit 4dbb541845
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

2
hb_router.py
View File

@ -72,7 +72,7 @@ class routerMASTER(HBMASTER):
_target = rule['DST_NET'] _target = rule['DST_NET']
if _target in RULES: if _target in RULES:
systems[_target].send_system(_data) systems[_target].send_system(_data)
logger.debug('(%s) Packet routed %s to system: %s', self._master, CONFIG['SYSTEMS'][_target]['MODE'], _target) logger.debug('(%s) Packet routed to %s system: %s', self._master, CONFIG['SYSTEMS'][_target]['MODE'], _target)
else: else:
logger.debug('(%s) Packet router found no target for packet. Destination was: %s on target network %s', self._master, _dst_id, _target) logger.debug('(%s) Packet router found no target for packet. Destination was: %s on target network %s', self._master, _dst_id, _target)

28
hb_routing_rules-SAMPLE.py Normal file
View File

@ -0,0 +1,28 @@
RULES = {
'MASTER-1': {
'GROUP_HANGTIME': 5,
'GROUP_VOICE': [
{'NAME': 'STATEWIDE', 'ACTIVE': False, 'ON': [8,], 'OFF': [9,10], 'SRC_TS': 1, 'SRC_GROUP': 1, 'DST-TYPE': 'CLIENT', 'DST_NET': 'REPEATER-1', 'DST_TS': 2, 'DST_GROUP': 2},
# When DMRD received on this MASTER, Time Slot 1, Talk Group 1; send to CLIENT-1 on Time Slot 2 Talk Group 2
# This rule is NOT enabled by default
# This rule can be enabled by transmitting on TGID 8
# This rule can be disabled by transmitting on TGID 9 or 10
# Repeat the above line for as many rules for this IPSC network as you want.
]
},
'REPEATER-1': {
'GROUP_HANGTIME': 5,
'GROUP_VOICE': [
{'NAME': 'STATEWIDE', 'ACTIVE': False, 'ON': [8,], 'OFF': [9,10], 'SRC_TS': 1, 'SRC_GROUP': 1, 'DST-TYPE': 'MASTER', 'DST_NET': 'MASTER-1', 'DST_TS': 2, 'DST_GROUP': 2},
# When DMRD received on this CLIENT, Time Slot 1, Talk Group 1; send to MASTER-1 on Time Slot 2 Talk Group 2
# This rule is NOT enabled by default
# This rule can be enabled by transmitting on TGID 8
# This rule can be disabled by transmitting on TGID 9 or 10
# Repeat the above line for as many rules for this IPSC network as you want.
]
},
}
if __name__ == '__main__':
from pprint import pprint
pprint(RULES)