Merge pull request #787 from srcejon/sat_tracker

Satellite tracker feature and APT demodulator

.appveyor.yml

@@ -81,7 +81,7 @@ for:
             qml-module-qtlocation qml-module-qtpositioning qml-module-qtquick-window2 qml-module-qtquick-dialogs \
             qml-module-qtquick-controls qml-module-qtquick-layouts \
             libqt5serialport5-dev qtdeclarative5-dev qtpositioning5-dev qtlocation5-dev \
-            libqt5charts5-dev \
+            libqt5charts5-dev libqt5texttospeech5-dev \
             libusb-1.0-0-dev libboost-all-dev libasound2-dev libopencv-dev libopencv-imgcodecs-dev \
             libxml2-dev bison flex ffmpeg  libpostproc-dev libavcodec-dev libavformat-dev \
             libopus-dev libcodec2-dev libairspy-dev libhackrf-dev \

CMakeLists.txt

@@ -312,7 +312,8 @@ if (BUILD_GUI)
                      QuickWidgets
                      Positioning
                      Location
-                     Charts)
+                     Charts
+                     TextToSpeech)
 endif()
 
 # other requirements
@@ -366,6 +367,8 @@ else()
     find_package(LibMbe)
     find_package(SerialDV REQUIRED)
     find_package(LibDSDcc)
+    find_package(Sgp4)
+    find_package(AptDec)
 endif()
 
 # Devices

cmake/Modules/FindAptDec.cmake

@@ -0,0 +1,29 @@
+IF(NOT APT_FOUND)
+    INCLUDE(FindPkgConfig)
+    PKG_CHECK_MODULES(PC_APT apt)
+
+    FIND_PATH(
+        APT_INCLUDE_DIR
+        NAMES apt.h
+        HINTS ${APT_DIR}/include/apt
+        PATHS /usr/local/include/apt
+              /usr/include/apt
+    )
+
+    FIND_LIBRARY(
+        APT_LIBRARIES
+        NAMES apt
+        HINTS ${APT_DIR}/lib
+        PATHS /usr/local/lib
+              /usr/lib
+              /usr/lib64
+    )
+
+    message(STATUS "APT LIBRARIES " ${APT_LIBRARIES})
+    message(STATUS "APT INCLUDE DIRS " ${APT_INCLUDE_DIR})
+
+    INCLUDE(FindPackageHandleStandardArgs)
+    FIND_PACKAGE_HANDLE_STANDARD_ARGS(APT DEFAULT_MSG APT_LIBRARIES APT_INCLUDE_DIR)
+    MARK_AS_ADVANCED(APT_LIBRARIES APT_INCLUDE_DIR)
+
+ENDIF(NOT APT_FOUND)

cmake/Modules/FindSgp4.cmake

@@ -0,0 +1,29 @@
+IF(NOT SGP4_FOUND)
+    INCLUDE(FindPkgConfig)
+    PKG_CHECK_MODULES(PC_SGP4 sgp4)
+
+    FIND_PATH(
+        SGP4_INCLUDE_DIR
+        NAMES SGP4.h
+        HINTS ${SGP4_DIR}/include/SGP4
+        PATHS /usr/local/include/SGP4
+              /usr/include/SGP4
+    )
+
+    FIND_LIBRARY(
+        SGP4_LIBRARIES
+        NAMES sgp4s
+        HINTS ${SGP4_DIR}/lib
+        PATHS /usr/local/lib
+              /usr/lib
+              /usr/lib64
+    )
+
+    message(STATUS "SGP4 LIBRARIES " ${SGP4_LIBRARIES})
+    message(STATUS "SGP4 INCLUDE DIRS " ${SGP4_INCLUDE_DIR})
+
+    INCLUDE(FindPackageHandleStandardArgs)
+    FIND_PACKAGE_HANDLE_STANDARD_ARGS(SGP4 DEFAULT_MSG SGP4_LIBRARIES SGP4_INCLUDE_DIR)
+    MARK_AS_ADVANCED(SGP4_LIBRARIES SGP4_INCLUDE_DIR)
+
+ENDIF(NOT SGP4_FOUND)

debian/control

@@ -22,6 +22,7 @@ Build-Depends: debhelper (>= 9),
  qml-module-qtquick-layouts,
  libqt5serialport5-dev,
  libqt5charts5-dev,
+ libqt5texttospeech5-dev,
  qtdeclarative5-dev,
  qtpositioning5-dev,
  qtlocation5-dev,

external/CMakeLists.txt

@@ -359,6 +359,57 @@ if ((NOT LIBDSDCC_FOUND OR LIBDSDCC_EXTERNAL) AND LIBMBE_FOUND)
     endif ()
 endif ((NOT LIBDSDCC_FOUND OR LIBDSDCC_EXTERNAL) AND LIBMBE_FOUND)
 
