VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-23 01:55:48 -05:00
Code Issues Projects Releases Wiki Activity

Fix M17 packet type decoding.

Browse Source
This commit is contained in:
srcejon 2023-11-17 13:41:35 +00:00
parent a4ae0efb51
commit 4178abe24b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/channelrx/demodm17/m17demodgui.ui
View File

@ -921,7 +921,7 @@
</size> </size>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Baud rate: 2.4k: NXDN48, dPMR 4.8k: DMR, D-Star, YSF, NXDN96</string> <string>Baud rate</string>
</property> </property>
<item> <item>
<property name="text"> <property name="text">

6
plugins/channelrx/demodm17/m17demodprocessor.cpp
View File

@ -195,9 +195,9 @@ bool M17DemodProcessor::decode_lsf(modemm17::M17FrameDecoder::lsf_buffer_t const
m_currentPacket.clear(); m_currentPacket.clear();
m_packetFrameCounter = 0; m_packetFrameCounter = 0;
if (!lsf[111]) // LSF type bit 0 if (!(lsf[13] & 1)) // LSF type bit 0
{ {
uint8_t packet_type = (lsf[109] << 1) | lsf[110]; uint8_t packet_type = (lsf[13] >> 1) & 0x3;
switch (packet_type) switch (packet_type)
{ {
@ -254,7 +254,7 @@ void M17DemodProcessor::decode_type(uint16_t type)
m_typeInfo += "DAT"; m_typeInfo += "DAT";
break; break;
case 2: case 2:
m_typeInfo += "UNK"; m_typeInfo += "ENC"; // Encapsulated passes LSF up stack along with data
break; break;
case 3: case 3:
m_typeInfo += "UNK"; m_typeInfo += "UNK";