aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2014-06-01 13:45:27 +0200
committerThomas Gubler <thomasgubler@gmail.com>2014-06-01 13:45:27 +0200
commitb849f721763d8d67a4e994aaf06f8607b2ab918d (patch)
treec40fcb34cb2b9d76da3991214b3133283b04e273
parent2439fa613ee3be91a9d5bf630570e2f1b2629a49 (diff)
parent7b012bfd0b2c32d6e9297eeae9acda8d16e0327f (diff)
downloadpx4-firmware-b849f721763d8d67a4e994aaf06f8607b2ab918d.tar.gz
px4-firmware-b849f721763d8d67a4e994aaf06f8607b2ab918d.tar.bz2
px4-firmware-b849f721763d8d67a4e994aaf06f8607b2ab918d.zip
Merge remote-tracking branch 'upstream/master' into mtecs
-rw-r--r--ROMFS/px4fmu_common/init.d/rc.mc_defaults2
-rw-r--r--src/modules/commander/commander.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/ROMFS/px4fmu_common/init.d/rc.mc_defaults b/ROMFS/px4fmu_common/init.d/rc.mc_defaults
index 65f1e38c6..127e42164 100644
--- a/ROMFS/px4fmu_common/init.d/rc.mc_defaults
+++ b/ROMFS/px4fmu_common/init.d/rc.mc_defaults
@@ -37,7 +37,7 @@ then
param set MPC_LAND_SPEED 1.0
param set PE_VELNE_NOISE 0.5
- param set PE_VELNE_NOISE 0.7
+ param set PE_VELD_NOISE 0.7
param set PE_POSNE_NOISE 0.5
param set PE_POSD_NOISE 1.0
diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp
index 5c0628a16..65922b2a5 100644
--- a/src/modules/commander/commander.cpp
+++ b/src/modules/commander/commander.cpp
@@ -1408,7 +1408,7 @@ int commander_thread_main(int argc, char *argv[])
home.alt = global_position.alt;
warnx("home: lat = %.7f, lon = %.7f, alt = %.2f ", home.lat, home.lon, (double)home.alt);
- mavlink_log_info(mavlink_fd, "#audio: home: %.7f, %.7f, %.2f", home.lat, home.lon, (double)home.alt);
+ mavlink_log_info(mavlink_fd, "home: %.7f, %.7f, %.2f", home.lat, home.lon, (double)home.alt);
/* announce new home position */
if (home_pub > 0) {