One small actual change. a bit of refactoring otherwise (#664)

* exp - can we run on QT 6 * exp - can we run on QT 6 * exp - can we run on QT 6 * exp - can we run on QT 6 * exp - can we run on QT 6 * add disable autofetch option in dev
OpenHD · Feb 25, 2024 · fcc8cbb · fcc8cbb
1 parent dc4d61c
commit fcc8cbb
Show file tree

Hide file tree

Showing 54 changed files with 384 additions and 89 deletions.
diff --git a/.gitignore b/.gitignore
@@ -84,3 +84,5 @@ build
 qopenhd.qmltypes
 qopenhd_metatypes.json
 qopenhd_qmltyperegistrations.cpp
+
+CMakeLists.txt.user
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,111 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(QOpenHDProject VERSION 0.1 LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+find_package(Qt6 6.5 REQUIRED COMPONENTS Core)
+find_package(Qt6 6.5 REQUIRED COMPONENTS Quick)
+find_package(Qt6 6.5 REQUIRED COMPONENTS Gui)
+find_package(Qt6 6.5 REQUIRED COMPONENTS Widgets)
+
+qt_standard_project_setup(REQUIRES 6.5)
+
+qt_add_executable(QOpenHDApp
+    app/main.cpp
+    #
+    app/adsb/adsbvehicle.cpp
+    app/adsb/adsbvehiclemanager.cpp
+    app/adsb/qmlobjectlistmodel.cpp
+    #
+    app/util/WorkaroundMessageBox.cpp
+    app/util/mousehelper.cpp
+    app/util/qopenhd.cpp
+    app/util/qrenderstats.cpp
+    app/util/restartqopenhdmessagebox.cpp
+    #
+    app/osd/altitudeladder.cpp
+    app/osd/aoagauge.cpp
+    app/osd/flightpathvector.cpp
+    app/osd/headingladder.cpp
+    app/osd/horizonladder.cpp
+    app/osd/speedladder.cpp
+    #
+    app/logging/hudlogmessagesmodel.cpp
+    app/logging/logmessagesmodel.cpp
+    #
+    app/telemetry/MavlinkTelemetry.cpp
+    app/telemetry/action/fcaction.cpp
+    app/telemetry/action/fcmissionhandler.cpp
+    app/telemetry/action/fcmsgintervalhandler.cpp
+    app/telemetry/action/ohdaction.cpp
+    #
+    app/telemetry/action/impl/cmdsender.cpp
+    app/telemetry/action/impl/xparam.cpp
+    ##
+    app/telemetry/connection/mavlinkchannel.cpp
+    app/telemetry/connection/tcp_connection.cpp
+    app/telemetry/connection/udp_connection.cpp
+    #
+    app/telemetry/models/aohdsystem.cpp
+    app/telemetry/models/camerastreammodel.cpp
+    app/telemetry/models/fcmapmodel.cpp
+    app/telemetry/models/fcmavlinkmissionitemsmodel.cpp
+    app/telemetry/models/fcmavlinksystem.cpp
+    app/telemetry/models/markermodel.cpp
+    app/telemetry/models/rcchannelsmodel.cpp
+    app/telemetry/models/wificard.cpp
+    #
+    app/telemetry/settings/documentedparam.cpp
+    app/telemetry/settings/frequencyhelper.cpp
+    app/telemetry/settings/improvedintsetting.cpp
+    app/telemetry/settings/improvedstringsetting.cpp
+    app/telemetry/settings/mavlinksettingsmodel.cpp
+    app/telemetry/settings/pollutionhelper.cpp
+    app/telemetry/settings/wblinksettingshelper.cpp
+
+    ###
+    #app/videostreaming/vscommon/custom/rawreceiver.cpp
+    #app/videostreaming/vscommon/rtp/rtpreceiver.cpp
+    #app/videostreaming/vscommon/rtp/ParseRTP.cpp
+    app/videostreaming/vscommon/decodingstatistcs.cpp
+    app/videostreaming/vscommon/decodingstatistcs.h
+    ##
+    lib/geographiclib-c-2.0/src/geodesic.c
+    ##
+    ##
+    ##
+    qml/qml.qrc
+)
+
+target_include_directories(QOpenHDApp PUBLIC app)
+target_include_directories(QOpenHDApp PUBLIC app/common)
+target_include_directories(QOpenHDApp PUBLIC app/adsb)
+target_include_directories(QOpenHDApp PUBLIC app/logging)
+target_include_directories(QOpenHDApp PUBLIC app/osd)
+target_include_directories(QOpenHDApp PUBLIC app/util)
+target_include_directories(QOpenHDApp PUBLIC app/telemetry)
+target_include_directories(QOpenHDApp PUBLIC app/telemetry/util)
+
+target_include_directories(QOpenHDApp PUBLIC app/videostreaming/vscommon)
+target_include_directories(QOpenHDApp PUBLIC lib)
+
+qt_add_qml_module(QOpenHDApp
+    URI QOpenHD
+    VERSION 1.0
+    QML_FILES
+        qml/MainX.qml
+)
+
+
+target_link_libraries(QOpenHDApp
+    PRIVATE Qt6::Core Qt6::Quick Qt6::Gui Qt6::Widgets
+)
+
+#include(GNUInstallDirs)
+#install(TARGETS QOpenHD
+#    BUNDLE DESTINATION .
+#    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+#    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+#)
diff --git a/QOpenHD.pro b/QOpenHD.pro
@@ -129,6 +129,7 @@ HEADERS += \
     app/util/WorkaroundMessageBox.h \
     app/util/qrenderstats.h \
     app/util/restartqopenhdmessagebox.h \
+    app/util/lqutils_include.h \
 
 
 # Geographic lib updated to c-2.0, so much cleaner
@@ -180,12 +181,6 @@ DISTFILES += \
     android/src/org/freedesktop/gstreamer/androidmedia/GstAmcOnFrameAvailableListener.java \
     android/src/org/openhd/IsConnected.java \
     android/src/org/openhd/LiveVideoPlayerWrapper.java \
-    app/telemetry/telemetry.pri \
-    app/videostreaming/gst_qmlglsink/gst_video.pri \
-    app/videostreaming/vscommon/vscommon.pri \
-    app/vs_android/videostreamingandroid.pri \
-    extra_build_qmake.sh \
-    lib/h264nal/h264nal.pri \
     qml/qtquickcontrols2.conf \
     qml/ui/qmldir \
 

diff --git a/app/common/openhd-util.hpp b/app/common/openhd-util.hpp
@@ -92,18 +92,6 @@ static std::string yes_or_no(bool yes){
   return (yes ? "Y" : "N");
 }
 
-static bool is_valid_ip(const std::string& ip) {
-#if defined(__linux__) || defined(__macos__)
-  unsigned char buf[sizeof(struct in6_addr)];
-  auto result = inet_pton(AF_INET, ip.c_str(), buf);
-  return result == 1;
-#else
-  // TODO find method
-  return true;
-#endif //#ifdef __linux__
-
-}
-
 }
 
 #endif
diff --git a/app/main.cpp b/app/main.cpp
@@ -418,7 +418,12 @@ int main(int argc, char *argv[]) {
 #endif
      );
 
+    // TODO QT 6
     engine.load(QUrl(QLatin1String("qrc:/main.qml")));
+    //engine.loadFromModule("QOpenHD", "qrc:/main.qml");
+    //engine.loadFromModule("QOpenHDApp","qrc:/main.qml");
+    //engine.load("qml/main.qml");
+    //engine.loadFromModule("QOpenHD", "MainX");
 
 #if defined(__android__)
     QtAndroid::hideSplashScreen();

diff --git a/app/osd/altitudeladder.h b/app/osd/altitudeladder.h
@@ -2,7 +2,7 @@
 #include <QQuickPaintedItem>
 #include <QPainter>
 
-#include "../../../lib/lqtutils_master/lqtutils_prop.h"
+#include "util/lqutils_include.h"
 
 class AltitudeLadder : public QQuickPaintedItem {
     Q_OBJECT

diff --git a/app/osd/headingladder.h b/app/osd/headingladder.h
@@ -2,7 +2,7 @@
 #include <QQuickPaintedItem>
 #include <QPainter>
 
-#include "../../../lib/lqtutils_master/lqtutils_prop.h"
+#include "util/lqutils_include.h"
 
 class HeadingLadder : public QQuickPaintedItem {
     Q_OBJECT

diff --git a/app/osd/speedladder.h b/app/osd/speedladder.h
@@ -2,7 +2,7 @@
 #include <QQuickPaintedItem>
 #include <QPainter>
 
-#include "../../../lib/lqtutils_master/lqtutils_prop.h"
+#include "util/lqutils_include.h"
 
 class SpeedLadder : public QQuickPaintedItem {
     Q_OBJECT

diff --git a/app/telemetry/MavlinkTelemetry.cpp b/app/telemetry/MavlinkTelemetry.cpp
@@ -1,11 +1,10 @@
 #include "MavlinkTelemetry.h"
 
-#include "common/openhd-util.hpp"
 #include "models/aohdsystem.h"
 #include "models/fcmavlinksystem.h"
 
 #include "settings/mavlinksettingsmodel.h"
-#include "util/qopenhdmavlinkhelper.hpp"
+#include "tutil/qopenhdmavlinkhelper.hpp"
 
 #include "action/fcmissionhandler.h"
 #include "action/impl/cmdsender.h"
@@ -317,7 +316,7 @@ void MavlinkTelemetry::change_telemetry_connection_mode(int mavlink_connection_m
 
 bool MavlinkTelemetry::change_manual_tcp_ip(QString ip)
 {
-    if(!OHDUtil::is_valid_ip(ip.toStdString())){
+    if(!QOpenHD::instance().is_valid_ip(ip)){
         return false;
     }
     threadsafe_set_manual_tcp_ip(ip.toStdString());

diff --git a/app/telemetry/MavlinkTelemetry.h b/app/telemetry/MavlinkTelemetry.h
@@ -7,7 +7,7 @@
 #include <mutex>
 #include <thread>
 
-#include "util/mavlink_include.h"
+#include "tutil/mavlink_include.h"
 #include "../../lib/lqtutils_master/lqtutils_prop.h"
 #include "../common/TimeHelper.hpp"
 

diff --git a/app/telemetry/action/create_cmd_helper.hpp b/app/telemetry/action/create_cmd_helper.hpp
@@ -1,7 +1,7 @@
 #ifndef CMD_HELPER_H
 #define CMD_HELPER_H
 
-#include "../util/mavlink_include.h"
+#include "../tutil/mavlink_include.h"
 
 // Here we have various util methods to create mavlink_command_long_t commands
 namespace cmd::helper{

diff --git a/app/telemetry/action/fcaction.cpp b/app/telemetry/action/fcaction.cpp
@@ -7,7 +7,7 @@
 
 #include "create_cmd_helper.hpp"
 #include "../models/fcmavlinksystem.h"
-#include "util/mavlink_enum_to_string.h"
+#include "tutil/mavlink_enum_to_string.h"
 
 FCAction::FCAction(QObject *parent)
     : QObject{parent}

diff --git a/app/telemetry/action/fcaction.h b/app/telemetry/action/fcaction.h
@@ -4,7 +4,7 @@
 #include <QObject>
 #include <mutex>
 
-#include "../util/mavlink_include.h"
+#include "../tutil/mavlink_include.h"
 #include "../../../lib/lqtutils_master/lqtutils_prop.h"
 
 /**

diff --git a/app/telemetry/action/fcmissionhandler.cpp b/app/telemetry/action/fcmissionhandler.cpp
@@ -1,6 +1,6 @@
 #include "fcmissionhandler.h"
-#include "../util/qopenhdmavlinkhelper.hpp"
-#include "../util/telemetryutil.hpp"
+#include "../tutil/qopenhdmavlinkhelper.hpp"
+#include "../tutil/telemetryutil.hpp"
 #include "../MavlinkTelemetry.h"
 
 #include "../models/fcmavlinkmissionitemsmodel.h"

diff --git a/app/telemetry/action/fcmissionhandler.h b/app/telemetry/action/fcmissionhandler.h
@@ -13,7 +13,7 @@
 
 #include "../../../lib/lqtutils_master/lqtutils_prop.h"
 
-#include "../util/mavlink_include.h"
+#include "../tutil/mavlink_include.h"
 
 /**
  * Simple class to (semi-reliably) get all the mission waypoints from the FC and more.

diff --git a/app/telemetry/action/fcmsgintervalhandler.h b/app/telemetry/action/fcmsgintervalhandler.h
@@ -7,7 +7,7 @@
 #include <optional>
 #include <qsettings.h>
 
-#include "../util/mavlink_include.h"
+#include "../tutil/mavlink_include.h"
 
 /**
  * We need to manually request / set the message interval(s) for specific messages on ardupilot

diff --git a/app/telemetry/action/impl/cmdsender.cpp b/app/telemetry/action/impl/cmdsender.cpp
@@ -2,9 +2,9 @@
 
 #include <qdebug.h>
 
-#include "../../util/qopenhdmavlinkhelper.hpp"
+#include "../../tutil/qopenhdmavlinkhelper.hpp"
 #include "../../MavlinkTelemetry.h"
-#include "util/mavlink_enum_to_string.h"
+#include "tutil/mavlink_enum_to_string.h"
 #include <future>
 
 CmdSender::CmdSender()

diff --git a/app/telemetry/action/impl/cmdsender.h b/app/telemetry/action/impl/cmdsender.h
@@ -1,7 +1,7 @@
 #ifndef CMDSENDER_H
 #define CMDSENDER_H
 
-#include "../../util/mavlink_include.h"
+#include "../../tutil/mavlink_include.h"
 
 #include <optional>
 #include <functional>

diff --git a/app/telemetry/action/impl/xparam.cpp b/app/telemetry/action/impl/xparam.cpp
@@ -1,5 +1,5 @@
 #include "xparam.h"
-#include "util/qopenhdmavlinkhelper.hpp"
+#include "tutil/qopenhdmavlinkhelper.hpp"
 
 #include <cstring>
 #include <sstream>

diff --git a/app/telemetry/action/impl/xparam.h b/app/telemetry/action/impl/xparam.h
@@ -9,7 +9,7 @@
 #include <functional>
 #include <vector>
 
-#include "../../util/mavlink_include.h"
+#include "../../tutil/mavlink_include.h"
 
 class XParam
 {

diff --git a/app/telemetry/action/ohdaction.cpp b/app/telemetry/action/ohdaction.cpp
@@ -1,7 +1,7 @@
 #include "ohdaction.h"
 
 #include "create_cmd_helper.hpp"
-#include "../util/openhd_defines.hpp"
+#include "../tutil/openhd_defines.hpp"
 #include "impl/cmdsender.h"
 
 //#include "../models/aohdsystem.h"

diff --git a/app/telemetry/connection/tcp_connection.cpp b/app/telemetry/connection/tcp_connection.cpp
@@ -1,5 +1,5 @@
 #include "tcp_connection.h"
-#include "util/qopenhdmavlinkhelper.hpp"
+#include "tutil/qopenhdmavlinkhelper.hpp"
 
 #ifdef __windows__
 #define _WIN32_WINNT 0x0600 //TODO dirty

diff --git a/app/telemetry/connection/tcp_connection.h b/app/telemetry/connection/tcp_connection.h
@@ -1,7 +1,7 @@
 #ifndef TCPCONNECTION2_H
 #define TCPCONNECTION2_H
 
-#include "../util/mavlink_include.h"
+#include "../tutil/mavlink_include.h"
 
 #include <thread>
 #include <memory.h>

diff --git a/app/telemetry/connection/udp_connection.cpp b/app/telemetry/connection/udp_connection.cpp
@@ -1,5 +1,5 @@
 #include "udp_connection.h"
-#include "util/qopenhdmavlinkhelper.hpp"
+#include "tutil/qopenhdmavlinkhelper.hpp"
 
 #ifdef __windows__
 #define _WIN32_WINNT 0x0600 //TODO dirty

diff --git a/app/telemetry/connection/udp_connection.h b/app/telemetry/connection/udp_connection.h
@@ -1,7 +1,7 @@
 #ifndef MUDPLINK_H
 #define MUDPLINK_H
 
-#include "../util/mavlink_include.h"
+#include "../tutil/mavlink_include.h"
 
 #include <thread>
 #include <memory.h>

diff --git a/app/telemetry/models/aohdsystem.cpp b/app/telemetry/models/aohdsystem.cpp
@@ -3,7 +3,7 @@
 #include "../../common/StringHelper.hpp"
 #include "../../common/TimeHelper.hpp"
 #include "QOpenHDVideoHelper.hpp"
-#include "util/telemetryutil.hpp"
+#include "tutil/telemetryutil.hpp"
 #include "wificard.h"
 #include "rcchannelsmodel.h"
 #include "camerastreammodel.h"
@@ -16,7 +16,7 @@
 #include <logging/hudlogmessagesmodel.h>
 
 #include "util/qopenhd.h"
-#include "../util/qopenhdmavlinkhelper.hpp"
+#include "../tutil/qopenhdmavlinkhelper.hpp"
 
 #include <../util/WorkaroundMessageBox.h>
 #include "../settings/wblinksettingshelper.h"
@@ -481,6 +481,9 @@ void AOHDSystem::process_op_mode(const mavlink_openhd_wifbroadcast_gnd_operating
 
 void AOHDSystem::autofech_params_if_apropriate()
 {
+    QSettings settings;
+    const bool dev_disable_autofetch=settings.value("dev_disable_autofetch",false).toBool();
+    if(dev_disable_autofetch)return;
     if(!m_is_air){
         // Ground - auto-fetch IF ;)
         if(m_wb_gnd_operating_mode==0){