diff options
| author | Julian Oes <julian@oes.ch> | 2013-07-08 10:31:32 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-07-08 10:31:32 +0200 |
| commit | 88389ea2554c6f56a4fdd86cdd86a1e7b6affc21 (patch) | |
| tree | 3ef98ded43e5f3a2cdc30a836a3a7329fe5757bb /makefiles | |
| parent | 76346bfe19c816491a6982abfa10f48cd9d258f6 (diff) | |
| parent | cf2dbdf9a1ae06c7d0e0a7963916a3709a1bc075 (diff) | |
| download | px4-firmware-88389ea2554c6f56a4fdd86cdd86a1e7b6affc21.tar.gz px4-firmware-88389ea2554c6f56a4fdd86cdd86a1e7b6affc21.tar.bz2 px4-firmware-88389ea2554c6f56a4fdd86cdd86a1e7b6affc21.zip | |
Merge branch 'master' into new_state_machine
compiling again
Conflicts:
src/modules/fixedwing_att_control/fixedwing_att_control_att.c
src/modules/fixedwing_att_control/fixedwing_att_control_rate.c
src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c
src/modules/mavlink/orb_listener.c
src/modules/multirotor_att_control/multirotor_attitude_control.c
src/modules/multirotor_att_control/multirotor_rate_control.c
src/modules/systemlib/pid/pid.c
src/modules/systemlib/pid/pid.h
src/modules/uORB/objects_common.cpp
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/board_px4fmu-v1.mk (renamed from makefiles/board_px4fmu.mk) | 0 | ||||
| -rw-r--r-- | makefiles/board_px4io-v1.mk (renamed from makefiles/board_px4io.mk) | 0 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk (renamed from makefiles/config_px4fmu_default.mk) | 3 | ||||
| -rw-r--r-- | makefiles/config_px4io-v1_default.mk (renamed from makefiles/config_px4io_default.mk) | 0 | ||||
| -rw-r--r-- | makefiles/setup.mk | 4 | ||||
| -rw-r--r-- | makefiles/upload.mk | 2 |
6 files changed, 5 insertions, 4 deletions
diff --git a/makefiles/board_px4fmu.mk b/makefiles/board_px4fmu-v1.mk index 837069644..837069644 100644 --- a/makefiles/board_px4fmu.mk +++ b/makefiles/board_px4fmu-v1.mk diff --git a/makefiles/board_px4io.mk b/makefiles/board_px4io-v1.mk index b0eb2dae7..b0eb2dae7 100644 --- a/makefiles/board_px4io.mk +++ b/makefiles/board_px4io-v1.mk diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu-v1_default.mk index e8104b351..ea1e38ff7 100644 --- a/makefiles/config_px4fmu_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -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 ) diff --git a/makefiles/config_px4io_default.mk b/makefiles/config_px4io-v1_default.mk index cf70391bc..cf70391bc 100644 --- a/makefiles/config_px4io_default.mk +++ b/makefiles/config_px4io-v1_default.mk diff --git a/makefiles/setup.mk b/makefiles/setup.mk index 111193093..92461fafb 100644 --- a/makefiles/setup.mk +++ b/makefiles/setup.mk @@ -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)/ diff --git a/makefiles/upload.mk b/makefiles/upload.mk index 5ef92728f..4b01b447d 100644 --- a/makefiles/upload.mk +++ b/makefiles/upload.mk @@ -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) |