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

additional voice decoding

Browse Source
This commit is contained in:
Cort Buffington 2016-08-15 17:18:16 -05:00
parent c6af04f305
commit d200c2844b
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hb_routing_rules.py
View File

@ -22,7 +22,7 @@ RULES = {
# This rule can be enabled by transmitting on TGID 8 # This rule can be enabled by transmitting on TGID 8
# This rule can be disabled by transmitting on TGID 9 or 10 # 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. # Repeat the above line for as many rules for this IPSC network as you want.
] ]
}, },
}, },
} }

16
hblink.py
View File

@ -216,9 +216,23 @@ class HBMASTER(DatagramProtocol):
and self._clients[_radio_id]['CONNECTION'] == 'YES' \ and self._clients[_radio_id]['CONNECTION'] == 'YES' \
and self._clients[_radio_id]['IP'] == _host \ and self._clients[_radio_id]['IP'] == _host \
and self._clients[_radio_id]['PORT'] == _port: and self._clients[_radio_id]['PORT'] == _port:
_seq = _data[4:5] _seq = _data[4]
_rf_src = _data[5:8] _rf_src = _data[5:8]
_dst_id = _data[8:11] _dst_id = _data[8:11]
_bits = int_id(_data[15])
_slot = 2 if (_bits & 0x40) else 1
_call_type = 'group' if (_bits & 0x40) else 'unit'
_raw_frame_type = (_bits & 0x30) >> 4
if _raw_frame_type == 0b00:
_frame_type = 'voice'
elif _raw_frame_type == 0b01:
_frame_type = 'voice_sync'
elif _raw_frame_type == 0b10:
_frame_type = 'data_sync'
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)) #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... # If AMBE audio exporting is configured...