aboutsummaryrefslogtreecommitdiff
path: root/makefiles/config_px4fmu-v2_default.mk
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-08-09 12:22:28 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-08-09 12:22:28 +0200
commitb0b2f349923570a92c0611142f3cbcfa10d48b18 (patch)
treef6756f385b8bfb39b4377b557b43a9d58dd0aaff /makefiles/config_px4fmu-v2_default.mk
parentf24c5184e8c1716795f10980a8c3b383c463facd (diff)
parent2a7848c769cd4bf65b61a5e90f42096c4190c6e6 (diff)
downloadpx4-firmware-b0b2f349923570a92c0611142f3cbcfa10d48b18.tar.gz
px4-firmware-b0b2f349923570a92c0611142f3cbcfa10d48b18.tar.bz2
px4-firmware-b0b2f349923570a92c0611142f3cbcfa10d48b18.zip
Merged master
Diffstat (limited to 'makefiles/config_px4fmu-v2_default.mk')
-rw-r--r--makefiles/config_px4fmu-v2_default.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk
index 5677684b3..7e22c9a94 100644
--- a/makefiles/config_px4fmu-v2_default.mk
+++ b/makefiles/config_px4fmu-v2_default.mk
@@ -28,18 +28,19 @@ MODULES += drivers/hmc5883
MODULES += drivers/ms5611
MODULES += drivers/mb12xx
MODULES += drivers/sf0x
+MODULES += drivers/ll40ls
MODULES += drivers/gps
MODULES += drivers/hil
MODULES += drivers/hott/hott_telemetry
MODULES += drivers/hott/hott_sensors
MODULES += drivers/blinkm
-MODULES += drivers/roboclaw
MODULES += drivers/airspeed
MODULES += drivers/ets_airspeed
MODULES += drivers/meas_airspeed
MODULES += drivers/frsky_telemetry
MODULES += modules/sensors
MODULES += drivers/mkblctrl
+MODULES += drivers/pca8574
# Needs to be burned to the ground and re-written; for now,
@@ -63,8 +64,8 @@ MODULES += systemcmds/tests
MODULES += systemcmds/config
MODULES += systemcmds/nshterm
MODULES += systemcmds/mtd
-MODULES += systemcmds/hw_ver
MODULES += systemcmds/dumpfile
+MODULES += systemcmds/ver
#
# General system control
@@ -73,13 +74,14 @@ MODULES += modules/commander
MODULES += modules/navigator
MODULES += modules/mavlink
MODULES += modules/gpio_led
+MODULES += modules/uavcan
#
# Estimation modules (EKF/ SO3 / other filters)
#
MODULES += modules/attitude_estimator_ekf
MODULES += modules/attitude_estimator_so3
-MODULES += modules/fw_att_pos_estimator
+MODULES += modules/ekf_att_pos_estimator
MODULES += modules/position_estimator_inav
MODULES += examples/flow_position_estimator
@@ -121,6 +123,7 @@ MODULES += lib/mathlib/math/filter
MODULES += lib/ecl
MODULES += lib/external_lgpl
MODULES += lib/geo
+MODULES += lib/geo_lookup
MODULES += lib/conversion
MODULES += lib/launchdetection