diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-12-01 11:28:14 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-12-01 11:28:14 +0100 |
| commit | 032ca98e9e72a71e05f4f177a87d63096c58c7ca (patch) | |
| tree | 792a67e1dbc68f24d6bf55ad38ad2c2033aec78a | |
| parent | e51f72000bb850f9933a5ba9c024dddb6248440c (diff) | |
| parent | 8cc59ca01a2beb74d1069bb603baed47f59ddbc6 (diff) | |
| download | px4-firmware-032ca98e9e72a71e05f4f177a87d63096c58c7ca.tar.gz px4-firmware-032ca98e9e72a71e05f4f177a87d63096c58c7ca.tar.bz2 px4-firmware-032ca98e9e72a71e05f4f177a87d63096c58c7ca.zip | |
Merge branch 'master' of github.com:PX4/Firmware
| m--------- | NuttX | 0 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 6 |
2 files changed, 3 insertions, 3 deletions
diff --git a/NuttX b/NuttX -Subproject ec6b670f6d1e964700c0b0a50d14db12761e309 +Subproject ae4b05e2c51d07369b5d131052099ac346b0841 diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index 889e169a1..df6b6d0c5 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -27,14 +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/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 |