From 1b11049e42763f5e1014504e196298eff30bb057 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Fri, 29 Apr 2016 15:01:39 +0200 Subject: [PATCH] Land detector: fix code style --- src/modules/land_detector/LandDetector.cpp | 9 ++++----- src/modules/land_detector/MulticopterLandDetector.cpp | 4 +++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/modules/land_detector/LandDetector.cpp b/src/modules/land_detector/LandDetector.cpp index 5588f981f6..f1ef61e625 100644 --- a/src/modules/land_detector/LandDetector.cpp +++ b/src/modules/land_detector/LandDetector.cpp @@ -51,11 +51,10 @@ namespace landdetection LandDetector::LandDetector() : _landDetectedPub(0), _landDetected( {0, false}), - _arming_time(0), - _taskShouldExit(false), - _taskIsRunning(false), - _work{} -{ + _arming_time(0), + _taskShouldExit(false), + _taskIsRunning(false), +_work{} { // ctor } diff --git a/src/modules/land_detector/MulticopterLandDetector.cpp b/src/modules/land_detector/MulticopterLandDetector.cpp index b6cf0a31b5..b6eeb92dab 100644 --- a/src/modules/land_detector/MulticopterLandDetector.cpp +++ b/src/modules/land_detector/MulticopterLandDetector.cpp @@ -165,6 +165,7 @@ bool MulticopterLandDetector::get_landed_state() if (minimalThrust && _min_trust_start == 0) { _min_trust_start = now; + } else if (!minimalThrust) { _min_trust_start = 0; } @@ -197,8 +198,9 @@ bool MulticopterLandDetector::get_landed_state() // falling consider it to be landed. This should even sustain // quite acrobatic flight. if ((_min_trust_start > 0) && - (hrt_elapsed_time(&_min_trust_start) > 8 * 1000 * 1000)) { + (hrt_elapsed_time(&_min_trust_start) > 8 * 1000 * 1000)) { return !get_freefall_state(); + } else { return false; }