diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-30 09:15:55 +0100 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-10-30 09:15:55 +0100 |
commit | dc80d6745e94df71d351f4338c610f910c2a4e94 (patch) | |
tree | bd4fbaa1d68fa6f38919167cea8285ba94b7e594 /makefiles/config_px4fmu-v1_default.mk | |
parent | 34d2f318ac8a72cce63e3e14e004daee45001011 (diff) | |
parent | 0fa03e65ab3ab0e173e487b3e5f5321780f3afff (diff) | |
download | px4-firmware-dc80d6745e94df71d351f4338c610f910c2a4e94.tar.gz px4-firmware-dc80d6745e94df71d351f4338c610f910c2a4e94.tar.bz2 px4-firmware-dc80d6745e94df71d351f4338c610f910c2a4e94.zip |
Merge branch 'master' of github.com:PX4/Firmware into pwm_ioctls
Diffstat (limited to 'makefiles/config_px4fmu-v1_default.mk')
-rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 5 |
1 files changed, 3 insertions, 2 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 |