diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-07 18:49:36 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-07 18:49:36 +0200 |
| commit | 6a8990b3baac40cf0b4ef7a8ea3bdda73d3513e6 (patch) | |
| tree | 30b4387f17e1ac99396fcb7bc9fb848cb930a40b /makefiles | |
| parent | cd9f4f33a593e8eea8a0314b776d1ad3ef847462 (diff) | |
| parent | be73ad0bdb932e35cf891e8f5ffc1b89fdd683dc (diff) | |
| download | px4-firmware-6a8990b3baac40cf0b4ef7a8ea3bdda73d3513e6.tar.gz px4-firmware-6a8990b3baac40cf0b4ef7a8ea3bdda73d3513e6.tar.bz2 px4-firmware-6a8990b3baac40cf0b4ef7a8ea3bdda73d3513e6.zip | |
Merged master
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 1 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v2_test.mk | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index 4b6b0a4d2..8e83df391 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -33,7 +33,6 @@ 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 diff --git a/makefiles/config_px4fmu-v2_test.mk b/makefiles/config_px4fmu-v2_test.mk index 66b2157ed..66d9efbf8 100644 --- a/makefiles/config_px4fmu-v2_test.mk +++ b/makefiles/config_px4fmu-v2_test.mk @@ -25,6 +25,7 @@ MODULES += drivers/l3gd20 MODULES += drivers/hmc5883 MODULES += drivers/ms5611 MODULES += drivers/pca8574 +MODULES += drivers/roboclaw MODULES += systemcmds/perf MODULES += systemcmds/reboot MODULES += systemcmds/tests |