From 9786e80e72f281497ac196d62b203bd69f83695f Mon Sep 17 00:00:00 2001
From: Wojciech Kaczmarski <44336093+sp5wwp@users.noreply.github.com>
Date: Wed, 23 Oct 2024 13:05:49 +0200
Subject: [PATCH] M17: FrameEncoder: fixed wrong frame number mask

---
 openrtx/src/protocols/M17/M17FrameDecoder.cpp | 2 +-
 openrtx/src/protocols/M17/M17FrameEncoder.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openrtx/src/protocols/M17/M17FrameDecoder.cpp b/openrtx/src/protocols/M17/M17FrameDecoder.cpp
index f3238c1e..c35a2643 100644
--- a/openrtx/src/protocols/M17/M17FrameDecoder.cpp
+++ b/openrtx/src/protocols/M17/M17FrameDecoder.cpp
@@ -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;
diff --git a/openrtx/src/protocols/M17/M17FrameEncoder.cpp b/openrtx/src/protocols/M17/M17FrameEncoder.cpp
index b0ce2246..5a976abf 100644
--- a/openrtx/src/protocols/M17/M17FrameEncoder.cpp
+++ b/openrtx/src/protocols/M17/M17FrameEncoder.cpp
@@ -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());