diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index b0a6648..02b9310 100644 --- a/QGCExternalLibs.pri +++ b/QGCExternalLibs.pri @@ -224,13 +224,13 @@ contains (DEFINES, DISABLE_AIRMAP) { AIRMAP_QT_PATH = Qt.$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION} message('Looking for Airmap in folder "$${AIRMAP_PLATFORM_SDK_PATH}", variant: "$$AIRMAP_QT_PATH"') MacBuild { - exists($${AIRMAPD_PATH}/macOS/$$AIRMAP_QT_PATH) { + exists("$${AIRMAPD_PATH}/macOS/$$AIRMAP_QT_PATH") { message("Including support for AirMap for macOS") LIBS += -L$${AIRMAPD_PATH}/macOS/$$AIRMAP_QT_PATH -lairmap-qt DEFINES += QGC_AIRMAP_ENABLED } } else:LinuxBuild { - exists($${AIRMAP_PLATFORM_SDK_PATH}/linux/$$AIRMAP_QT_PATH) { + exists("$${AIRMAP_PLATFORM_SDK_PATH}/linux/$$AIRMAP_QT_PATH") { message("Including support for AirMap for Linux") LIBS += -L$${AIRMAP_PLATFORM_SDK_PATH}/linux/$$AIRMAP_QT_PATH -lairmap-qt DEFINES += QGC_AIRMAP_ENABLED @@ -240,17 +240,17 @@ contains (DEFINES, DISABLE_AIRMAP) { AIRMAP_PLATFORM_SDK_URL = "https://github.com/airmap/platform-sdk/releases/download/v1.1/airmap-platform-sdk-1.1.0-Linux.deb" AIRMAP_PLATFORM_SDK_FILENAME = "airmap-platform-sdk.deb" AIRMAP_PLATFORM_SDK_INSTALL_PREFIX = "airmap-platform-sdk" - !exists($${AIRMAP_PLATFORM_SDK_PATH}/linux/$${AIRMAP_QT_PATH}) { - system(mkdir -p $${AIRMAP_PLATFORM_SDK_PATH}/linux/$${AIRMAP_QT_PATH}) + !exists("$${AIRMAP_PLATFORM_SDK_PATH}/linux/$${AIRMAP_QT_PATH}") { + system("mkdir -p $${AIRMAP_PLATFORM_SDK_PATH}/linux/$${AIRMAP_QT_PATH}") } - !exists($${AIRMAP_PLATFORM_SDK_PATH}/include) { - system(mkdir -p $${AIRMAP_PLATFORM_SDK_PATH}/include) + !exists("$${AIRMAP_PLATFORM_SDK_PATH}/include") { + system("mkdir -p $${AIRMAP_PLATFORM_SDK_PATH}/include") } - system(wget -q -O $${AIRMAP_PLATFORM_SDK_FILENAME} $${AIRMAP_PLATFORM_SDK_URL} && dpkg -x $${AIRMAP_PLATFORM_SDK_FILENAME} $${AIRMAP_PLATFORM_SDK_PATH}/) - system(mv $${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}/lib/* $${AIRMAP_PLATFORM_SDK_PATH}/linux/$${AIRMAP_QT_PATH}/) - system(mv $${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}/include/airmap/* $${AIRMAP_PLATFORM_SDK_PATH}/include/ ) - system(rm -rf $${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}) - system(rm $${AIRMAP_PLATFORM_SDK_FILENAME}) + system("wget -q -O $${AIRMAP_PLATFORM_SDK_FILENAME} $${AIRMAP_PLATFORM_SDK_URL} && dpkg -x $${AIRMAP_PLATFORM_SDK_FILENAME} $${AIRMAP_PLATFORM_SDK_PATH}/") + system("mv $${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}/lib/* $${AIRMAP_PLATFORM_SDK_PATH}/linux/$${AIRMAP_QT_PATH}/") + system("mv $${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}/include/airmap/* $${AIRMAP_PLATFORM_SDK_PATH}/include/") + system("rm -rf $${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}") + system("rm $${AIRMAP_PLATFORM_SDK_FILENAME}") exists($${AIRMAP_PLATFORM_SDK_PATH}/linux/$$AIRMAP_QT_PATH) { message("Including support for AirMap for Linux") diff --git a/src/Airmap/AirMapManager.cc b/src/Airmap/AirMapManager.cc index ccf99f9..9c5f750 100644 --- a/src/Airmap/AirMapManager.cc +++ b/src/Airmap/AirMapManager.cc @@ -43,9 +43,9 @@ AirMapManager::AirMapManager(QGCApplication* app, QGCToolbox* toolbox) { _logger = std::make_shared(); qt::register_types(); // TODO: still needed? - _logger->logging_category().setEnabled(QtDebugMsg, true); - _logger->logging_category().setEnabled(QtInfoMsg, true); - _logger->logging_category().setEnabled(QtWarningMsg, true); + _logger->logging_category().setEnabled(QtDebugMsg, false); + _logger->logging_category().setEnabled(QtInfoMsg, false); + _logger->logging_category().setEnabled(QtWarningMsg, false); _dispatchingLogger = std::make_shared(_logger); connect(&_shared, &AirMapSharedState::error, this, &AirMapManager::_error); connect(&_shared, &AirMapSharedState::authStatus, this, &AirMapManager::_authStatusChanged);