diff --git a/Makefile b/Makefile index f10d8e28c..c3667097f 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ # Lower level makefiles assume that these variables are defined. To ensure # that a special magic variable is exported here. It must be checked for # existance by each sub-make. -export OPENPILOT_IS_COOL := Fuck Yeah! +export TOP_LEVEL_MAKEFILE := TRUE # It is possible to set OPENPILOT_DL_DIR and/or OPENPILOT_TOOLS_DIR environment # variables to override local tools download and installation directorys. So the diff --git a/flight/targets/boards/discoveryf4bare/bootloader/Makefile b/flight/targets/boards/discoveryf4bare/bootloader/Makefile index e046f6e80..da2e83dcb 100644 --- a/flight/targets/boards/discoveryf4bare/bootloader/Makefile +++ b/flight/targets/boards/discoveryf4bare/bootloader/Makefile @@ -16,7 +16,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/flight/targets/boards/discoveryf4bare/firmware/Makefile b/flight/targets/boards/discoveryf4bare/firmware/Makefile index a8e8d8410..4fed14963 100644 --- a/flight/targets/boards/discoveryf4bare/firmware/Makefile +++ b/flight/targets/boards/discoveryf4bare/firmware/Makefile @@ -17,7 +17,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ##### -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/flight/targets/boards/gpsplatinum/bootloader/Makefile b/flight/targets/boards/gpsplatinum/bootloader/Makefile index 7e03f6704..a027d74e2 100644 --- a/flight/targets/boards/gpsplatinum/bootloader/Makefile +++ b/flight/targets/boards/gpsplatinum/bootloader/Makefile @@ -16,7 +16,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/flight/targets/boards/gpsplatinum/firmware/Makefile b/flight/targets/boards/gpsplatinum/firmware/Makefile index 9232432c5..4f69e6c9a 100644 --- a/flight/targets/boards/gpsplatinum/firmware/Makefile +++ b/flight/targets/boards/gpsplatinum/firmware/Makefile @@ -17,7 +17,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/flight/targets/boards/oplinkmini/bootloader/Makefile b/flight/targets/boards/oplinkmini/bootloader/Makefile index 3991b5b94..c5f4011b2 100644 --- a/flight/targets/boards/oplinkmini/bootloader/Makefile +++ b/flight/targets/boards/oplinkmini/bootloader/Makefile @@ -16,7 +16,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/flight/targets/boards/oplinkmini/firmware/Makefile b/flight/targets/boards/oplinkmini/firmware/Makefile index a27be6993..794331a28 100644 --- a/flight/targets/boards/oplinkmini/firmware/Makefile +++ b/flight/targets/boards/oplinkmini/firmware/Makefile @@ -16,7 +16,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/flight/targets/boards/osd/bootloader/Makefile b/flight/targets/boards/osd/bootloader/Makefile index e046f6e80..da2e83dcb 100644 --- a/flight/targets/boards/osd/bootloader/Makefile +++ b/flight/targets/boards/osd/bootloader/Makefile @@ -16,7 +16,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/flight/targets/boards/osd/firmware/Makefile b/flight/targets/boards/osd/firmware/Makefile index b6185ca4f..84be0b690 100644 --- a/flight/targets/boards/osd/firmware/Makefile +++ b/flight/targets/boards/osd/firmware/Makefile @@ -16,7 +16,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/flight/targets/boards/revolution/bootloader/Makefile b/flight/targets/boards/revolution/bootloader/Makefile index e046f6e80..da2e83dcb 100644 --- a/flight/targets/boards/revolution/bootloader/Makefile +++ b/flight/targets/boards/revolution/bootloader/Makefile @@ -16,7 +16,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/flight/targets/boards/revolution/firmware/Makefile b/flight/targets/boards/revolution/firmware/Makefile index 944bcee2d..386debfb1 100644 --- a/flight/targets/boards/revolution/firmware/Makefile +++ b/flight/targets/boards/revolution/firmware/Makefile @@ -17,7 +17,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ##### -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/flight/targets/boards/revonano/bootloader/Makefile b/flight/targets/boards/revonano/bootloader/Makefile index e046f6e80..da2e83dcb 100644 --- a/flight/targets/boards/revonano/bootloader/Makefile +++ b/flight/targets/boards/revonano/bootloader/Makefile @@ -16,7 +16,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/flight/targets/boards/revonano/firmware/Makefile b/flight/targets/boards/revonano/firmware/Makefile index f3b2269fb..b14027084 100644 --- a/flight/targets/boards/revonano/firmware/Makefile +++ b/flight/targets/boards/revonano/firmware/Makefile @@ -16,7 +16,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ##### -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/flight/targets/boards/revoproto/bootloader/Makefile b/flight/targets/boards/revoproto/bootloader/Makefile index e046f6e80..da2e83dcb 100644 --- a/flight/targets/boards/revoproto/bootloader/Makefile +++ b/flight/targets/boards/revoproto/bootloader/Makefile @@ -16,7 +16,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/flight/targets/boards/revoproto/firmware/Makefile b/flight/targets/boards/revoproto/firmware/Makefile index a5343fb60..49370c760 100644 --- a/flight/targets/boards/revoproto/firmware/Makefile +++ b/flight/targets/boards/revoproto/firmware/Makefile @@ -17,7 +17,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ##### -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/flight/targets/common/bootloader_updater/Makefile b/flight/targets/common/bootloader_updater/Makefile index d1f254864..7dfc61406 100644 --- a/flight/targets/common/bootloader_updater/Makefile +++ b/flight/targets/common/bootloader_updater/Makefile @@ -16,7 +16,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/flight/targets/common/entire_flash/Makefile b/flight/targets/common/entire_flash/Makefile index 12c525142..c353d69ae 100644 --- a/flight/targets/common/entire_flash/Makefile +++ b/flight/targets/common/entire_flash/Makefile @@ -16,7 +16,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/flight/tests/lednotification/Makefile b/flight/tests/lednotification/Makefile index d013f5b83..c1ee271cf 100644 --- a/flight/tests/lednotification/Makefile +++ b/flight/tests/lednotification/Makefile @@ -24,7 +24,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/flight/tests/logfs/Makefile b/flight/tests/logfs/Makefile index 050a7efa4..63aa5f13b 100644 --- a/flight/tests/logfs/Makefile +++ b/flight/tests/logfs/Makefile @@ -24,7 +24,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/flight/tests/math/Makefile b/flight/tests/math/Makefile index cb97e89f9..d38b8e0c0 100644 --- a/flight/tests/math/Makefile +++ b/flight/tests/math/Makefile @@ -24,7 +24,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/ground/openpilotgcs/openpilotgcs.pri b/ground/openpilotgcs/openpilotgcs.pri index 6bbd7bbb9..be8d20fbe 100644 --- a/ground/openpilotgcs/openpilotgcs.pri +++ b/ground/openpilotgcs/openpilotgcs.pri @@ -233,3 +233,13 @@ win32 { # The ((packet)) pragma is used in uav metadata struct and other places QMAKE_CXXFLAGS += -mno-ms-bitfields } + +# Stricter warnigs turned on for OS X. +macx { + CONFIG += warn_on + !warn_off { + QMAKE_CXXFLAGS_WARN_ON += -Werror + QMAKE_CFLAGS_WARN_ON += -Werror + QMAKE_CXXFLAGS_WARN_ON += -Wno-gnu-static-float-init + } +} diff --git a/ground/openpilotgcs/src/app/app.pro b/ground/openpilotgcs/src/app/app.pro index 59285955e..9bce89583 100644 --- a/ground/openpilotgcs/src/app/app.pro +++ b/ground/openpilotgcs/src/app/app.pro @@ -30,7 +30,7 @@ win32 { INSTALLS += target } else:macx { LIBS += -framework CoreFoundation - ICON = openpilotgcs.icns + ICON = librepilotgcs.icns QMAKE_INFO_PLIST = Info.plist FILETYPES.files = profile.icns prifile.icns FILETYPES.path = Contents/Resources diff --git a/ground/openpilotgcs/src/app/gcssplashscreen.cpp b/ground/openpilotgcs/src/app/gcssplashscreen.cpp index fa069a458..db775438d 100644 --- a/ground/openpilotgcs/src/app/gcssplashscreen.cpp +++ b/ground/openpilotgcs/src/app/gcssplashscreen.cpp @@ -38,7 +38,7 @@ GCSSplashScreen::GCSSplashScreen() : m_pixmap = new QPixmap(":/app/splash.png"); m_painter = new QPainter(m_pixmap); - m_painter->setPen(Qt::lightGray); + m_painter->setPen(Qt::darkGray); QFont font("Tahoma", 8); m_painter->setFont(font); @@ -46,10 +46,10 @@ GCSSplashScreen::GCSSplashScreen() : QString(" ") + VersionInfo::year() + QString(tr(" The LibrePilot Project - All Rights Reserved"))); - m_painter->drawText(405, 180, QString(CopyrightSymbol) + + m_painter->drawText(405, 182, QString(CopyrightSymbol) + QString(tr(" 2010-2015 The OpenPilot Project - All Rights Reserved"))); - m_painter->drawText(406, 183, 310, 100, Qt::TextWordWrap | Qt::AlignTop | Qt::AlignLeft, + m_painter->drawText(406, 186, 310, 100, Qt::TextWordWrap | Qt::AlignTop | Qt::AlignLeft, QString(tr("GCS Revision - ")) + VersionInfo::revision()); setPixmap(*m_pixmap); } @@ -65,7 +65,7 @@ void GCSSplashScreen::drawMessageText(const QString &message) progressPainter.setPen(Qt::yellow); QFont font("Tahoma", 13); progressPainter.setFont(font); - progressPainter.drawText(300, 385, message); + progressPainter.drawText(300, 380, message); setPixmap(pix); } diff --git a/ground/openpilotgcs/src/app/librepilotgcs.icns b/ground/openpilotgcs/src/app/librepilotgcs.icns new file mode 100644 index 000000000..ccbf2cfdd Binary files /dev/null and b/ground/openpilotgcs/src/app/librepilotgcs.icns differ diff --git a/ground/openpilotgcs/src/app/librepilotgcs.ico b/ground/openpilotgcs/src/app/librepilotgcs.ico index 48baf22c2..55d685fb4 100644 Binary files a/ground/openpilotgcs/src/app/librepilotgcs.ico and b/ground/openpilotgcs/src/app/librepilotgcs.ico differ diff --git a/ground/openpilotgcs/src/app/main.cpp b/ground/openpilotgcs/src/app/main.cpp index aa7748771..425677e84 100644 --- a/ground/openpilotgcs/src/app/main.cpp +++ b/ground/openpilotgcs/src/app/main.cpp @@ -2,7 +2,8 @@ ****************************************************************************** * * @file main.cpp - * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. + * @author The LibrePilot Team http://www.librepilot.org Copyright (C) 2015. + * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * Parts by Nokia Corporation (qt-info@nokia.com) Copyright (C) 2009. * @brief * @see The GNU Public License (GPL) Version 3 @@ -27,6 +28,9 @@ */ /* + The GCS application name is defined in the top level makefile - GCS_BIG_NAME / GCS_SMALL_NAME, and + set for the build in ../../openpilotgcs.pri and ./app.pro + The GCS locale is set to the system locale by default unless the "hidden" setting General/Locale has a value. The user can not change General/Locale from the Options dialog. @@ -42,10 +46,10 @@ You can combine it with the -config-file= command line argument to quickly switch between multiple settings files. [code] - openpilotgcs -reset -config-file ./MyOpenPilotGCS.xml + gcs -reset -config-file ./MyGCS.xml [/code] - Relative paths are relative to /share/openpilotgcs/configurations/ + Relative paths are relative to /share/$(GCS_SMALL_NAME)/configurations/ The specified file will be used to load the factory defaults from but only when the user settings are empty. If the user settings are not empty the file will not be used. @@ -55,7 +59,7 @@ Quickly switch configurations [code] - openpilotgcs -reset -config-file + gcs -reset -config-file [/code] Configuring GCS from installer @@ -65,14 +69,14 @@ If the user chooses to start GCS at the end of the installer: [code] - openpilotgcs -D General/OverrideLanguage=de + gcs -D General/OverrideLanguage=de [/code] If the user chooses not to start GCS at the end of the installer, you still need to configure GCS. In that case you can use -exit-after-config [code] - openpilotgcs -D General/OverrideLanguage=de -exit-after-config + gcs -D General/OverrideLanguage=de -exit-after-config [/code] */ @@ -301,6 +305,7 @@ inline QStringList getPluginPaths() QStringList rc; QString pluginPath = QApplication::applicationDirPath(); + pluginPath += QLatin1Char('/'); pluginPath += QLatin1String(PLUGIN_REL_PATH); rc.push_back(pluginPath); diff --git a/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/port.cpp b/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/port.cpp index c0d39daf2..961baeaa8 100644 --- a/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/port.cpp +++ b/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/SSP/port.cpp @@ -27,7 +27,7 @@ #include "port.h" #include "delay.h" #include -port::port(QString name, bool debug) : mstatus(port::closed), debug(debug) +port::port(QString name, bool debug) : debug(debug), mstatus(port::closed) { timer.start(); sport = new QSerialPort(); diff --git a/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/main.cpp b/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/main.cpp index 78a53545d..b52a51ba2 100644 --- a/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/main.cpp +++ b/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/main.cpp @@ -191,9 +191,9 @@ int main(int argc, char *argv[]) return -1; } } else if (!description.isEmpty()) { - retstatus = dfu.UploadDescription(description); - if (retstatus != OP_DFU::Last_operation_Success) { - standardOutput << "Upload failed with code:" << retstatus << endl; + OP_DFU::Status status = dfu.UploadDescription(description); + if (status != OP_DFU::Last_operation_Success) { + standardOutput << "Upload failed with code:" << status << endl; return -1; } } @@ -206,10 +206,9 @@ int main(int argc, char *argv[]) standardOutput << "ERROR device not readable\n" << endl; return false; } - qint32 size = ((OP_DFU::device)dfu.devices[device]).SizeOfCode; QByteArray fw; dfu.DownloadFirmware(&fw, 0); - bool ret = dfu.SaveByteArrayToFile(file.toLatin1(), fw); + bool ret = dfu.SaveByteArrayToFile(file.toLatin1(), fw); return ret; } else if (action == OP_DFU::actionCompareCrc) { dfu.CompareFirmware(file.toLatin1(), OP_DFU::crccompare, device); diff --git a/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp b/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp index 12323fc36..c0ef3b04d 100644 --- a/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp +++ b/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp @@ -346,7 +346,7 @@ OP_DFU::Status DFUObject::UploadDescription(QVariant desc) cout << "Starting uploading description\n"; QByteArray array; - if (desc.type() == QMetaType::QString) { + if (desc.type() == QVariant::String) { QString description = desc.toString(); if (description.length() % 4 != 0) { int pad = description.length() / 4; @@ -357,7 +357,7 @@ OP_DFU::Status DFUObject::UploadDescription(QVariant desc) description.append(padding); } array = description.toLatin1(); - } else if (desc.type() == QMetaType::QByteArray) { + } else if (desc.type() == QVariant::ByteArray) { array = desc.toByteArray(); } @@ -1110,6 +1110,10 @@ int DFUObject::receiveData(void *data, int size) if (time.elapsed() > 10000) { qDebug() << "____timeout"; } + if (x > size - 1) { + qDebug() << "Error buffer overrun"; + Q_ASSERT(false); + } return x; } } diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/common.pri b/ground/openpilotgcs/src/libs/opmapcontrol/src/common.pri index a7889f5e8..aa3ebce62 100644 --- a/ground/openpilotgcs/src/libs/opmapcontrol/src/common.pri +++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/common.pri @@ -8,3 +8,10 @@ UI_DIR = uics MOC_DIR = mocs OBJECTS_DIR = objs INCLUDEPATH +=../../../../libs/ + +# Stricter warnings turned on for OS X. +macx { + CONFIG += warn_on + QMAKE_CXXFLAGS_WARN_ON += -Werror + QMAKE_CFLAGS_WARN_ON += -Werror +} diff --git a/ground/openpilotgcs/src/libs/opmapcontrol/src/core/urlfactory.cpp b/ground/openpilotgcs/src/libs/opmapcontrol/src/core/urlfactory.cpp index 5840b6d3a..4ae1a4889 100644 --- a/ground/openpilotgcs/src/libs/opmapcontrol/src/core/urlfactory.cpp +++ b/ground/openpilotgcs/src/libs/opmapcontrol/src/core/urlfactory.cpp @@ -486,6 +486,8 @@ QString UrlFactory::MakeReverseGeocoderUrl(internals::PointLatLng &pt, const QSt { #ifdef DEBUG_URLFACTORY qDebug() << "Language: " << language; +#else + Q_UNUSED(language); #endif // CSV output has been depreciated. API key is no longer needed. return QString("http://maps.googleapis.com/maps/api/geocode/xml?latlng=%1,%2").arg(QString::number(pt.Lat())).arg(QString::number(pt.Lng())); diff --git a/ground/openpilotgcs/src/libs/qwt/qwt.pro b/ground/openpilotgcs/src/libs/qwt/qwt.pro index d705acd75..cd05b5eeb 100644 --- a/ground/openpilotgcs/src/libs/qwt/qwt.pro +++ b/ground/openpilotgcs/src/libs/qwt/qwt.pro @@ -17,9 +17,6 @@ include( qwtconfig.pri ) TEMPLATE = subdirs CONFIG += ordered -# disable all warnings (no need for warnings as qwt sources are imported) -CONFIG += warn_off - SUBDIRS = \ src \ # textengines \ diff --git a/ground/openpilotgcs/src/libs/qwt/src/src.pro b/ground/openpilotgcs/src/libs/qwt/src/src.pro index fcdf13f5f..d4b99b489 100644 --- a/ground/openpilotgcs/src/libs/qwt/src/src.pro +++ b/ground/openpilotgcs/src/libs/qwt/src/src.pro @@ -35,6 +35,9 @@ DEFINES += QWT_LIBRARY # include(../../../openpilotgcslibrary.pri) +# disable all warnings (no need for warnings as qwt sources are imported) +CONFIG += warn_off + contains(QWT_CONFIG, QwtDll) { CONFIG += dll diff --git a/ground/openpilotgcs/src/libs/utils/pathutils.cpp b/ground/openpilotgcs/src/libs/utils/pathutils.cpp index 5c545a340..7a9ead317 100644 --- a/ground/openpilotgcs/src/libs/utils/pathutils.cpp +++ b/ground/openpilotgcs/src/libs/utils/pathutils.cpp @@ -41,6 +41,7 @@ namespace Utils { QString GetDataPath() { QString dataPath = QApplication::applicationDirPath(); + dataPath += QLatin1Char('/'); dataPath += QLatin1String(DATA_REL_PATH); dataPath += QLatin1Char('/'); diff --git a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp index 5570da97e..c52a29809 100644 --- a/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp @@ -787,7 +787,7 @@ QString ConfigMultiRotorWidget::updateConfigObjectsFromWidgets() // Tricopter : Yaw mix slider value applies to servo (was fixed) // Get absolute MixerValueYaw, no servo reverse when Reverse All Motors is checked - setMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_YAW, abs(getMixerValue(mixer, "MixerValueYaw")) * 1.27); + setMixerVectorValue(mixer, channel, VehicleConfig::MIXERVECTOR_YAW, abs(int(getMixerValue(mixer, "MixerValueYaw"))) * 1.27); } m_aircraft->mrStatusLabel->setText(tr("Configuration OK")); diff --git a/ground/openpilotgcs/src/plugins/coreplugin/coreconstants.h b/ground/openpilotgcs/src/plugins/coreplugin/coreconstants.h index dd974bb13..f1fdc716f 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/coreconstants.h +++ b/ground/openpilotgcs/src/plugins/coreplugin/coreconstants.h @@ -129,7 +129,7 @@ const char *const GO_FORWARD = "GCS.GoForward"; const char *const GOTOPREVIOUSGROUP = "GCS.GotoPreviousTabGroup"; const char *const GOTONEXTGROUP = "GCS.GotoNextTabGroup"; const char *const WINDOWSLIST = "GCS.WindowsList"; -const char *const ABOUT_LIBREPILOTGCS = "GCS.AboutLibrePilotGCS"; +const char *const ABOUT_LIBREPILOTGCS = "GCS.AboutLibrePilotGCS"; const char *const ABOUT_PLUGINS = "GCS.AboutPlugins"; const char *const ABOUT_AUTHORS = "GCS.AboutAuthors"; const char *const ABOUT_QT = "GCS.AboutQt"; @@ -212,7 +212,7 @@ const char *const ICON_PLUGIN = ":/core/images/pluginicon.png"; const char *const ICON_EXIT = ":/core/images/exiticon.png"; const char *const ICON_OPTIONS = ":/core/images/optionsicon.png"; const char *const ICON_HELP = ":/core/images/helpicon.png"; -const char *const ICON_LIBREPILOT = ":/core/images/librepiloticon.png"; +const char *const ICON_LIBREPILOT = ":/core/images/librepiloticon.png"; // wizard kind diff --git a/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.cpp b/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.cpp index 5f13242df..b2168834f 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.cpp +++ b/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.cpp @@ -279,7 +279,7 @@ bool GeneralSettings::useExpertMode() const return m_useExpertMode; } -bool GeneralSettings::setCollectUsageData(bool collect) +void GeneralSettings::setCollectUsageData(bool collect) { if (collect && collect != m_collectUsageData) { setShowUsageDataDisclaimer(true); @@ -287,7 +287,7 @@ bool GeneralSettings::setCollectUsageData(bool collect) m_collectUsageData = collect; } -bool GeneralSettings::setShowUsageDataDisclaimer(bool show) +void GeneralSettings::setShowUsageDataDisclaimer(bool show) { m_showUsageDataDisclaimer = show; } diff --git a/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.h b/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.h index 6fdefb20e..d6828704c 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.h +++ b/ground/openpilotgcs/src/plugins/coreplugin/generalsettings.h @@ -63,8 +63,8 @@ public: void readSettings(QSettings *qs); void saveSettings(QSettings *qs); bool useExpertMode() const; - bool setCollectUsageData(bool collect); - bool setShowUsageDataDisclaimer(bool show); + void setCollectUsageData(bool collect); + void setShowUsageDataDisclaimer(bool show); void setLastUsageHash(QString hash); private slots: diff --git a/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp b/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp index 7c09ac60c..c0f7d2fb8 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp +++ b/ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp @@ -289,6 +289,7 @@ QString MainWindow::loadStyleSheet(QString fileName) QString style; // ...to open the file QFile file(Utils::GetDataPath() + QString("stylesheets/") + fileName); + qDebug() << "Loading style sheet file" << file.fileName(); if (file.open(QFile::ReadOnly)) { // QTextStream... diff --git a/ground/openpilotgcs/src/plugins/coreplugin/uavgadgetmanager/uavgadgetmanager.cpp b/ground/openpilotgcs/src/plugins/coreplugin/uavgadgetmanager/uavgadgetmanager.cpp index f2bcd5098..8c5b7a596 100644 --- a/ground/openpilotgcs/src/plugins/coreplugin/uavgadgetmanager/uavgadgetmanager.cpp +++ b/ground/openpilotgcs/src/plugins/coreplugin/uavgadgetmanager/uavgadgetmanager.cpp @@ -71,11 +71,6 @@ using namespace Utils; enum { debugUAVGadgetManager = 0 }; -static inline ExtensionSystem::PluginManager *pluginManager() -{ - return ExtensionSystem::PluginManager::instance(); -} - // ===================UAVGadgetManager===================== UAVGadgetManager::UAVGadgetManager(ICore *core, QString name, QIcon icon, int priority, QString uniqueName, QWidget *parent) : diff --git a/ground/openpilotgcs/src/plugins/dial/dialgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/dial/dialgadgetwidget.cpp index fd31187f3..14bfba5cb 100644 --- a/ground/openpilotgcs/src/plugins/dial/dialgadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/dial/dialgadgetwidget.cpp @@ -29,6 +29,7 @@ #include "dialgadgetwidget.h" #include #include +#include #include #include @@ -558,7 +559,7 @@ void DialGadgetWidget::rotateNeedles() int dialRun = 3; if (n2enabled) { double needle2Diff; - if (abs((needle2Value - needle2Target) * 10) > 5 && beSmooth) { + if (beSmooth && fabs(needle2Value - needle2Target) > 0.5) { needle2Diff = (needle2Target - needle2Value) / 5; } else { needle2Diff = needle2Target - needle2Value; @@ -590,7 +591,7 @@ void DialGadgetWidget::rotateNeedles() // We assume that needle1 always exists! double needle1Diff; - if ((abs((needle1Value - needle1Target) * 10) > 5) && beSmooth) { + if (beSmooth && fabs(needle1Value - needle1Target) > 0.5) { needle1Diff = (needle1Target - needle1Value) / 5; } else { needle1Diff = needle1Target - needle1Value; @@ -614,7 +615,7 @@ void DialGadgetWidget::rotateNeedles() if (n3enabled) { double needle3Diff; - if ((abs((needle3Value - needle3Target) * 10) > 5) && beSmooth) { + if (beSmooth && fabs(needle3Value - needle3Target) > 0.5) { needle3Diff = (needle3Target - needle3Value) / 5; } else { needle3Diff = needle3Target - needle3Value; diff --git a/ground/openpilotgcs/src/plugins/lineardial/lineardialgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/lineardial/lineardialgadgetwidget.cpp index 567d039a9..8bc583ff6 100644 --- a/ground/openpilotgcs/src/plugins/lineardial/lineardialgadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/lineardial/lineardialgadgetwidget.cpp @@ -426,7 +426,7 @@ void LineardialGadgetWidget::moveIndex() dialTimer.stop(); return; } - if ((abs((indexValue - indexTarget) * 10) > 3)) { + if ((abs(int((indexValue - indexTarget) * 10)) > 3)) { indexValue += (indexTarget - indexValue) / 5; } else { indexValue = indexTarget; diff --git a/ground/openpilotgcs/src/plugins/ophid/hidapi/mac/hid.c b/ground/openpilotgcs/src/plugins/ophid/hidapi/mac/hid.c index b6fa8383a..9f101dbbc 100644 --- a/ground/openpilotgcs/src/plugins/ophid/hidapi/mac/hid.c +++ b/ground/openpilotgcs/src/plugins/ophid/hidapi/mac/hid.c @@ -252,7 +252,7 @@ static int get_string_property(IOHIDDeviceRef device, CFStringRef prop, wchar_t len * sizeof(wchar_t), &used_buf_len); - if (chars_copied == len) + if ((size_t)chars_copied == len) buf[len] = 0; /* len is decremented above */ else buf[chars_copied] = 0; @@ -292,7 +292,7 @@ static int get_string_property_utf8(IOHIDDeviceRef device, CFStringRef prop, cha len, &used_buf_len); - if (used_buf_len == len) + if ((size_t)used_buf_len == len) buf[len] = 0; /* len is decremented above */ else buf[used_buf_len] = 0; diff --git a/ground/openpilotgcs/src/plugins/ophid/ophid.pro b/ground/openpilotgcs/src/plugins/ophid/ophid.pro index bfa9e2c3a..884796d37 100644 --- a/ground/openpilotgcs/src/plugins/ophid/ophid.pro +++ b/ground/openpilotgcs/src/plugins/ophid/ophid.pro @@ -46,6 +46,10 @@ macx { hidapi/mac/hid.c LIBS += -framework CoreFoundation -framework IOKit + + # hid.c has too many warnings about unused paramters. + QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter + QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter } linux { diff --git a/ground/openpilotgcs/src/plugins/opmap/opmap_edit_waypoint_dialog.cpp b/ground/openpilotgcs/src/plugins/opmap/opmap_edit_waypoint_dialog.cpp index 606d73545..2f65bde46 100644 --- a/ground/openpilotgcs/src/plugins/opmap/opmap_edit_waypoint_dialog.cpp +++ b/ground/openpilotgcs/src/plugins/opmap/opmap_edit_waypoint_dialog.cpp @@ -156,6 +156,9 @@ void opmap_edit_waypoint_dialog::setupModeWidgets() ui->dsb_modeParam3->setVisible(false); ui->dsb_modeParam4->setVisible(false); break; + case MapDataDelegate::MODE_AUTOTAKEOFF: + // FIXME: Do nothing? + break; } } void opmap_edit_waypoint_dialog::setupConditionWidgets() diff --git a/ground/openpilotgcs/src/plugins/opmap/opmapgadget.cpp b/ground/openpilotgcs/src/plugins/opmap/opmapgadget.cpp index 6facd9ef9..2c75814d3 100644 --- a/ground/openpilotgcs/src/plugins/opmap/opmapgadget.cpp +++ b/ground/openpilotgcs/src/plugins/opmap/opmapgadget.cpp @@ -45,7 +45,7 @@ void OPMapGadget::saveDefaultLocation(double lng, double lat, double zoom) m_config->setLatitude(lat); m_config->setLongitude(lng); m_config->setZoom(zoom); - m_config->saveConfig(); + m_config->save(); } } diff --git a/ground/openpilotgcs/src/plugins/opmap/opmapgadgetconfiguration.cpp b/ground/openpilotgcs/src/plugins/opmap/opmapgadgetconfiguration.cpp index 6f15903ed..9dba75bb8 100644 --- a/ground/openpilotgcs/src/plugins/opmap/opmapgadgetconfiguration.cpp +++ b/ground/openpilotgcs/src/plugins/opmap/opmapgadgetconfiguration.cpp @@ -105,23 +105,13 @@ IUAVGadgetConfiguration *OPMapGadgetConfiguration::clone() return m; } -void OPMapGadgetConfiguration::saveConfig() const +void OPMapGadgetConfiguration::save() const { if (!m_settings) { return; } - m_settings->setValue("mapProvider", m_mapProvider); - m_settings->setValue("defaultZoom", m_defaultZoom); - m_settings->setValue("defaultLatitude", m_defaultLatitude); - m_settings->setValue("defaultLongitude", m_defaultLongitude); - m_settings->setValue("useOpenGL", m_useOpenGL); - m_settings->setValue("showTileGridLines", m_showTileGridLines); - m_settings->setValue("accessMode", m_accessMode); - m_settings->setValue("useMemoryCache", m_useMemoryCache); - m_settings->setValue("uavSymbol", m_uavSymbol); - m_settings->setValue("cacheLocation", Utils::RemoveStoragePath(m_cacheLocation)); - m_settings->setValue("maxUpdateRate", m_maxUpdateRate); - m_settings->setValue("overlayOpacity", m_opacity); + + saveConfig(m_settings); } void OPMapGadgetConfiguration::saveConfig(QSettings *qSettings) const { diff --git a/ground/openpilotgcs/src/plugins/opmap/opmapgadgetconfiguration.h b/ground/openpilotgcs/src/plugins/opmap/opmapgadgetconfiguration.h index 19462b894..8d0e1bbbe 100644 --- a/ground/openpilotgcs/src/plugins/opmap/opmapgadgetconfiguration.h +++ b/ground/openpilotgcs/src/plugins/opmap/opmapgadgetconfiguration.h @@ -101,7 +101,7 @@ public: { return m_opacity; } - void saveConfig() const; + void save() const; public slots: void setMapProvider(QString provider) { diff --git a/ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp b/ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp index d2f1c48b4..9dfc4c713 100644 --- a/ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp @@ -390,7 +390,8 @@ void ScopeGadgetWidget::addCurvePlot(QString objectName, QString fieldPlusSubFie plotData = new SequentialPlotData(object, field, element, scaleFactor, meanSamples, mathFunction, m_plotDataSize, pen, antialiased); - } else if (m_plotType == ChronoPlot) { + } else { + Q_ASSERT(m_plotType == ChronoPlot); plotData = new ChronoPlotData(object, field, element, scaleFactor, meanSamples, mathFunction, m_plotDataSize, pen, antialiased); diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp index 501afc8e9..0546152c4 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp @@ -100,6 +100,7 @@ bool VehicleConfigurationHelper::setupHardwareSettings(bool save) bool VehicleConfigurationHelper::isApplicable(UAVObject *dataObj) { + Q_UNUSED(dataObj); return true; } diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp index 3d2ded69c..ec995fcd8 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp @@ -50,7 +50,7 @@ const char *VehicleTemplateExportDialog::EXPORT_FIXEDWING_NAME = "fixedwing"; const char *VehicleTemplateExportDialog::EXPORT_MULTI_NAME = "multirotor"; -const char *VehicleTemplateExportDialog::EXPORT_HELI_NAME = "helicopter"; +const char *VehicleTemplateExportDialog::EXPORT_HELI_NAME = "helicopter"; const char *VehicleTemplateExportDialog::EXPORT_SURFACE_NAME = "surface"; const char *VehicleTemplateExportDialog::EXPORT_CUSTOM_NAME = "custom"; diff --git a/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp b/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp index 7c25f784a..77349d23e 100644 --- a/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp +++ b/ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp @@ -164,16 +164,16 @@ void UsageTrackerPlugin::collectUsageParameters(QMap ¶mete parameters["board_type"] = "0x" + QString::number(boardModel, 16).toLower(); parameters["board_serial"] = utilMngr->getBoardCPUSerial().toHex(); parameters["bl_version"] = QString::number(utilMngr->getBootloaderRevision()); - parameters["fw_tag"] = devDesc.gitTag; - parameters["fw_hash"] = devDesc.gitHash; + parameters["fw_tag"] = devDesc.gitTag; + parameters["fw_hash"] = devDesc.gitHash; #if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)) - parameters["os_version"] = QSysInfo::prettyProductName() + " " + QSysInfo::currentCpuArchitecture(); + parameters["os_version"] = QSysInfo::prettyProductName() + " " + QSysInfo::currentCpuArchitecture(); #else - parameters["os_version"] = "none"; + parameters["os_version"] = "none"; #endif - parameters["os_threads"] = QString::number(QThread::idealThreadCount()); - parameters["os_timezone"] = QTimeZone::systemTimeZoneId(); - parameters["gcs_version"] = VersionInfo::revision(); + parameters["os_threads"] = QString::number(QThread::idealThreadCount()); + parameters["os_timezone"] = QTimeZone::systemTimeZoneId(); + parameters["gcs_version"] = VersionInfo::revision(); // Configuration parameters ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); diff --git a/make/apps-defs.mk b/make/apps-defs.mk index 9d7b92b04..e99ce4c57 100644 --- a/make/apps-defs.mk +++ b/make/apps-defs.mk @@ -16,7 +16,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/make/boot-defs.mk b/make/boot-defs.mk index 289c7ffd8..ebebc0802 100644 --- a/make/boot-defs.mk +++ b/make/boot-defs.mk @@ -16,7 +16,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/make/common-defs.mk b/make/common-defs.mk index 2ff43ed91..22f96b424 100644 --- a/make/common-defs.mk +++ b/make/common-defs.mk @@ -16,7 +16,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/make/firmware-defs.mk b/make/firmware-defs.mk index 5f1ed36ee..ee434895d 100644 --- a/make/firmware-defs.mk +++ b/make/firmware-defs.mk @@ -16,7 +16,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/make/tools.mk b/make/tools.mk index 344c0061d..aa7f79ab7 100644 --- a/make/tools.mk +++ b/make/tools.mk @@ -45,7 +45,7 @@ # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error $(notdir $(lastword $(MAKEFILE_LIST))) should be included by the top level Makefile) endif diff --git a/package/Darwin.mk b/package/Darwin.mk index 8b3d86651..cc186be83 100644 --- a/package/Darwin.mk +++ b/package/Darwin.mk @@ -2,7 +2,7 @@ # MacOSX-specific packaging script # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/package/Linux.mk b/package/Linux.mk index 8891f5ea2..81f1746f3 100644 --- a/package/Linux.mk +++ b/package/Linux.mk @@ -2,7 +2,7 @@ # Linux-specific packaging script # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif @@ -102,8 +102,9 @@ install: $(V1) $(INSTALL) $(BUILD_DIR)/$(GCS_SMALL_NAME)_$(GCS_BUILD_CONF)/bin/$(GCS_SMALL_NAME) $(DESTDIR)$(bindir) $(V1) $(INSTALL) $(BUILD_DIR)/$(GCS_SMALL_NAME)_$(GCS_BUILD_CONF)/lib/$(GCS_SMALL_NAME) $(DESTDIR)$(libdir) $(V1) $(INSTALL) $(BUILD_DIR)/$(GCS_SMALL_NAME)_$(GCS_BUILD_CONF)/share/$(GCS_SMALL_NAME) $(DESTDIR)$(datadir) - $(V1) $(INSTALL) -T $(ROOT_DIR)/package/linux/openpilot.desktop $(DESTDIR)$(datadir)/applications/$(ORG_SMALL_NAME).desktop - $(V1) sed -i -e 's/openpilotgcs/$(GCS_SMALL_NAME)/g;s/OpenPilot GCS/$(GCS_BIG_NAME)/g' $(DESTDIR)$(datadir)/applications/$(ORG_SMALL_NAME).desktop + $(V1) $(INSTALL) -T $(ROOT_DIR)/package/linux/gcs.desktop $(DESTDIR)$(datadir)/applications/$(ORG_SMALL_NAME).desktop + $(V1) sed -i -e 's/gcs/$(GCS_SMALL_NAME)/g;s/GCS/$(GCS_BIG_NAME)/g;s/org/$(ORG_SMALL_NAME)/g;s/ORG/$(ORG_BIG_NAME)/g' $(DESTDIR)$(datadir)/applications/$(ORG_SMALL_NAME).desktop + $(V1) $(INSTALL) -T $(ROOT_DIR)/package/linux/openpilot.png $(DESTDIR)$(datadir)/pixmaps/$(ORG_SMALL_NAME).png diff --git a/package/Windows.mk b/package/Windows.mk index da90a6ae1..1a9cfbc74 100644 --- a/package/Windows.mk +++ b/package/Windows.mk @@ -2,7 +2,7 @@ # Windows-specific packaging script # -ifndef OPENPILOT_IS_COOL +ifndef TOP_LEVEL_MAKEFILE $(error Top level Makefile must be used to build this target) endif diff --git a/package/linux/gcs.desktop b/package/linux/gcs.desktop new file mode 100644 index 000000000..c7e3e31ee --- /dev/null +++ b/package/linux/gcs.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=0.1.0 +Encoding=UTF-8 +Name=GCS +Exec=gcs +TryExec=gcs +Comment=Configure, Tune, Diagnose, Track, & Upgrade FW for ORG solutions +Terminal=false +Categories=Utility;Robotics;Engineering; +Icon=org +Type=Application diff --git a/package/linux/openpilot.desktop b/package/linux/openpilot.desktop deleted file mode 100644 index 5121b726b..000000000 --- a/package/linux/openpilot.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Version=0.1.0 -Encoding=UTF-8 -Name=OpenPilot GCS -Exec=openpilotgcs -TryExec=openpilotgcs -Comment=Configure, Tune, Diagnose, Track, & Upgrade FW for OpenPilot solutions -Terminal=false -Categories=Utility;Robotics;Engineering; -Icon=openpilot -Type=Application diff --git a/package/osx/VolumeIcon.icns b/package/osx/VolumeIcon.icns index e4eff9371..ccbf2cfdd 100644 Binary files a/package/osx/VolumeIcon.icns and b/package/osx/VolumeIcon.icns differ diff --git a/package/osx/background.png b/package/osx/background.png index 7a862fd8c..9b95d6640 100644 Binary files a/package/osx/background.png and b/package/osx/background.png differ diff --git a/package/osx/package b/package/osx/package index c677685c5..850e9429c 100755 --- a/package/osx/package +++ b/package/osx/package @@ -39,7 +39,7 @@ cp "${ROOT_DIR}/GPLv3.txt" "${SRC_DIR}/Docs/" --background "${ROOT_DIR}/package/osx/background.png" \ --window-size 600 500 \ --icon-size 60 \ ---icon "Getting Started.webloc" 100 380 \ +--icon "Getting Started.webloc" 110 380 \ --hide-extension "Getting Started.webloc" \ --icon "Docs" 250 380 \ --icon "WHATSNEW.txt" 400 380 \ diff --git a/package/winx86/resources/installer_icon.ico b/package/winx86/resources/installer_icon.ico index 48baf22c2..55d685fb4 100644 Binary files a/package/winx86/resources/installer_icon.ico and b/package/winx86/resources/installer_icon.ico differ