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

Easier config, just use integer string, no hex coding

Browse Source
This commit is contained in:
Cort Buffington 2014-04-24 21:57:38 -05:00
parent 39aa714907
commit 45455322ce
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dmrlink.py
View File

@ -295,6 +295,11 @@ except ImportError:
# UTILITY FUNCTIONS FOR INTERNAL USE # UTILITY FUNCTIONS FOR INTERNAL USE
#************************************************ #************************************************
# Create a 3 byte TGID or UID from an integer
#
def hex_id(_int_id):
return hex(_int_id)[2:].rjust(6,'0').decode('hex')
# Convert a hex string to an int (radio ID, etc.) # Convert a hex string to an int (radio ID, etc.)
# #
def int_id(_hex_string): def int_id(_hex_string):

21
playback.py
View File

@ -15,20 +15,29 @@ from twisted.internet import reactor
from binascii import b2a_hex as h from binascii import b2a_hex as h
import sys, time import sys, time
from dmrlink import IPSC, UnauthIPSC, NETWORK, networks, logger, dmr_nat, int_id, send_to_ipsc from dmrlink import IPSC, UnauthIPSC, NETWORK, networks, logger, dmr_nat, int_id, send_to_ipsc, hex_id
__author__ = 'Cortney T. Buffington, N0MJS' __author__ = 'Cortney T. Buffington, N0MJS'
__copyright__ = 'Copyright (c) 2014 Cortney T. Buffington, N0MJS and the K0USY Group' __copyright__ = 'Copyright (c) 2014 Cortney T. Buffington, N0MJS and the K0USY Group'
__credits__ = 'Adam Fast, KC0YLK; Dave K; and he who wishes not to be named' __credits__ = 'Adam Fast, KC0YLK; Dave K; and he who wishes not to be named'
__license__ = 'Creative Commons Attribution-ShareAlike 3.0 Unported' __license__ = 'Creative Commons Attribution-ShareAlike 3.0 Unported'
__version__ = '0.1a' __version__ = '0.1b'
__maintainer__ = 'Cort Buffington, N0MJS' __maintainer__ = 'Cort Buffington, N0MJS'
__email__ = 'n0mjs@me.com' __email__ = 'n0mjs@me.com'
__status__ = 'pre-alpha' __status__ = 'pre-alpha'
# TGID to listen for and repeat on
TGID = '\x00\x00\x0A'
TS = 1 # THESE ARE THE THINGS THAT YOU NEED TO CONFIGURE TO USE THIS PROGRAM!!!
# TGID TO LISTEN FOR AND REPEAT ON
TGID = 10
# TIMESLOT TO LISTEN FOR AND REPEAT ON
TS = 0
HEX_TGID = hex_id(TGID)
class playbackIPSC(IPSC): class playbackIPSC(IPSC):
@ -41,7 +50,7 @@ class playbackIPSC(IPSC):
#************************************************ #************************************************
def group_voice(self, _network, _src_sub, _dst_sub, _ts, _end, _peerid, _data): def group_voice(self, _network, _src_sub, _dst_sub, _ts, _end, _peerid, _data):
if TGID == _dst_sub and TS == _ts: if HEX_TGID == _dst_sub and TS == _ts:
if not _end: if not _end:
if not self.CALL_DATA: if not self.CALL_DATA:
logger.info('(%s) Receiving transmission to be played back from subscriber: %s', _network, int_id(_src_sub)) logger.info('(%s) Receiving transmission to be played back from subscriber: %s', _network, int_id(_src_sub))