M17: FrameEncoder: fixed wrong frame number mask
This commit is contained in:
parent
847750e233
commit
9786e80e72
|
|
@ -136,7 +136,7 @@ void M17FrameDecoder::decodeStream(const std::array< uint8_t, 46 >& data)
|
|||
// Mark this segment as present
|
||||
lsfSegmentMap |= 1 << segmentNum;
|
||||
|
||||
// Check if we have received all the five LICH segments
|
||||
// Check if we have received all the six LICH segments
|
||||
if(lsfSegmentMap == 0x3F)
|
||||
{
|
||||
if(lsfFromLich.valid()) lsf = lsfFromLich;
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ uint16_t M17FrameEncoder::encodeStreamFrame(const payload_t& payload,
|
|||
M17StreamFrame streamFrame;
|
||||
|
||||
streamFrame.setFrameNumber(streamFrameNumber);
|
||||
streamFrameNumber = (streamFrameNumber + 1) & 0x07FF;
|
||||
streamFrameNumber = (streamFrameNumber + 1) & 0x7FFF;
|
||||
if(isLast) streamFrame.lastFrame();
|
||||
std::copy(payload.begin(), payload.end(), streamFrame.payload().begin());
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue