yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-22 01:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fmuv2_bringup' into multirotor

Browse Source
This commit is contained in:
Lorenz Meier
2013-08-26 13:26:25 +02:00
parent 2537977101 3157285254
commit 54ad734b95
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile
View File

@@ -40,14 +40,16 @@ export PX4_BASE := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))/
include $(PX4_BASE)makefiles/setup.mk include $(PX4_BASE)makefiles/setup.mk
# #
# Canned firmware configurations that we build. # Canned firmware configurations that we (know how to) build.
# #
CONFIGS ?= $(subst config_,,$(basename $(notdir $(wildcard $(PX4_MK_DIR)config_*.mk)))) KNOWN_CONFIGS := $(subst config_,,$(basename $(notdir $(wildcard $(PX4_MK_DIR)config_*.mk))))
CONFIGS ?= $(KNOWN_CONFIGS)
# #
# Boards that we build NuttX export kits for. # Boards that we (know how to) build NuttX export kits for.
# #
BOARDS := $(subst board_,,$(basename $(notdir $(wildcard $(PX4_MK_DIR)board_*.mk)))) KNOWN_BOARDS := $(subst board_,,$(basename $(notdir $(wildcard $(PX4_MK_DIR)board_*.mk))))
BOARDS ?= $(KNOWN_BOARDS)
# #
# Debugging # Debugging
@@ -87,10 +89,11 @@ endif
# #
# Built products # Built products
# #
STAGED_FIRMWARES = $(foreach config,$(CONFIGS),$(IMAGE_DIR)$(config).px4) DESIRED_FIRMWARES = $(foreach config,$(CONFIGS),$(IMAGE_DIR)$(config).px4)
FIRMWARES = $(foreach config,$(CONFIGS),$(BUILD_DIR)$(config).build/firmware.px4) STAGED_FIRMWARES = $(foreach config,$(KNOWN_CONFIGS),$(IMAGE_DIR)$(config).px4)
FIRMWARES = $(foreach config,$(KNOWN_CONFIGS),$(BUILD_DIR)$(config).build/firmware.px4)
all: $(STAGED_FIRMWARES) all: $(DESIRED_FIRMWARES)
# #
# Copy FIRMWARES into the image directory. # Copy FIRMWARES into the image directory.
@@ -122,7 +125,7 @@ $(FIRMWARES): $(BUILD_DIR)%.build/firmware.px4:
$(FIRMWARE_GOAL) $(FIRMWARE_GOAL)
# #
# Make FMU firmwares depend on pre-packaged IO binaries. # Make FMU firmwares depend on the corresponding IO firmware.
# #
# This is a pretty vile hack, since it hard-codes knowledge of the FMU->IO dependency # This is a pretty vile hack, since it hard-codes knowledge of the FMU->IO dependency
# and forces the _default config in all cases. There has to be a better way to do this... # and forces the _default config in all cases. There has to be a better way to do this...

4
nuttx-configs/px4fmu-v1/nsh/defconfig
View File

@@ -405,8 +405,8 @@ CONFIG_SIG_SIGWORK=4
CONFIG_MAX_TASKS=32 CONFIG_MAX_TASKS=32
CONFIG_MAX_TASK_ARGS=10 CONFIG_MAX_TASK_ARGS=10
CONFIG_NPTHREAD_KEYS=4 CONFIG_NPTHREAD_KEYS=4
CONFIG_NFILE_DESCRIPTORS=32 CONFIG_NFILE_DESCRIPTORS=64
CONFIG_NFILE_STREAMS=25 CONFIG_NFILE_STREAMS=50
CONFIG_NAME_MAX=32 CONFIG_NAME_MAX=32
CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_MQ_MSGS=4
CONFIG_MQ_MAXMSGSIZE=32 CONFIG_MQ_MAXMSGSIZE=32

4
nuttx-configs/px4fmu-v2/nsh/defconfig
View File

@@ -451,8 +451,8 @@ CONFIG_SIG_SIGWORK=4
CONFIG_MAX_TASKS=32 CONFIG_MAX_TASKS=32
CONFIG_MAX_TASK_ARGS=10 CONFIG_MAX_TASK_ARGS=10
CONFIG_NPTHREAD_KEYS=4 CONFIG_NPTHREAD_KEYS=4
CONFIG_NFILE_DESCRIPTORS=32 CONFIG_NFILE_DESCRIPTORS=64
CONFIG_NFILE_STREAMS=25 CONFIG_NFILE_STREAMS=50
CONFIG_NAME_MAX=32 CONFIG_NAME_MAX=32
CONFIG_PREALLOC_MQ_MSGS=4 CONFIG_PREALLOC_MQ_MSGS=4
CONFIG_MQ_MAXMSGSIZE=32 CONFIG_MQ_MAXMSGSIZE=32