Merge pull request #93 from Digitelektro/develop

Develop

Author: Digitelektro

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5)
 include(ExternalProject)
 
 project(meteordemod
-    VERSION 2.6.0
+    VERSION 2.6.1
     LANGUAGES CXX
 )
 

decoder/protocol/lrpt/decoder.cpp

@@ -33,7 +33,7 @@ void Decoder::process(const uint8_t* cadu) {
                     // Current frame doesn't have header
                     mCcsdsPayload.insert(mCcsdsPayload.end(), cadu, cadu + cPDUDataSize);
                 } else {
-                    mCcsdsPayload.insert(mCcsdsPayload.end(), cadu, cadu + firstHeaderPointer + 1);
+                    mCcsdsPayload.insert(mCcsdsPayload.end(), cadu, cadu + firstHeaderPointer);
                     parsePartial(mCcsdsPayload.data(), mCcsdsPayload.size());
                     mCcsdsPayload.clear();
                 }

decoder/protocol/lrpt/msumr/bitio.cpp

@@ -1,7 +1,5 @@
 #include "bitio.h"
 
-#include <iostream>
-
 namespace decoder {
 namespace protocol {
 namespace lrpt {
@@ -14,13 +12,14 @@ BitIOConst::BitIOConst(const uint8_t* bytes, uint32_t size)
 
 uint32_t BitIOConst::peekBits(int n) {
     uint32_t result = 0;
+    int bit = 0;
     for(int i = 0; i < n; i++) {
         int p = mPos + i;
-        if((p >> 3) >= mSize) {
-            break;
+        if((p >> 3) < mSize) {
+            bit = (mpBytes[p >> 3] >> (7 - (p & 7))) & 1;
+        } else {
+            bit = 0;
         }
-        // std::cout << "pos=" << (p >> 3) << ", Size=" << mSize << std::endl;
-        int bit = (mpBytes[p >> 3] >> (7 - (p & 7))) & 1;
         result = (result << 1) | bit;
     }
     return result;

decoder/viterbi.cpp

@@ -44,7 +44,7 @@ void Viterbi::calculateBer(const uint8_t* original, const uint8_t* reEncoded, ss
         }
     }
 
-    if(errors == 0) {
+    if(total == 0) {
         mLastBER = 0.0f;
     } else {
         mLastBER = (errors / total);