diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-03-15 09:47:02 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-03-15 09:47:02 +0400 |
| commit | 955bd402d2fb398fb64c55a885306b7054b55ce0 (patch) | |
| tree | 6004b2e661c3a7a8b70030173050eaa3fd135f99 /makefiles | |
| parent | 3d766575cd013821904832148362e0319dd4eeef (diff) | |
| parent | e590d96c0a7aa4a06a36423bae3db42ada226bc5 (diff) | |
| download | px4-firmware-955bd402d2fb398fb64c55a885306b7054b55ce0.tar.gz px4-firmware-955bd402d2fb398fb64c55a885306b7054b55ce0.tar.bz2 px4-firmware-955bd402d2fb398fb64c55a885306b7054b55ce0.zip | |
Merge branch 'master' into beta_mavlink2
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 1 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index aff614cbb..651c2ac38 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -56,6 +56,7 @@ MODULES += systemcmds/tests MODULES += systemcmds/config MODULES += systemcmds/nshterm MODULES += systemcmds/hw_ver +MODULES += systemcmds/dumpfile # # General system control diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index 412d0c9e1..5bed190d9 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -27,6 +27,7 @@ MODULES += drivers/l3gd20 MODULES += drivers/hmc5883 MODULES += drivers/ms5611 MODULES += drivers/mb12xx +MODULES += drivers/sf0x MODULES += drivers/gps MODULES += drivers/hil MODULES += drivers/hott/hott_telemetry @@ -63,6 +64,7 @@ MODULES += systemcmds/config MODULES += systemcmds/nshterm MODULES += systemcmds/mtd MODULES += systemcmds/hw_ver +MODULES += systemcmds/dumpfile # # General system control @@ -70,6 +72,7 @@ MODULES += systemcmds/hw_ver MODULES += modules/commander MODULES += modules/navigator MODULES += modules/mavlink +MODULES += modules/gpio_led # # Estimation modules (EKF/ SO3 / other filters) |