Merge pull request #89 from Digitelektro/feature/the_big_refactor

Feature/the big refactor

Author: Digitelektro

CMakeLists.txt

@@ -2,7 +2,15 @@ cmake_minimum_required(VERSION 3.5)
 
 include(ExternalProject)
 
-project(Meteordemod LANGUAGES CXX)
+project(meteordemod
+    VERSION 2.6.0
+    LANGUAGES CXX
+)
+
+configure_file(cmake/version.h.in version.h)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DVERSION_BUILD=${VERSION_BUILD_NUMBER}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVERSION_BUILD=${VERSION_BUILD_NUMBER}")
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -13,6 +21,10 @@ if (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "")
 endif()
 message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
 
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
+endif()
+
 
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
   if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9.2")
@@ -51,47 +63,29 @@ add_definitions(-D_USE_MATH_DEFINES -D_SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATI
 add_executable(meteordemod 
     main.cpp
     imageproc/spreadimage.cpp
-    imageproc/spreadimage.h
     imageproc/threatimage.cpp
-    imageproc/threatimage.h
-    decoder/bitio.cpp
-    decoder/bitio.h
     decoder/correlation.cpp
-    decoder/correlation.h
-    decoder/meteorimage.cpp
-    decoder/meteorimage.h
-    decoder/packetparser.cpp
-    decoder/packetparser.h
     decoder/reedsolomon.cpp
-    decoder/reedsolomon.h
     decoder/viterbi.cpp
-    decoder/viterbi.h
     decoder/deinterleaver.cpp
     decoder/meteordecoder.cpp
-    decoder/meteordecoder.h
+    decoder/protocol/ccsds.cpp
+    decoder/protocol/vcdu.cpp
+    decoder/protocol/lrpt/decoder.cpp
+    decoder/protocol/lrpt/msumr/segment.cpp
+    decoder/protocol/lrpt/msumr/bitio.cpp
+    decoder/protocol/lrpt/msumr/image.cpp
     common/settings.cpp
-    common/settings.h
-    common/version.h
     tools/matrix.cpp
-    tools/matrix.h
     tools/tlereader.cpp
-    tools/tlereader.h
     tools/vector.cpp
-    tools/vector.h
     tools/pixelgeolocationcalculator.cpp
-    tools/pixelgeolocationcalculator.h
     tools/databuffer.cpp
-    tools/databuffer.h
     tools/iniparser.cpp
-    tools/iniparser.h
     tools/threadpool.cpp
-    tools/threadpool.h
     GIS/shapereader.cpp
-    GIS/shapereader.h
     GIS/shaperenderer.cpp
-    GIS/shaperenderer.h
     GIS/dbfilereader.cpp
-    GIS/dbfilereader.h
     DSP/meteordemodulator.cpp
     DSP/agc.cpp
     DSP/pll.cpp
@@ -118,6 +112,10 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/external/libcorrect/include
 )
 
+target_include_directories(meteordemod PUBLIC
+    "${PROJECT_BINARY_DIR}"
+)
+
 add_dependencies(meteordemod sgp4)
 add_dependencies(meteordemod libcorrect)    
 
@@ -150,9 +148,6 @@ if(UNIX AND NOT APPLE)
     find_file (DEBIAN_FOUND debian_version debconf.conf PATHS /etc)
     if (DEBIAN_FOUND)
         SET(CPACK_GENERATOR "DEB")
-        SET(CPACK_PACKAGE_VERSION_MAJOR "2")
-        SET(CPACK_PACKAGE_VERSION_MINOR "5")
-        SET(CPACK_PACKAGE_VERSION_PATCH "7")
         SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Digitelektro")
         SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE "https://github.com/Digitelektro/MeteorDemod")
         SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Russian Meteor M2 weather satellite data decoder")

cmake/version.h.in

@@ -0,0 +1,3 @@
+#define VERSION_MAJOR @meteordemod_VERSION_MAJOR@
+#define VERSION_MINOR @meteordemod_VERSION_MINOR@
+#define VERSION_FIX @meteordemod_VERSION_PATCH@

common/version.h

@@ -1,12 +1,13 @@
 #include "meteordecoder.h"
 
+#include <iostream>
 
 MeteorDecoder::MeteorDecoder(bool deInterleave, bool oqpsk, bool differentialDecode)
     : mDeInterleave(deInterleave)
     , mDifferentialDecode(differentialDecode)
     , mCorrelation(differentialDecode ? sSynchWordOQPSK : sSynchWordQPSK, oqpsk) {}
 
