diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-02-02 21:21:51 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-02-02 21:21:51 +0100 |
| commit | d441d38677eb78d1e599973dd1e993d3af1af218 (patch) | |
| tree | ddee78e259d301c551a734a9f75c12107b53c227 /makefiles | |
| parent | 143508529feb10d5e767794b1fdd236d6915901b (diff) | |
| parent | e6a7dc7a3ffd4eb988e9039171f1460f656b28c8 (diff) | |
| download | px4-firmware-d441d38677eb78d1e599973dd1e993d3af1af218.tar.gz px4-firmware-d441d38677eb78d1e599973dd1e993d3af1af218.tar.bz2 px4-firmware-d441d38677eb78d1e599973dd1e993d3af1af218.zip | |
Merged master into ros
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 10 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 12 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v2_test.mk | 4 |
3 files changed, 15 insertions, 11 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index 4e528f8cd..f30733694 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -24,18 +24,18 @@ MODULES += drivers/l3gd20 MODULES += drivers/mpu6000 MODULES += drivers/hmc5883 MODULES += drivers/ms5611 -#MODULES += drivers/ll40ls +MODULES += drivers/ll40ls MODULES += drivers/trone -#MODULES += drivers/mb12xx +MODULES += drivers/mb12xx MODULES += drivers/gps MODULES += drivers/hil -#MODULES += drivers/blinkm +MODULES += drivers/blinkm MODULES += drivers/rgbled MODULES += drivers/mkblctrl MODULES += drivers/airspeed -#MODULES += drivers/ets_airspeed +MODULES += drivers/ets_airspeed MODULES += drivers/meas_airspeed -#MODULES += drivers/frsky_telemetry +MODULES += drivers/frsky_telemetry MODULES += modules/sensors # diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index aa2e01229..256c2a636 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -27,15 +27,15 @@ 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 -# MODULES += drivers/hott/hott_telemetry -# MODULES += drivers/hott/hott_sensors -# MODULES += drivers/blinkm +MODULES += drivers/hott +MODULES += drivers/hott/hott_telemetry +MODULES += drivers/hott/hott_sensors +MODULES += drivers/blinkm MODULES += drivers/airspeed MODULES += drivers/ets_airspeed MODULES += drivers/meas_airspeed diff --git a/makefiles/config_px4fmu-v2_test.mk b/makefiles/config_px4fmu-v2_test.mk index c360f722b..22563838b 100644 --- a/makefiles/config_px4fmu-v2_test.mk +++ b/makefiles/config_px4fmu-v2_test.mk @@ -26,6 +26,9 @@ MODULES += drivers/hmc5883 MODULES += drivers/ms5611 MODULES += drivers/pca8574 MODULES += drivers/roboclaw +MODULES += drivers/airspeed +MODULES += drivers/ets_airspeed +MODULES += drivers/meas_airspeed MODULES += systemcmds/perf MODULES += systemcmds/reboot MODULES += systemcmds/tests @@ -33,6 +36,7 @@ MODULES += systemcmds/nshterm MODULES += systemcmds/mtd MODULES += systemcmds/ver MODULES += systemcmds/top +MODULES += modules/sensors # # System commands |