fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-18 15:43:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into hott-esc

Browse Source
This commit is contained in:
Simon Wilks
2013-07-09 08:04:07 +02:00
parent 86adaeb3e8 ced2871263
commit a18c6cea18
2176 changed files with 11227 additions and 485395 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
+2 -1
View File
@@ -133,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)