Merge pull request #76 from Digitelektro/feature/meteor_m2-3

Feature/meteor m2 3

Author: Digitelektro

CMakeLists.txt

@@ -152,7 +152,7 @@ if(UNIX AND NOT APPLE)
         SET(CPACK_GENERATOR "DEB")
         SET(CPACK_PACKAGE_VERSION_MAJOR "2")
         SET(CPACK_PACKAGE_VERSION_MINOR "5")
-        SET(CPACK_PACKAGE_VERSION_PATCH "3")
+        SET(CPACK_PACKAGE_VERSION_PATCH "4")
         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")

common/settings.cpp

@@ -301,7 +301,10 @@ bool Settings::differentialDecode() const {
     bool result = false;
 
     if(mArgs.count("--diff")) {
-        result = true;
+        result = atoi(mArgs.at("--diff").c_str()) > 0;
+    }
+    if(mArgs.count("-diff")) {
+        result = atoi(mArgs.at("-diff").c_str()) > 0;
     }
 
     return result;
@@ -311,7 +314,10 @@ bool Settings::deInterleave() const {
     bool result = false;
 
     if(mArgs.count("--int")) {
-        result = true;
+        result = atoi(mArgs.at("--int").c_str()) > 0;
+    }
+    if(mArgs.count("-int")) {
+        result = atoi(mArgs.at("-int").c_str()) > 0;
     }
 
     return result;
@@ -321,10 +327,10 @@ bool Settings::getBrokenModulation() const {
     bool result = false;
 
     if(mArgs.count("-b")) {
-        result = true;
+        result = atoi(mArgs.at("-b").c_str()) > 0;
     }
     if(mArgs.count("--brokenM2")) {
-        result = true;
+        result = atoi(mArgs.at("--brokenM2").c_str()) > 0;
     }
 
     return result;

common/version.h

@@ -3,6 +3,6 @@
 
 #define VERSION_MAJOR 2
 #define VERSION_MINOR 5
-#define VERSION_FIX 3
+#define VERSION_FIX 4
 
 #endif // VERSION_H

decoder/correlation.cpp

@@ -67,7 +67,7 @@ uint64_t Correlation::rotate64(uint64_t word, PhaseShift phaseShift) {
         case 6:
             word = swapIQ(word) ^ 0xFFFFFFFFFFFFFFFFU;
             break;
-        case_7:
+        case 7:
             word = swapIQ(word) ^ 0xAAAAAAAAAAAAAAAAU;
             break;
         default:

main.cpp

@@ -56,8 +56,9 @@ int main(int argc, char* argv[]) {
 
     mThreadPool.start();
 
+    MeteorDecoder meteorDecoder(mSettings.deInterleave(), mSettings.getDemodulatorMode() == "oqpsk", mSettings.differentialDecode());
+
     size_t decodedPacketCounter = 0;
-    MeteorDecoder meteorDecoder(mSettings.deInterleave(), mSettings.differentialDecode(), mSettings.getDemodulatorMode() == "oqpsk");
     std::string inputPath = mSettings.getInputFilePath();
     try {
         if(inputPath.substr(inputPath.find_last_of(".") + 1) == "wav") {