Merged beta into master

2026-05-22 09:28:58 +00:00 · 2015-08-01 16:58:02 +02:00
parent 848dd2155a 09f6b88651
commit ea7ae7d019
87 changed files with 1386 additions and 545 deletions
--- a/src/modules/land_detector/LandDetector.cpp
+++ b/src/modules/land_detector/LandDetector.cpp
@@ -46,8 +46,9 @@
 LandDetector::LandDetector() :
 	_landDetectedPub(0),
 	_landDetected({0, false}),
-	      _taskShouldExit(false),
-	      _taskIsRunning(false)
+	_arming_time(0),
+	_taskShouldExit(false),
+	_taskIsRunning(false)
 {
 	// ctor
 }