diff options
author | Anton Babushkin <anton.babushkin@me.com> | 2014-01-08 15:44:24 +0100 |
---|---|---|
committer | Anton Babushkin <anton.babushkin@me.com> | 2014-01-08 15:44:24 +0100 |
commit | 8d7620c3cbe86414b84917350bcc99b65cef9b0d (patch) | |
tree | 53214fb17061a4e5c3f3405330f7d8b37e5af500 /makefiles | |
parent | 255db83e9346469ca7da02675a54b753cfd1a074 (diff) | |
parent | 94b539dfddc5a2e293f51058ee5bf0d6ffc78406 (diff) | |
download | px4-firmware-8d7620c3cbe86414b84917350bcc99b65cef9b0d.tar.gz px4-firmware-8d7620c3cbe86414b84917350bcc99b65cef9b0d.tar.bz2 px4-firmware-8d7620c3cbe86414b84917350bcc99b65cef9b0d.zip |
Merge branch 'master' into navigator_new_vector
Diffstat (limited to 'makefiles')
-rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 1 | ||||
-rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index cf5119789..146a77d23 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -36,6 +36,7 @@ MODULES += drivers/mkblctrl MODULES += drivers/airspeed MODULES += drivers/ets_airspeed MODULES += drivers/meas_airspeed +MODULES += drivers/frsky_telemetry MODULES += modules/sensors # diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index 9bb9228f3..e81540c03 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -36,6 +36,7 @@ MODULES += drivers/roboclaw MODULES += drivers/airspeed MODULES += drivers/ets_airspeed MODULES += drivers/meas_airspeed +MODULES += drivers/frsky_telemetry MODULES += modules/sensors # Needs to be burned to the ground and re-written; for now, |