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

Alternate Subscriber ID for repeat transmission

Browse Source 
Added a feature whereby a user can configure an alternate subscriber ID
in the config file that will be used for all group traffic repeated.
This commit is contained in:
Cort Buffington 2016-01-16 18:28:39 -06:00
parent 11bf48a03f
commit bf33f3893e
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
playback.py
View File

@ -33,6 +33,9 @@ except ImportError:
HEX_TGID = hex_str_3(TGID) HEX_TGID = hex_str_3(TGID)
HEX_SUB = hex_str_3(SUB) HEX_SUB = hex_str_3(SUB)
BOGUS_SUB = '\xFF\xFF\xFF' BOGUS_SUB = '\xFF\xFF\xFF'
if GROUP_SRC_SUB:
logger.info('Playback: USING SUBSCRIBER ID: %s FOR GROUP REPEAT', GROUP_SRC_SUB)
HEX_GRP_SUB = hex_str_3(GROUP_SRC_SUB)
class playbackIPSC(IPSC): class playbackIPSC(IPSC):
@ -61,6 +64,8 @@ class playbackIPSC(IPSC):
for i in self.CALL_DATA: for i in self.CALL_DATA:
_tmp_data = i _tmp_data = i
_tmp_data = _tmp_data.replace(_peerid, NETWORK[_network]['LOCAL']['RADIO_ID']) _tmp_data = _tmp_data.replace(_peerid, NETWORK[_network]['LOCAL']['RADIO_ID'])
if GROUP_SRC_SUB:
_tmp_data = _tmp_data.replace(_src_sub, HEX_GRP_SUB)
_tmp_data = self.hashed_packet(NETWORK[_network]['LOCAL']['AUTH_KEY'], _tmp_data) _tmp_data = self.hashed_packet(NETWORK[_network]['LOCAL']['AUTH_KEY'], _tmp_data)
# Send the packet to all peers in the target IPSC # Send the packet to all peers in the target IPSC
self.send_to_ipsc(_tmp_data) self.send_to_ipsc(_tmp_data)

7
playback_config_SAMPLE.py
View File

@ -13,6 +13,13 @@ TGID = 12345
# one, you still have to use the parenthesis and comma. Just # one, you still have to use the parenthesis and comma. Just
# deal with it, or make it better. TS1 = 0, TS2 = 1. # deal with it, or make it better. TS1 = 0, TS2 = 1.
GROUP_TS = (1,) GROUP_TS = (1,)
# ALTERNATE SOURCE SUBSCRIBER ID FOR REPEATED TRANSMISSION
# Some folks have radios that don't respond to their own subscriber
# IDs. Some just don't want to have the playback come from the same
# subscriber ID. If this variable is set to something, it will
# be used as the source subscriber for playback.
# SET TO 0 TO NOT USE THIS FEATURE!!!
GROUP_SRC_SUB = 0
# ENABLE PRIVATE VOICE PLAYBACK? # ENABLE PRIVATE VOICE PLAYBACK?