diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-02-11 08:24:18 +0100 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-02-11 08:24:18 +0100 |
commit | 1b978293d9cce0ddd49299ac893864fea27ae491 (patch) | |
tree | 78e6e03a233a5addc6be6fd7703438076e3a2682 /makefiles | |
parent | 268f3d757f264fcd1c2217a41d5fa480e0c91a8f (diff) | |
parent | 0388d9adefb33c98f1e4350e3f2ed59a7fdd5359 (diff) | |
download | px4-firmware-1b978293d9cce0ddd49299ac893864fea27ae491.tar.gz px4-firmware-1b978293d9cce0ddd49299ac893864fea27ae491.tar.bz2 px4-firmware-1b978293d9cce0ddd49299ac893864fea27ae491.zip |
Merged master into beta
Diffstat (limited to 'makefiles')
-rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 2 | ||||
-rw-r--r-- | makefiles/config_px4fmu-v2_test.mk | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index ab05d4e3d..2ad2f63a9 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -38,6 +38,8 @@ MODULES += drivers/ets_airspeed MODULES += drivers/meas_airspeed MODULES += drivers/frsky_telemetry MODULES += modules/sensors +MODULES += drivers/mkblctrl + # Needs to be burned to the ground and re-written; for now, # just don't build it. diff --git a/makefiles/config_px4fmu-v2_test.mk b/makefiles/config_px4fmu-v2_test.mk index 8623c0584..79922374d 100644 --- a/makefiles/config_px4fmu-v2_test.mk +++ b/makefiles/config_px4fmu-v2_test.mk @@ -18,6 +18,12 @@ MODULES += drivers/stm32/tone_alarm MODULES += drivers/led MODULES += drivers/boards/px4fmu-v2 MODULES += drivers/px4io +MODULES += drivers/rgbled +MODULES += drivers/mpu6000 +MODULES += drivers/lsm303d +MODULES += drivers/l3gd20 +MODULES += drivers/hmc5883 +MODULES += drivers/ms5611 MODULES += systemcmds/perf MODULES += systemcmds/reboot MODULES += systemcmds/tests @@ -31,6 +37,9 @@ MODULES += systemcmds/hw_ver MODULES += modules/systemlib MODULES += modules/systemlib/mixer MODULES += modules/uORB +LIBRARIES += lib/mathlib/CMSIS +MODULES += lib/mathlib +MODULES += lib/mathlib/math/filter # # Libraries |