diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-24 22:45:43 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-24 22:45:43 +0200 |
| commit | 20728e83f5acc52c5b96d6bdb93767375562dbe2 (patch) | |
| tree | 03ec8ac1215ecbfcee8dbffacd351fcb781d96c8 /makefiles | |
| parent | 53b3498db440f8ecf8779ce7f3df55351c84852f (diff) | |
| parent | 2d4fc9eea1d693bafeeacc1e929d1906418ee3b0 (diff) | |
| download | px4-firmware-20728e83f5acc52c5b96d6bdb93767375562dbe2.tar.gz px4-firmware-20728e83f5acc52c5b96d6bdb93767375562dbe2.tar.bz2 px4-firmware-20728e83f5acc52c5b96d6bdb93767375562dbe2.zip | |
Merge branch 'master' of github.com:PX4/Firmware into fw_autoland
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 5 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index 46640f3c5..f9061c110 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -33,7 +33,7 @@ MODULES += drivers/hott/hott_sensors MODULES += drivers/blinkm MODULES += drivers/rgbled MODULES += drivers/mkblctrl -MODULES += drivers/md25 +MODULES += drivers/roboclaw MODULES += drivers/airspeed MODULES += drivers/ets_airspeed MODULES += drivers/meas_airspeed @@ -79,7 +79,7 @@ MODULES += examples/flow_position_estimator # # Vehicle Control # -#MODULES += modules/segway # XXX needs state machine update +MODULES += modules/segway MODULES += modules/fw_pos_control_l1 MODULES += modules/fw_att_control MODULES += modules/multirotor_att_control @@ -115,6 +115,7 @@ MODULES += lib/mathlib/math/filter MODULES += lib/ecl MODULES += lib/external_lgpl MODULES += lib/geo +MODULES += lib/conversion # # Demo apps diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index bb589cb9f..ed2f2da5e 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -31,6 +31,7 @@ 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 @@ -77,7 +78,7 @@ MODULES += examples/flow_position_estimator # # Vehicle Control # -#MODULES += modules/segway # XXX needs state machine update +MODULES += modules/segway MODULES += modules/fw_pos_control_l1 MODULES += modules/fw_att_control MODULES += modules/multirotor_att_control @@ -111,6 +112,7 @@ MODULES += lib/mathlib/math/filter MODULES += lib/ecl MODULES += lib/external_lgpl MODULES += lib/geo +MODULES += lib/conversion # # Demo apps |