mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-26 00:33:33 +08:00
Add return INFINITY; to the LandDetector class _get_max_altitude() method declaration (#12343)
This commit is contained in:
@@ -57,13 +57,6 @@ void FixedwingLandDetector::_update_topics()
|
|||||||
_airspeed_sub.update(&_airspeed);
|
_airspeed_sub.update(&_airspeed);
|
||||||
}
|
}
|
||||||
|
|
||||||
float FixedwingLandDetector::_get_max_altitude()
|
|
||||||
{
|
|
||||||
// TODO: This means no altitude limit as the limit
|
|
||||||
// is always current position plus 10000 meters.
|
|
||||||
return roundf(-_vehicle_local_position.z + 10000);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool FixedwingLandDetector::_get_landed_state()
|
bool FixedwingLandDetector::_get_landed_state()
|
||||||
{
|
{
|
||||||
// Only trigger flight conditions if we are armed.
|
// Only trigger flight conditions if we are armed.
|
||||||
|
|||||||
@@ -43,7 +43,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <matrix/math.hpp>
|
#include <matrix/math.hpp>
|
||||||
#include <uORB/Subscription.hpp>
|
|
||||||
#include <uORB/topics/airspeed.h>
|
#include <uORB/topics/airspeed.h>
|
||||||
|
|
||||||
#include "LandDetector.h"
|
#include "LandDetector.h"
|
||||||
@@ -61,9 +60,6 @@ public:
|
|||||||
protected:
|
protected:
|
||||||
|
|
||||||
bool _get_landed_state() override;
|
bool _get_landed_state() override;
|
||||||
|
|
||||||
float _get_max_altitude() override;
|
|
||||||
|
|
||||||
void _update_topics() override;
|
void _update_topics() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|||||||
@@ -61,7 +61,6 @@
|
|||||||
#include <uORB/topics/vehicle_land_detected.h>
|
#include <uORB/topics/vehicle_land_detected.h>
|
||||||
#include <uORB/topics/vehicle_local_position.h>
|
#include <uORB/topics/vehicle_local_position.h>
|
||||||
|
|
||||||
|
|
||||||
using namespace time_literals;
|
using namespace time_literals;
|
||||||
|
|
||||||
namespace land_detector
|
namespace land_detector
|
||||||
|
|||||||
@@ -42,16 +42,11 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <math.h>
|
|
||||||
|
|
||||||
#include <uORB/topics/actuator_controls.h>
|
#include <uORB/topics/actuator_controls.h>
|
||||||
#include <uORB/topics/battery_status.h>
|
#include <uORB/topics/battery_status.h>
|
||||||
#include <uORB/topics/parameter_update.h>
|
|
||||||
#include <uORB/topics/vehicle_acceleration.h>
|
|
||||||
#include <uORB/topics/vehicle_angular_velocity.h>
|
#include <uORB/topics/vehicle_angular_velocity.h>
|
||||||
#include <uORB/topics/vehicle_attitude.h>
|
#include <uORB/topics/vehicle_attitude.h>
|
||||||
#include <uORB/topics/vehicle_control_mode.h>
|
#include <uORB/topics/vehicle_control_mode.h>
|
||||||
#include <uORB/topics/vehicle_local_position.h>
|
|
||||||
#include <uORB/topics/vehicle_local_position_setpoint.h>
|
#include <uORB/topics/vehicle_local_position_setpoint.h>
|
||||||
|
|
||||||
#include "LandDetector.h"
|
#include "LandDetector.h"
|
||||||
|
|||||||
@@ -41,7 +41,6 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <uORB/Subscription.hpp>
|
|
||||||
#include <uORB/topics/airspeed.h>
|
#include <uORB/topics/airspeed.h>
|
||||||
#include <uORB/topics/vehicle_status.h>
|
#include <uORB/topics/vehicle_status.h>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user