ua1zbe
/
gps
mirror of https://github.com/kf7eel/hbnet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add decode support for Defined Short Data headers, should work with Hytera

This commit is contained in:
KF7EEL 2022-03-02 13:00:51 -08:00
parent 42c7491e86
commit f661a50098
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
data_gateway.py
View File

@ -1410,11 +1410,18 @@ def data_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _fr
global packet_assembly, btf global packet_assembly, btf
if _dtype_vseq == 6 or _dtype_vseq == 'group': if _dtype_vseq == 6 or _dtype_vseq == 'group':
global btf, hdr_start global btf, hdr_start
hdr_start = str(header_ID(_data)) # Header is a "Defined Short Data", used by Hytera I suspect
logger.info('Header from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + '. DMR ID: ' + str(int_id(_rf_src))) if ahex(bptc_decode(_data)[:-88]) == b'0d':
logger.debug(ahex(bptc_decode(_data))) logger.debug('Defined Short Data header detected.')
logger.info('Blocks to follow: ' + str(ba2num(bptc_decode(_data)[65:72]))) btf = (ba2num(bptc_decode(_data)[12:-80]))
btf = ba2num(bptc_decode(_data)[65:72]) # Everyone else
else:
logger.debug('Unconfirmed Data header detected.')
hdr_start = str(header_ID(_data))
logger.info('Header from ' + str(get_alias(int_id(_rf_src), subscriber_ids)) + '. DMR ID: ' + str(int_id(_rf_src)))
logger.debug(ahex(bptc_decode(_data)))
logger.info('Blocks to follow: ' + str(ba2num(bptc_decode(_data)[65:72])))
btf = ba2num(bptc_decode(_data)[65:72])
# Try resetting packet_assembly # Try resetting packet_assembly
packet_assembly = '' packet_assembly = ''
# Data blocks at 1/2 rate, see https://github.com/g4klx/MMDVM/blob/master/DMRDefines.h for data types. _dtype_seq defined here also # Data blocks at 1/2 rate, see https://github.com/g4klx/MMDVM/blob/master/DMRDefines.h for data types. _dtype_seq defined here also