diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-28 09:47:29 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-28 09:47:29 +0100 |
| commit | 2760d64a007e6a1471a26194c32db7df236b9603 (patch) | |
| tree | 5590e5dafc54645e09bf5dad44d9d7cddc9349ec /makefiles | |
| parent | 946d1203cfbbe522c61d6ed5dc1205c9f809f6f1 (diff) | |
| parent | 22a247ca6760996ccb5f583b032253d4af97ed00 (diff) | |
| download | px4-firmware-2760d64a007e6a1471a26194c32db7df236b9603.tar.gz px4-firmware-2760d64a007e6a1471a26194c32db7df236b9603.tar.bz2 px4-firmware-2760d64a007e6a1471a26194c32db7df236b9603.zip | |
Merge remote-tracking branch 'upstream/master' into dev_ros
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 2 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index 4507b506c..18be47065 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -24,6 +24,8 @@ MODULES += drivers/l3gd20 MODULES += drivers/mpu6000 MODULES += drivers/hmc5883 MODULES += drivers/ms5611 +#MODULES += drivers/ll40ls +MODULES += drivers/trone #MODULES += drivers/mb12xx MODULES += drivers/gps MODULES += drivers/hil diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index d3b8ee93e..df6b6d0c5 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -27,13 +27,14 @@ MODULES += drivers/l3gd20 MODULES += drivers/hmc5883 MODULES += drivers/ms5611 MODULES += drivers/mb12xx -MODULES += drivers/sf0x +# MODULES += drivers/sf0x MODULES += drivers/ll40ls +# MODULES += drivers/trone MODULES += drivers/gps MODULES += drivers/hil MODULES += drivers/hott/hott_telemetry MODULES += drivers/hott/hott_sensors -MODULES += drivers/blinkm +# MODULES += drivers/blinkm MODULES += drivers/airspeed MODULES += drivers/ets_airspeed MODULES += drivers/meas_airspeed |