-size_t MeteorDecoder::decode(uint8_t* softBits, size_t length) {
+size_t MeteorDecoder::decode(uint8_t* softBits, size_t length, std::function<void(const uint8_t* cadu, std::size_t size)> callback) {
     size_t decodedPacketCounter = 0;
     size_t syncWordFound = 0;
 
@@ -17,7 +18,7 @@ size_t MeteorDecoder::decode(uint8_t* softBits, size_t length) {
         length = outLen;
     }
 
-    mCorrelation.correlate(softBits, length, [&softBits, length, &decodedPacketCounter, &syncWordFound, this](Correlation::CorellationResult correlationResult, Correlation::PhaseShift phaseShift) {
+    mCorrelation.correlate(softBits, length, [&softBits, length, &decodedPacketCounter, &syncWordFound, &callback, this](Correlation::CorellationResult correlationResult, Correlation::PhaseShift phaseShift) {
         bool packetOk;
         uint32_t processedBits = 0;
 
@@ -28,7 +29,7 @@ size_t MeteorDecoder::decode(uint8_t* softBits, size_t length) {
                 return processedBits;
             }
 
-            memcpy(mDataTodecode, &softBits[correlationResult.pos + processedBits], 16384);
+            std::copy(&softBits[correlationResult.pos + processedBits], &softBits[correlationResult.pos + processedBits] + 16384, mDataTodecode);
 
             mCorrelation.rotateSoftIqInPlace(mDataTodecode, 16384, phaseShift);
 
@@ -53,17 +54,18 @@ size_t MeteorDecoder::decode(uint8_t* softBits, size_t length) {
             for(int i = 0; i < 4; i++) {
                 mReedSolomon.deinterleave(mViterbiResult + 4, i, 4);
                 rsResult[i] = mReedSolomon.decode();
-                mReedSolomon.interleave(mDecodedPacket, i, 4);
+                mReedSolomon.interleave(mDecodedPacket + 4, i, 4);
             }
 
             std::cout << "SyncWordFound:" << syncWordFound << " | Decoded Packets:" << decodedPacketCounter << " | Current Pos:" << (correlationResult.pos + processedBits) << " | Phase:" << phaseShift << " | synch:" << std::hex
-                      << last_sync_ << " | RS: (" << std::dec << rsResult[0] << ", " << rsResult[1] << ", " << rsResult[2] << ", " << rsResult[3] << ")"
+                      << last_sync_ << " | BER: " << mViterbi.getLastBER() << " | RS: (" << std::dec << rsResult[0] << ", " << rsResult[1] << ", " << rsResult[2] << ", " << rsResult[3] << ")"
                       << "\t\t\r";
 
             packetOk = (rsResult[0] != -1) && (rsResult[1] != -1) && (rsResult[2] != -1) && (rsResult[3] != -1);
 
             if(packetOk) {
-                parseFrame(mDecodedPacket, 892);
+                std::copy(mViterbiResult, mViterbiResult + 4, mDecodedPacket);
+                callback(mDecodedPacket, sizeof(mDecodedPacket));
                 decodedPacketCounter++;
                 processedBits += 16384;
             }

decoder/bitio.h

@@ -4,14 +4,14 @@
 #include <stdint.h>
 
 #include <cmath>
+#include <functional>
 
 #include "correlation.h"
 #include "deinterleaver.h"
-#include "packetparser.h"
 #include "reedsolomon.h"
 #include "viterbi.h"
 
-class MeteorDecoder : public PacketParser {
+class MeteorDecoder {
   private:
     static constexpr uint8_t PRAND[]
         = {0xff, 0x48, 0x0e, 0xc0, 0x9a, 0x0d, 0x70, 0xbc, 0x8e, 0x2c, 0x93, 0xad, 0xa7, 0xb7, 0x46, 0xce, 0x5a, 0x97, 0x7d, 0xcc, 0x32, 0xa2, 0xbf, 0x3e, 0x0a, 0x10, 0xf1, 0x88, 0x94, 0xcd, 0xea, 0xb1, 0xfe, 0x90, 0x1d, 0x81, 0x34,
@@ -27,7 +27,7 @@ class MeteorDecoder : public PacketParser {
     MeteorDecoder() = delete;
     MeteorDecoder(bool deInterleave, bool oqpsk, bool differentialDecode);
 
-    size_t decode(uint8_t* softBits, size_t length);
+    size_t decode(uint8_t* softBits, size_t length, std::function<void(const uint8_t* cadu, std::size_t size)> callback);
 
   private:
     bool mDeInterleave;