fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug affecting LSF reassembling from LICH segments inside M17 frame decoder class

This commit is contained in:
Silvano Seva 2022-01-08 22:25:40 +01:00
parent 35c1f062c6
commit d2c7be9cc8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openrtx/src/protocols/M17/M17FrameDecoder.cpp
View File

@ -94,15 +94,17 @@ void M17FrameDecoder::decodeStream(const std::array< uint8_t, 46 >& data)
if(decodeOk) if(decodeOk)
{ {
// Append LICH segment // Append LICH segment
uint8_t segmentNum = lsfSegment[5]; uint8_t segmentNum = lsfSegment[5];
uint8_t segmentSize = lsfSegment.size() - 1;
uint8_t *ptr = reinterpret_cast < uint8_t * >(&lsfFromLich.data); uint8_t *ptr = reinterpret_cast < uint8_t * >(&lsfFromLich.data);
memcpy(ptr + segmentNum, lsfSegment.data(), 5); ptr += segmentNum * segmentSize;
memcpy(ptr, lsfSegment.data(), segmentSize);
// Mark this segment as present // Mark this segment as present
lsfSegmentMap |= 1 << segmentNum; lsfSegmentMap |= 1 << segmentNum;
// Check if we have received all the five LICH segments // Check if we have received all the five LICH segments
if(lsfSegmentMap == 0x1F) if(lsfSegmentMap == 0x3F)
{ {
if(lsfFromLich.valid()) lsf = lsfFromLich; if(lsfFromLich.valid()) lsf = lsfFromLich;
lsfSegmentMap = 0; lsfSegmentMap = 0;