Merge remote-tracking branch 'px4/beta' into beta_mavlink

Conflicts:
	src/modules/mavlink/mavlink.c
	src/modules/mavlink/mavlink_receiver.h
	src/modules/mavlink/orb_listener.c

1 files changed, 0 insertions, 4 deletions

diff --git a/src/lib/launchdetection/LaunchDetector.cpp b/src/lib/launchdetection/LaunchDetector.cpp
index 67b32ad82..df9f2fe95 100644
--- a/src/lib/launchdetection/LaunchDetector.cpp
+++ b/src/lib/launchdetection/LaunchDetector.cpp
@@ -83,14 +83,10 @@ bool LaunchDetector::getLaunchDetected()
 
 void LaunchDetector::updateParams() {
 
-	warnx(" LaunchDetector::updateParams()");
 	launchdetection_on.update();
 	throttlePreTakeoff.update();
 
 	for (uint8_t i = 0; i < sizeof(launchMethods)/sizeof(LaunchMethod); i++) {
 		launchMethods[i]->updateParams();
-		warnx("updating component %d", i);
 	}
-
-	warnx(" LaunchDetector::updateParams() ended");
 }