+# For APT demodulator
+set(APT_LIBRARIES "${SDRANGEL_BINARY_LIB_DIR}/apt.lib" CACHE INTERNAL "")
+ExternalProject_Add(apt
+        GIT_REPOSITORY https://github.com/srcejon/aptdec.git
+        GIT_TAG libaptdec
+        PREFIX "${EXTERNAL_BUILD_LIBRARIES}/apt"
+        CMAKE_ARGS ${COMMON_CMAKE_ARGS}
+        BUILD_BYPRODUCTS "${APT_LIBRARIES}"
+        INSTALL_COMMAND ""
+        TEST_COMMAND ""
+        )
+ExternalProject_Get_Property(apt source_dir binary_dir)
+set(APT_FOUND ON CACHE INTERNAL "")
+set(APT_EXTERNAL ON CACHE INTERNAL "")
+set(APT_INCLUDE_DIR "${EXTERNAL_BUILD_LIBRARIES}/apt/src/apt/src" CACHE INTERNAL "")
+if (WIN32)
+    install(FILES "${SDRANGEL_BINARY_BIN_DIR}/apt${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION "${INSTALL_LIB_DIR}")
+elseif (APPLE)
+    set(APT_LIBRARIES "${binary_dir}/libapt${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
+    install(DIRECTORY "${binary_dir}/" DESTINATION "${INSTALL_LIB_DIR}"
+            FILES_MATCHING PATTERN "libapt*${CMAKE_SHARED_LIBRARY_SUFFIX}")
+    set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${binary_dir}/")
+endif ()
+
+# For Satellite Tracker feature
+# No tags for this in github - but doesn't change often
+# Fails to build with CMAKE_INTERPROCEDURAL_OPTIMIZATION=ON on Windows
+set(SGP4_LIBRARIES "${SDRANGEL_BINARY_LIB_DIR}/sgp4s.lib" CACHE INTERNAL "")
+ExternalProject_Add(sgp4
+        GIT_REPOSITORY https://github.com/dnwrnr/sgp4.git
+        PREFIX "${EXTERNAL_BUILD_LIBRARIES}/sgp4"
+        CMAKE_ARGS ${COMMON_CMAKE_ARGS}
+        -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF
+        BUILD_BYPRODUCTS "${SGP4_LIBRARIES}"
+        INSTALL_COMMAND ""
+        TEST_COMMAND ""
+        )
+ExternalProject_Get_Property(sgp4 source_dir binary_dir)
+set(SGP4_FOUND ON CACHE INTERNAL "")
+set(SGP4_EXTERNAL ON CACHE INTERNAL "")
+set(SGP4_INCLUDE_DIR "${EXTERNAL_BUILD_LIBRARIES}/sgp4/src/sgp4/libsgp4" CACHE INTERNAL "")
+if (WIN32)
+    install(FILES "${SDRANGEL_BINARY_BIN_DIR}/sgp4s${CMAKE_SHARED_LIBRARY_SUFFIX}" DESTINATION "${INSTALL_LIB_DIR}")
+elseif (APPLE)
+    set(SGP4_LIBRARIES "${binary_dir}/libsgp4s${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
+    install(DIRECTORY "${binary_dir}/" DESTINATION "${INSTALL_LIB_DIR}"
+            FILES_MATCHING PATTERN "libsgp4s*${CMAKE_SHARED_LIBRARY_SUFFIX}")
+    set(MACOS_EXTERNAL_LIBS_FIXUP "${MACOS_EXTERNAL_LIBS_FIXUP};${binary_dir}/")
+endif ()
+
+
 # requirements needed by many packages on windows
 if (WIN32)
     ExternalProject_Add(pthreads4w

plugins/channelrx/CMakeLists.txt

@@ -18,6 +18,10 @@ add_subdirectory(demodchirpchat)
 add_subdirectory(demodvorsc)
 add_subdirectory(demodpacket)
 
+if(APT_FOUND)
+    add_subdirectory(demodapt)
+endif()
+
 if(LIBDSDCC_FOUND AND LIBMBE_FOUND)
     add_subdirectory(demoddsd)
 endif(LIBDSDCC_FOUND AND LIBMBE_FOUND)

plugins/channelrx/demodadsb/adsbdemodgui.cpp

@@ -471,6 +471,7 @@ void ADSBDemodGUI::updatePosition(Aircraft *aircraft)
             swgMapItem->setAltitude(Units::feetToMetres(aircraft->m_altitude));
             swgMapItem->setImage(new QString(QString("qrc:///map/%1").arg(aircraft->getImage())));
             swgMapItem->setImageRotation(aircraft->m_heading);
+            swgMapItem->setImageMinZoom(11);
             swgMapItem->setText(new QString(aircraft->getText(true)));
 
             MainCore::MsgMapItem *msg = MainCore::MsgMapItem::create(m_adsbDemod, swgMapItem);

plugins/channelrx/demodadsb/adsbdemodsettings.cpp

@@ -41,7 +41,7 @@ void ADSBDemodSettings::resetToDefaults()
     m_feedHost = "feed.adsbexchange.com";
     m_feedPort = 30005;
     m_feedFormat = BeastBinary;
-    m_rgbColor = QColor(255, 0, 0).rgb();
+    m_rgbColor = QColor(244, 151, 57).rgb();
     m_title = "ADS-B Demodulator";
     m_streamIndex = 0;
     m_useReverseAPI = false;
@@ -157,7 +157,7 @@ bool ADSBDemodSettings::deserialize(const QByteArray& data)
             m_feedPort = 30005;
         }
 
-        d.readU32(9, &m_rgbColor, QColor(255, 0, 0).rgb());
+        d.readU32(9, &m_rgbColor, QColor(244, 151, 57).rgb());
         d.readString(11, &m_title, "ADS-B Demodulator");
         d.readBool(12, &m_useReverseAPI, false);
         d.readString(13, &m_reverseAPIAddress, "127.0.0.1");