rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-06 21:54:15 +01:00
Code Issues Releases Activity

LP-76 fix MSP merge conflict sort OPTMODULES in alphabetical order

Browse Source
This commit is contained in:
Cliff Geerdes 2016-05-29 13:02:11 -04:00
parent 68c3d5030a
commit 039e95ac4f
6 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flight/targets/boards/discoveryf4bare/firmware/Makefile
View File

@ -55,9 +55,9 @@ MODULES += Osd/osdoutout
MODULES += Logging MODULES += Logging
MODULES += Telemetry MODULES += Telemetry
OPTMODULES += AutoTune
OPTMODULES += ComUsbBridge OPTMODULES += ComUsbBridge
OPTMODULES += UAVOMSPBridge OPTMODULES += UAVOMSPBridge
OPTMODULES += AutoTune
SRC += $(FLIGHTLIB)/notification.c SRC += $(FLIGHTLIB)/notification.c

2
flight/targets/boards/revolution/firmware/Makefile
View File

@ -52,9 +52,9 @@ MODULES += Logging
MODULES += Telemetry MODULES += Telemetry
MODULES += Notify MODULES += Notify
OPTMODULES += AutoTune
OPTMODULES += ComUsbBridge OPTMODULES += ComUsbBridge
OPTMODULES += UAVOMSPBridge OPTMODULES += UAVOMSPBridge
OPTMODULES += AutoTune
SRC += $(FLIGHTLIB)/notification.c SRC += $(FLIGHTLIB)/notification.c

2
flight/targets/boards/revonano/firmware/Makefile
View File

@ -51,9 +51,9 @@ MODULES += PathFollower
MODULES += Telemetry MODULES += Telemetry
MODULES += Notify MODULES += Notify
OPTMODULES += AutoTune
OPTMODULES += ComUsbBridge OPTMODULES += ComUsbBridge
OPTMODULES += UAVOMSPBridge OPTMODULES += UAVOMSPBridge
OPTMODULES += AutoTune
SRC += $(FLIGHTLIB)/notification.c SRC += $(FLIGHTLIB)/notification.c

2
flight/targets/boards/revoproto/firmware/Makefile
View File

@ -52,9 +52,9 @@ MODULES += Telemetry
SRC += $(FLIGHTLIB)/notification.c SRC += $(FLIGHTLIB)/notification.c
OPTMODULES += AutoTune
OPTMODULES += ComUsbBridge OPTMODULES += ComUsbBridge
OPTMODULES += UAVOMSPBridge OPTMODULES += UAVOMSPBridge
OPTMODULES += AutoTune
# Include all camera options # Include all camera options
CDEFS += -DUSE_INPUT_LPF -DUSE_GIMBAL_LPF -DUSE_GIMBAL_FF CDEFS += -DUSE_INPUT_LPF -DUSE_GIMBAL_LPF -DUSE_GIMBAL_FF

3
flight/targets/boards/sparky2/firmware/Makefile
View File

@ -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) 2009-2013, The OpenPilot Team, http://www.openpilot.org
# Copyright (c) 2012, PhoenixPilot, http://github.com/PhoenixPilot # Copyright (c) 2012, PhoenixPilot, http://github.com/PhoenixPilot
# #
@ -52,6 +52,7 @@ MODULES += Logging
MODULES += Telemetry MODULES += Telemetry
MODULES += Notify MODULES += Notify
OPTMODULES += AutoTune
OPTMODULES += ComUsbBridge OPTMODULES += ComUsbBridge
OPTMODULES += UAVOMSPBridge OPTMODULES += UAVOMSPBridge

4
flight/targets/boards/sparky2/firmware/UAVObjects.inc
View File

@ -126,6 +126,8 @@ UAVOBJSRCFILENAMES += txpidsettings
UAVOBJSRCFILENAMES += txpidstatus UAVOBJSRCFILENAMES += txpidstatus
UAVOBJSRCFILENAMES += takeofflocation UAVOBJSRCFILENAMES += takeofflocation
UAVOBJSRCFILENAMES += perfcounter UAVOBJSRCFILENAMES += perfcounter
UAVOBJSRCFILENAMES += systemidentsettings
UAVOBJSRCFILENAMES += systemidentstate
UAVOBJSRC = $(foreach UAVOBJSRCFILE,$(UAVOBJSRCFILENAMES),$(FLIGHT_UAVOBJ_DIR)/$(UAVOBJSRCFILE).c ) UAVOBJSRC = $(foreach UAVOBJSRCFILE,$(UAVOBJSRCFILENAMES),$(FLIGHT_UAVOBJ_DIR)/$(UAVOBJSRCFILE).c )
UAVOBJDEFINE = $(foreach UAVOBJSRCFILE,$(UAVOBJSRCFILENAMES),-DUAVOBJ_INIT_$(UAVOBJSRCFILE) ) UAVOBJDEFINE = $(foreach UAVOBJSRCFILE,$(UAVOBJSRCFILENAMES),-DUAVOBJ_INIT_$(UAVOBJSRCFILE) )