fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-20 14:23:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PX4/Firmware into fmuv2_bringup

Browse Source
This commit is contained in:
px4dev
2013-07-07 12:22:56 -07:00
parent 9fe257c4d1 cf2dbdf9a1
commit 43f1843cc7
2168 changed files with 13072 additions and 486290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
makefiles/board_px4fmu.mk → makefiles/board_px4fmu-v1.mk
View File
makefiles/board_px4io.mk → makefiles/board_px4io-v1.mk
View File
makefiles/config_px4fmu_default.mk → makefiles/config_px4fmu-v1_default.mk
+5 -3
View File
@@ -64,9 +64,9 @@ MODULES += modules/gpio_led
#
MODULES += modules/attitude_estimator_ekf
MODULES += modules/attitude_estimator_so3_comp
#MODULES += modules/position_estimator_mc
MODULES += modules/position_estimator
MODULES += modules/att_pos_estimator_ekf
MODULES += examples/flow_position_estimator
#
# Vehicle Control
@@ -76,11 +76,12 @@ MODULES += modules/fixedwing_att_control
MODULES += modules/fixedwing_pos_control
MODULES += modules/multirotor_att_control
MODULES += modules/multirotor_pos_control
MODULES += examples/flow_position_control
MODULES += examples/flow_speed_control
#
# Logging
#
MODULES += modules/sdlog
MODULES += modules/sdlog2
#
@@ -132,4 +133,5 @@ endef
# command priority stack entrypoint
BUILTIN_COMMANDS := \
$(call _B, sercon, , 2048, sercon_main ) \
$(call _B, serdis, , 2048, serdis_main )
$(call _B, serdis, , 2048, serdis_main ) \
$(call _B, sysinfo, , 2048, sysinfo_main )
makefiles/config_px4io_default.mk → makefiles/config_px4io-v1_default.mk
View File
makefiles/setup.mk
+2 -2
View File
@@ -44,8 +44,8 @@
export PX4_INCLUDE_DIR = $(abspath $(PX4_BASE)/src/include)/
export PX4_MODULE_SRC = $(abspath $(PX4_BASE)/src)/
export PX4_MK_DIR = $(abspath $(PX4_BASE)/makefiles)/
export NUTTX_SRC = $(abspath $(PX4_BASE)/nuttx)/
export NUTTX_APP_SRC = $(abspath $(PX4_BASE)/apps)/
export NUTTX_SRC = $(abspath $(PX4_BASE)/NuttX/nuttx)/
export NUTTX_APP_SRC = $(abspath $(PX4_BASE)/NuttX/apps)/
export MAVLINK_SRC = $(abspath $(PX4_BASE)/mavlink)/
export ROMFS_SRC = $(abspath $(PX4_BASE)/ROMFS)/
export IMAGE_DIR = $(abspath $(PX4_BASE)/Images)/
makefiles/upload.mk
+1 -1
View File
@@ -24,7 +24,7 @@ endif
.PHONY: all upload-$(METHOD)-$(BOARD)
all: upload-$(METHOD)-$(BOARD)
upload-serial-px4fmu: $(BUNDLE) $(UPLOADER)
upload-serial-px4fmu-v1: $(BUNDLE) $(UPLOADER)
$(Q) $(PYTHON) -u $(UPLOADER) --port $(SERIAL_PORTS) $(BUNDLE)
upload-serial-px4fmuv2: $(BUNDLE) $(UPLOADER)