diff --git a/src/modules/land_detector/LandDetector.cpp b/src/modules/land_detector/LandDetector.cpp index 92302d986a..ddebf14ac8 100644 --- a/src/modules/land_detector/LandDetector.cpp +++ b/src/modules/land_detector/LandDetector.cpp @@ -127,12 +127,10 @@ void LandDetector::_cycle() float alt_max_prev = _altitude_max; _altitude_max = _get_max_altitude(); - bool freefallDetected = (_state == LandDetectionState::FREEFALL); bool landDetected = (_state == LandDetectionState::LANDED); bool ground_contactDetected = (_state == LandDetectionState::GROUND_CONTACT); - // Only publish very first time or when the result has changed. if ((_landDetectedPub == nullptr) || (_landDetected.freefall != freefallDetected) || diff --git a/src/modules/land_detector/MulticopterLandDetector.cpp b/src/modules/land_detector/MulticopterLandDetector.cpp index 58a508d1a0..c2054a7614 100644 --- a/src/modules/land_detector/MulticopterLandDetector.cpp +++ b/src/modules/land_detector/MulticopterLandDetector.cpp @@ -288,7 +288,7 @@ float MulticopterLandDetector::_get_takeoff_throttle() float MulticopterLandDetector::_get_max_altitude() { - /* ToDo: add meaningful heights */ + /* ToDo: add a meaningful altitude */ float valid_altitude_max = _params.altitude_max; if (_battery.warning == battery_status_s::BATTERY_WARNING_LOW) { diff --git a/src/modules/land_detector/land_detector_params.c b/src/modules/land_detector/land_detector_params.c index 875947510b..b731a68a99 100644 --- a/src/modules/land_detector/land_detector_params.c +++ b/src/modules/land_detector/land_detector_params.c @@ -224,4 +224,4 @@ PARAM_DEFINE_INT32(LND_FLIGHT_T_LO, 0); * @group Land Detector * */ -PARAM_DEFINE_FLOAT(LNDMC_ALT_MAX, 15.0f); +PARAM_DEFINE_FLOAT(LNDMC_ALT_MAX, 100.0f); diff --git a/src/modules/mc_pos_control/mc_pos_control_main.cpp b/src/modules/mc_pos_control/mc_pos_control_main.cpp index 7b129ab34f..5b72d8fab3 100644 --- a/src/modules/mc_pos_control/mc_pos_control_main.cpp +++ b/src/modules/mc_pos_control/mc_pos_control_main.cpp @@ -922,7 +922,6 @@ MulticopterPositionControl::reset_alt_sp() void MulticopterPositionControl::limit_altitude() { - /* in altitude control, limit setpoint */ if (_run_alt_control && _pos_sp(2) <= -_vehicle_land_detected.alt_max) { _pos_sp(2) = -_vehicle_land_detected.alt_max;