From 039e95ac4fd178200f977d1a4c4c463ab5297e22 Mon Sep 17 00:00:00 2001 From: Cliff Geerdes Date: Sun, 29 May 2016 13:02:11 -0400 Subject: [PATCH] LP-76 fix MSP merge conflict sort OPTMODULES in alphabetical order --- flight/targets/boards/discoveryf4bare/firmware/Makefile | 2 +- flight/targets/boards/revolution/firmware/Makefile | 2 +- flight/targets/boards/revonano/firmware/Makefile | 2 +- flight/targets/boards/revoproto/firmware/Makefile | 2 +- flight/targets/boards/sparky2/firmware/Makefile | 3 ++- flight/targets/boards/sparky2/firmware/UAVObjects.inc | 4 +++- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/flight/targets/boards/discoveryf4bare/firmware/Makefile b/flight/targets/boards/discoveryf4bare/firmware/Makefile index 3ba0b5cb8..20ad2966a 100644 --- a/flight/targets/boards/discoveryf4bare/firmware/Makefile +++ b/flight/targets/boards/discoveryf4bare/firmware/Makefile @@ -55,9 +55,9 @@ MODULES += Osd/osdoutout MODULES += Logging MODULES += Telemetry +OPTMODULES += AutoTune OPTMODULES += ComUsbBridge OPTMODULES += UAVOMSPBridge -OPTMODULES += AutoTune SRC += $(FLIGHTLIB)/notification.c diff --git a/flight/targets/boards/revolution/firmware/Makefile b/flight/targets/boards/revolution/firmware/Makefile index 4ff049d29..19173a486 100644 --- a/flight/targets/boards/revolution/firmware/Makefile +++ b/flight/targets/boards/revolution/firmware/Makefile @@ -52,9 +52,9 @@ MODULES += Logging MODULES += Telemetry MODULES += Notify +OPTMODULES += AutoTune OPTMODULES += ComUsbBridge OPTMODULES += UAVOMSPBridge -OPTMODULES += AutoTune SRC += $(FLIGHTLIB)/notification.c diff --git a/flight/targets/boards/revonano/firmware/Makefile b/flight/targets/boards/revonano/firmware/Makefile index 8dc8d2989..14157ef7e 100644 --- a/flight/targets/boards/revonano/firmware/Makefile +++ b/flight/targets/boards/revonano/firmware/Makefile @@ -51,9 +51,9 @@ MODULES += PathFollower MODULES += Telemetry MODULES += Notify +OPTMODULES += AutoTune OPTMODULES += ComUsbBridge OPTMODULES += UAVOMSPBridge -OPTMODULES += AutoTune SRC += $(FLIGHTLIB)/notification.c diff --git a/flight/targets/boards/revoproto/firmware/Makefile b/flight/targets/boards/revoproto/firmware/Makefile index 147c8ec47..9d4fb0f8f 100644 --- a/flight/targets/boards/revoproto/firmware/Makefile +++ b/flight/targets/boards/revoproto/firmware/Makefile @@ -52,9 +52,9 @@ MODULES += Telemetry SRC += $(FLIGHTLIB)/notification.c +OPTMODULES += AutoTune OPTMODULES += ComUsbBridge OPTMODULES += UAVOMSPBridge -OPTMODULES += AutoTune # Include all camera options CDEFS += -DUSE_INPUT_LPF -DUSE_GIMBAL_LPF -DUSE_GIMBAL_FF diff --git a/flight/targets/boards/sparky2/firmware/Makefile b/flight/targets/boards/sparky2/firmware/Makefile index 160081566..b16807dda 100644 --- a/flight/targets/boards/sparky2/firmware/Makefile +++ b/flight/targets/boards/sparky2/firmware/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2015, The LibrePilot Project, http://www.librepilot.org +# Copyright (c) 2015-2016, The LibrePilot Project, http://www.librepilot.org # Copyright (c) 2009-2013, The OpenPilot Team, http://www.openpilot.org # Copyright (c) 2012, PhoenixPilot, http://github.com/PhoenixPilot # @@ -52,6 +52,7 @@ MODULES += Logging MODULES += Telemetry MODULES += Notify +OPTMODULES += AutoTune OPTMODULES += ComUsbBridge OPTMODULES += UAVOMSPBridge diff --git a/flight/targets/boards/sparky2/firmware/UAVObjects.inc b/flight/targets/boards/sparky2/firmware/UAVObjects.inc index 7e7a70f8b..89659c31a 100644 --- a/flight/targets/boards/sparky2/firmware/UAVObjects.inc +++ b/flight/targets/boards/sparky2/firmware/UAVObjects.inc @@ -126,6 +126,8 @@ UAVOBJSRCFILENAMES += txpidsettings UAVOBJSRCFILENAMES += txpidstatus UAVOBJSRCFILENAMES += takeofflocation UAVOBJSRCFILENAMES += perfcounter - +UAVOBJSRCFILENAMES += systemidentsettings +UAVOBJSRCFILENAMES += systemidentstate + UAVOBJSRC = $(foreach UAVOBJSRCFILE,$(UAVOBJSRCFILENAMES),$(FLIGHT_UAVOBJ_DIR)/$(UAVOBJSRCFILE).c ) UAVOBJDEFINE = $(foreach UAVOBJSRCFILE,$(UAVOBJSRCFILENAMES),-DUAVOBJ_INIT_$(UAVOBJSRCFILE) )