From 4f6bca2a8a77ad465f7e5c4b606b1e903d6ad59d Mon Sep 17 00:00:00 2001 From: Stacey Sheldon Date: Sun, 7 Oct 2012 17:29:27 -0400 Subject: [PATCH 1/5] makefile: choose correct qt installer for 64-bit machines --- Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dd3522760..152df5c8e 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,7 @@ $(foreach var, $(SANITIZE_DEPRECATED_VARS), $(eval $(call SANITIZE_VAR,$(var),de QT_SPEC=win32-g++ UAVOBJGENERATOR="$(BUILD_DIR)/ground/uavobjgenerator/debug/uavobjgenerator.exe" UNAME := $(shell uname) +ARCH := $(shell uname -m) ifeq ($(UNAME), Linux) QT_SPEC=linux-g++ UAVOBJGENERATOR="$(BUILD_DIR)/ground/uavobjgenerator/uavobjgenerator" @@ -161,10 +162,16 @@ $(BUILD_DIR): QT_SDK_DIR := $(TOOLS_DIR)/qtsdk-v1.2.1 .PHONY: qt_sdk_install +# Choose the appropriate installer based on host architecture +ifneq (,$(filter $(ARCH), x86_64 amd64)) +# 64-bit +qt_sdk_install: QT_SDK_FILE := QtSdk-offline-linux-x86_64-v1.2.1.run +qt_sdk_install: QT_SDK_URL := http://www.developer.nokia.com/dp?uri=http://sw.nokia.com/id/14b2039c-0e1f-4774-a4f2-9aa60b6d5313/Qt_SDK_Lin64_offline +else +# 32-bit qt_sdk_install: QT_SDK_URL := http://www.developer.nokia.com/dp?uri=http://sw.nokia.com/id/8ea74da4-fec1-4277-8b26-c58cc82e204b/Qt_SDK_Lin32_offline qt_sdk_install: QT_SDK_FILE := QtSdk-offline-linux-x86-v1.2.1.run -#qt_sdk_install: QT_SDK_URL := http://www.developer.nokia.com/dp?uri=http://sw.nokia.com/id/c365bbf5-c2b9-4dda-9c1f-34b2c8d07785/Qt_SDK_Lin32_offline_v1_1_2 -#qt_sdk_install: QT_SDK_FILE := Qt_SDK_Lin32_offline_v1_1_2_en.run +endif # order-only prereq on directory existance: qt_sdk_install : | $(DL_DIR) $(TOOLS_DIR) qt_sdk_install: qt_sdk_clean From 047201211b60bbe604dac29c11e8822522051a19 Mon Sep 17 00:00:00 2001 From: PT_Dreamer Date: Mon, 8 Oct 2012 21:26:39 +0100 Subject: [PATCH 2/5] GCS-Change config file name This is to force a new configuration to be loaded and used. --- ground/openpilotgcs/src/app/main.cpp | 2 +- ground/openpilotgcs/src/libs/utils/pathutils.cpp | 2 +- ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ground/openpilotgcs/src/app/main.cpp b/ground/openpilotgcs/src/app/main.cpp index 88eacd532..9d4010165 100644 --- a/ground/openpilotgcs/src/app/main.cpp +++ b/ground/openpilotgcs/src/app/main.cpp @@ -252,7 +252,7 @@ int main(int argc, char **argv) QCoreApplication::applicationDirPath()+QLatin1String(SHARE_PATH)); // keep this in sync with the MainWindow ctor in coreplugin/mainwindow.cpp QSettings settings(XmlConfig::XmlSettingsFormat, QSettings::UserScope, - QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS")); + QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS_config")); overrideSettings(settings, argc, argv); locale = settings.value("General/OverrideLanguage", locale).toString(); diff --git a/ground/openpilotgcs/src/libs/utils/pathutils.cpp b/ground/openpilotgcs/src/libs/utils/pathutils.cpp index 0ecdd3c85..3c06cd497 100644 --- a/ground/openpilotgcs/src/libs/utils/pathutils.cpp +++ b/ground/openpilotgcs/src/libs/utils/pathutils.cpp @@ -98,7 +98,7 @@ QString PathUtils::GetStoragePath() { // This routine works with "/" as the standard: // Work out where the settings are stored on the machine - QSettings set(XmlConfig::XmlSettingsFormat, QSettings::UserScope,QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS")); + QSettings set(XmlConfig::XmlSettingsFormat, QSettings::UserScope,QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS_config")); QFileInfo f(set.fileName()); QDir dir(f.absoluteDir()); diff --git a/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp b/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp index 2df94e9c9..dc74094a5 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp +++ b/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp @@ -102,11 +102,11 @@ MainWindow::MainWindow() : m_additionalContexts(m_globalContext), // keep this in sync with main() in app/main.cpp m_settings(new QSettings(XmlConfig::XmlSettingsFormat, QSettings::UserScope, - QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS"), this)), + QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS_config"), this)), m_globalSettings(new QSettings(XmlConfig::XmlSettingsFormat, QSettings::SystemScope, - QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS"), this)), + QLatin1String("OpenPilot"), QLatin1String("OpenPilotGCS_config"), this)), m_settingsDatabase(new SettingsDatabase(QFileInfo(m_settings->fileName()).path(), - QLatin1String("OpenPilotGCS"), + QLatin1String("OpenPilotGCS_config"), this)), m_dontSaveSettings(false), m_actionManager(new ActionManagerPrivate(this)), From 4b5c88589c415084ced4e19016ab6a307583f142 Mon Sep 17 00:00:00 2001 From: PT_Dreamer Date: Tue, 9 Oct 2012 00:16:22 +0100 Subject: [PATCH 3/5] GCS-Config wizard Made the wizard set stab1,2,3 as default flight modes for multis --- .../plugins/setupwizard/vehicleconfigurationhelper.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp index 709810bce..eb31c284a 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp @@ -403,6 +403,16 @@ void VehicleConfigurationHelper::applyManualControlDefaults() cData.ChannelNumber[ManualControlSettings::CHANNELGROUPS_PITCH] = 4; cData.ChannelNumber[ManualControlSettings::CHANNELGROUPS_FLIGHTMODE] = 5; + switch(m_configSource->getVehicleType()) + { + case VehicleConfigurationSource::VEHICLE_MULTI: + cData.FlightModePosition[0]=ManualControlSettings::FLIGHTMODEPOSITION_STABILIZED1; + cData.FlightModePosition[1]=ManualControlSettings::FLIGHTMODEPOSITION_STABILIZED2; + cData.FlightModePosition[2]=ManualControlSettings::FLIGHTMODEPOSITION_STABILIZED3; + break; + default: + break; + } mcSettings->setData(cData); addModifiedObject(mcSettings, tr("Writing manual control defaults")); } From d1b78faeb324cabe8c785415d6c530c385d79b90 Mon Sep 17 00:00:00 2001 From: PT_Dreamer Date: Tue, 9 Oct 2012 18:59:01 +0100 Subject: [PATCH 4/5] Revert "GCS-Config wizard" This reverts commit 4b5c88589c415084ced4e19016ab6a307583f142. --- .../plugins/setupwizard/vehicleconfigurationhelper.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp index eb31c284a..709810bce 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp @@ -403,16 +403,6 @@ void VehicleConfigurationHelper::applyManualControlDefaults() cData.ChannelNumber[ManualControlSettings::CHANNELGROUPS_PITCH] = 4; cData.ChannelNumber[ManualControlSettings::CHANNELGROUPS_FLIGHTMODE] = 5; - switch(m_configSource->getVehicleType()) - { - case VehicleConfigurationSource::VEHICLE_MULTI: - cData.FlightModePosition[0]=ManualControlSettings::FLIGHTMODEPOSITION_STABILIZED1; - cData.FlightModePosition[1]=ManualControlSettings::FLIGHTMODEPOSITION_STABILIZED2; - cData.FlightModePosition[2]=ManualControlSettings::FLIGHTMODEPOSITION_STABILIZED3; - break; - default: - break; - } mcSettings->setData(cData); addModifiedObject(mcSettings, tr("Writing manual control defaults")); } From d60be79133c72b1fdc4862621c4efa5085b1826e Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Tue, 9 Oct 2012 21:47:47 +0300 Subject: [PATCH 5/5] GCS: fix plugin build dependencies They should reflect the pro/pri files included and be sufficient to build. Chained dependencies should be built by the make system. --- ground/openpilotgcs/src/plugins/plugins.pro | 49 ++++++++++--------- .../uavobjectwidgetutils_dependencies.pri | 6 +-- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/plugins.pro b/ground/openpilotgcs/src/plugins/plugins.pro index a1653cf53..8ca829815 100644 --- a/ground/openpilotgcs/src/plugins/plugins.pro +++ b/ground/openpilotgcs/src/plugins/plugins.pro @@ -10,7 +10,6 @@ SUBDIRS = plugin_coreplugin #plugin_donothing.subdir = donothing #plugin_donothing.depends = plugin_coreplugin - # Core plugin plugin_coreplugin.subdir = coreplugin @@ -55,12 +54,14 @@ plugin_opmap.subdir = opmap plugin_opmap.depends = plugin_coreplugin plugin_opmap.depends += plugin_uavobjects plugin_opmap.depends += plugin_uavobjectutil +plugin_opmap.depends += plugin_uavtalk SUBDIRS += plugin_opmap # Scope UAVGadget plugin_scope.subdir = scope plugin_scope.depends = plugin_coreplugin plugin_scope.depends += plugin_uavobjects +plugin_scope.depends += plugin_uavtalk SUBDIRS += plugin_scope # UAVObject Browser gadget @@ -75,57 +76,60 @@ plugin_modelview.depends = plugin_coreplugin plugin_modelview.depends += plugin_uavobjects SUBDIRS += plugin_modelview - #Qt 4.8.0 / phonon may crash on Mac, fixed in Qt 4.8.1, QTBUG-23128 macx:contains(QT_VERSION, ^4\\.8\\.0): CONFIG += disable_notify_plugin +# Notify gadget !disable_notify_plugin { -#Notify gadget -plugin_notify.subdir = notify -plugin_notify.depends = plugin_coreplugin -plugin_notify.depends += plugin_uavobjects -SUBDIRS += plugin_notify + plugin_notify.subdir = notify + plugin_notify.depends = plugin_coreplugin + plugin_notify.depends += plugin_uavobjects + plugin_notify.depends += plugin_uavtalk + SUBDIRS += plugin_notify } -#Uploader gadget +# Uploader gadget plugin_uploader.subdir = uploader plugin_uploader.depends = plugin_coreplugin plugin_uploader.depends += plugin_uavobjects +plugin_uploader.depends += plugin_uavtalk plugin_uploader.depends += plugin_rawhid plugin_uploader.depends += plugin_uavobjectutil SUBDIRS += plugin_uploader -#Dial gadget +# Dial gadget plugin_dial.subdir = dial plugin_dial.depends = plugin_coreplugin plugin_dial.depends += plugin_uavobjects SUBDIRS += plugin_dial -#Linear Dial gadget +# Linear Dial gadget plugin_lineardial.subdir = lineardial plugin_lineardial.depends = plugin_coreplugin plugin_lineardial.depends += plugin_uavobjects SUBDIRS += plugin_lineardial -#System Health gadget +# System Health gadget plugin_systemhealth.subdir = systemhealth plugin_systemhealth.depends = plugin_coreplugin plugin_systemhealth.depends += plugin_uavobjects plugin_systemhealth.depends += plugin_uavtalk SUBDIRS += plugin_systemhealth -#Config gadget +# Config gadget plugin_config.subdir = config plugin_config.depends = plugin_coreplugin +plugin_config.depends += plugin_uavtalk plugin_config.depends += plugin_uavobjects +plugin_config.depends += plugin_uavobjectutil plugin_config.depends += plugin_uavobjectwidgetutils plugin_config.depends += plugin_uavsettingsimportexport SUBDIRS += plugin_config -#GPS Display gadget +# GPS Display gadget plugin_gpsdisplay.subdir = gpsdisplay plugin_gpsdisplay.depends = plugin_coreplugin -plugin_gpsdisplay.depends += plugin_uavtalk +plugin_gpsdisplay.depends += plugin_uavobjects SUBDIRS += plugin_gpsdisplay # Primary Flight Display (PFD) gadget @@ -146,19 +150,19 @@ plugin_pfdqml.depends = plugin_coreplugin plugin_pfdqml.depends += plugin_uavobjects SUBDIRS += plugin_pfdqml -#IP connection plugin +# IP connection plugin plugin_ipconnection.subdir = ipconnection plugin_ipconnection.depends = plugin_coreplugin SUBDIRS += plugin_ipconnection -#HITLNEW Simulation gadget +# HITLNEW Simulation gadget plugin_hitlnew.subdir = hitlnew plugin_hitlnew.depends = plugin_coreplugin plugin_hitlnew.depends += plugin_uavobjects plugin_hitlnew.depends += plugin_uavtalk SUBDIRS += plugin_hitlnew -#HITLNEW Simulation gadget v2 +# HITLNEW Simulation gadget v2 plugin_hitl_v2.subdir = hitlv2 plugin_hitl_v2.depends = plugin_coreplugin plugin_hitl_v2.depends += plugin_uavobjects @@ -178,20 +182,19 @@ plugin_logging.depends += plugin_uavtalk plugin_logging.depends += plugin_scope SUBDIRS += plugin_logging -#GCS Control of UAV gadget +# GCS Control of UAV gadget plugin_gcscontrol.subdir = gcscontrol plugin_gcscontrol.depends = plugin_coreplugin plugin_gcscontrol.depends += plugin_uavobjects -plugin_gcscontrol.depends += plugin_uavtalk SUBDIRS += plugin_gcscontrol # Antenna tracker #plugin_antennatrack.subdir = antennatrack #plugin_antennatrack.depends = plugin_coreplugin -#plugin_antennatrack.depends += plugin_uavtalk +#plugin_antennatrack.depends += plugin_uavobjects #SUBDIRS += plugin_antennatrack -#Scope OpenGL Gadget +# Scope OpenGL Gadget #plugin_scopeogl.subdir = scopeogl #plugin_scopeogl.depends = plugin_coreplugin #plugin_scopeogl.depends += plugin_uavobjects @@ -213,6 +216,7 @@ SUBDIRS += plugin_magicwaypoint plugin_uavsettingsimportexport.subdir = uavsettingsimportexport plugin_uavsettingsimportexport.depends = plugin_coreplugin plugin_uavsettingsimportexport.depends += plugin_uavobjects +plugin_uavsettingsimportexport.depends += plugin_uavobjectutil SUBDIRS += plugin_uavsettingsimportexport # UAV Object Widget Utility plugin @@ -221,12 +225,13 @@ plugin_uavobjectwidgetutils.depends = plugin_coreplugin plugin_uavobjectwidgetutils.depends += plugin_uavobjects plugin_uavobjectwidgetutils.depends += plugin_uavobjectutil plugin_uavobjectwidgetutils.depends += plugin_uavsettingsimportexport +plugin_uavobjectwidgetutils.depends += plugin_uavtalk SUBDIRS += plugin_uavobjectwidgetutils # Setup Wizard plugin plugin_setupwizard.subdir = setupwizard plugin_setupwizard.depends = plugin_coreplugin -plugin_setupwizard.depends += plugin_uavobjects +plugin_setupwizard.depends += plugin_uavobjectutil plugin_setupwizard.depends += plugin_config SUBDIRS += plugin_setupwizard diff --git a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutils_dependencies.pri b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutils_dependencies.pri index 43d9ac0d7..df9b07977 100644 --- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutils_dependencies.pri +++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutils_dependencies.pri @@ -1,6 +1,6 @@ include(../../plugins/coreplugin/coreplugin.pri) include(../../libs/utils/utils.pri) include(../../plugins/uavobjects/uavobjects.pri) -include(../uavobjectutil/uavobjectutil.pri) -include(../uavsettingsimportexport/uavsettingsimportexport.pri) -include(../uavtalk/uavtalk.pri) +include(../../plugins/uavobjectutil/uavobjectutil.pri) +include(../../plugins/uavsettingsimportexport/uavsettingsimportexport.pri) +include(../../plugins/uavtalk/uavtalk.pri)