mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-05-29 03:36:07 +08:00
land detector VTOL inherit MC maybe_landed (#7738)
* maybe_landed state for VTOL inherited from MC * set correct land detector for SITL
This commit is contained in:
committed by
Daniel Agar
parent
102003c664
commit
c81dd46b02
@@ -70,7 +70,7 @@ measairspeedsim start
|
|||||||
pwm_out_sim mode_pwm
|
pwm_out_sim mode_pwm
|
||||||
sensors start
|
sensors start
|
||||||
commander start
|
commander start
|
||||||
land_detector start multicopter
|
land_detector start vtol
|
||||||
navigator start
|
navigator start
|
||||||
ekf2 start
|
ekf2 start
|
||||||
vtol_att_control start
|
vtol_att_control start
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ measairspeedsim start
|
|||||||
pwm_out_sim mode_pwm
|
pwm_out_sim mode_pwm
|
||||||
sensors start
|
sensors start
|
||||||
commander start
|
commander start
|
||||||
land_detector start multicopter
|
land_detector start vtol
|
||||||
navigator start
|
navigator start
|
||||||
ekf2 start
|
ekf2 start
|
||||||
vtol_att_control start
|
vtol_att_control start
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ measairspeedsim start
|
|||||||
pwm_out_sim mode_pwm
|
pwm_out_sim mode_pwm
|
||||||
sensors start
|
sensors start
|
||||||
commander start
|
commander start
|
||||||
land_detector start multicopter
|
land_detector start vtol
|
||||||
navigator start
|
navigator start
|
||||||
attitude_estimator_q start
|
attitude_estimator_q start
|
||||||
local_position_estimator start
|
local_position_estimator start
|
||||||
|
|||||||
@@ -71,18 +71,6 @@ void VtolLandDetector::_update_topics()
|
|||||||
_orb_update(ORB_ID(airspeed), _airspeedSub, &_airspeed);
|
_orb_update(ORB_ID(airspeed), _airspeedSub, &_airspeed);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool VtolLandDetector::_get_ground_contact_state()
|
|
||||||
{
|
|
||||||
return MulticopterLandDetector::_get_ground_contact_state();
|
|
||||||
}
|
|
||||||
|
|
||||||
bool VtolLandDetector::_get_maybe_landed_state()
|
|
||||||
{
|
|
||||||
|
|
||||||
// TODO
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool VtolLandDetector::_get_landed_state()
|
bool VtolLandDetector::_get_landed_state()
|
||||||
{
|
{
|
||||||
// this is returned from the mutlicopter land detector
|
// this is returned from the mutlicopter land detector
|
||||||
@@ -108,11 +96,6 @@ bool VtolLandDetector::_get_landed_state()
|
|||||||
return landed;
|
return landed;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool VtolLandDetector::_get_freefall_state()
|
|
||||||
{
|
|
||||||
return MulticopterLandDetector::_get_freefall_state();
|
|
||||||
}
|
|
||||||
|
|
||||||
void VtolLandDetector::_update_params()
|
void VtolLandDetector::_update_params()
|
||||||
{
|
{
|
||||||
MulticopterLandDetector::_update_params();
|
MulticopterLandDetector::_update_params();
|
||||||
|
|||||||
@@ -54,19 +54,11 @@ public:
|
|||||||
VtolLandDetector();
|
VtolLandDetector();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void _initialize_topics() override;
|
void _initialize_topics() override;
|
||||||
|
void _update_params() override;
|
||||||
|
void _update_topics() override;
|
||||||
|
bool _get_landed_state() override;
|
||||||
|
|
||||||
virtual void _update_params() override;
|
|
||||||
|
|
||||||
virtual void _update_topics() override;
|
|
||||||
|
|
||||||
virtual bool _get_landed_state() override;
|
|
||||||
|
|
||||||
virtual bool _get_maybe_landed_state() override;
|
|
||||||
|
|
||||||
virtual bool _get_ground_contact_state() override;
|
|
||||||
|
|
||||||
virtual bool _get_freefall_state() override;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
struct {
|
struct {
|
||||||
|
|||||||
Reference in New Issue
Block a user