Merge branch 'pull_requests_paulj' into next

2024-11-29 07:24:13 +01:00 · 2015-07-15 08:08:29 +01:00 · 2015-07-15 08:08:29 +01:00 · 402d9a0c64
commit 402d9a0c64
parent c57ca08911 6b6461c8b4
31 changed files with 52 additions and 47 deletions
--- a/2
+++ b/2
@ -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
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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=<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 <install dir>/share/openpilotgcs/configurations/
+   Relative paths are relative to <install dir>/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 <relative or absolute path>
+   gcs -reset -config-file <relative or absolute path>
   [/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]

 */
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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


--- 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

--- a/package/linux/gcs.desktop
+++ 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
--- a/package/linux/openpilot.desktop
+++ b/package/linux/openpilot.desktop
@ -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