fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-22 16:03:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move land detector changes to vtol

Browse Source
This commit is contained in:
sanderux
2017-08-09 08:12:54 +02:00
committed by Lorenz Meier
parent 49d2e8a3ff
commit 6ee24a0c80
4 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/land_detector/MulticopterLandDetector.cpp
-12
View File
@@ -123,7 +123,6 @@ void MulticopterLandDetector::_initialize_topics()
_ctrl_state_sub = orb_subscribe(ORB_ID(control_state));
_vehicle_control_mode_sub = orb_subscribe(ORB_ID(vehicle_control_mode));
_battery_sub = orb_subscribe(ORB_ID(battery_status));
_vehicle_status_sub = orb_subscribe(ORB_ID(vehicle_status));
}
void MulticopterLandDetector::_update_topics()
@@ -137,7 +136,6 @@ void MulticopterLandDetector::_update_topics()
_orb_update(ORB_ID(control_state), _ctrl_state_sub, &_ctrl_state);
_orb_update(ORB_ID(vehicle_control_mode), _vehicle_control_mode_sub, &_control_mode);
_orb_update(ORB_ID(battery_status), _battery_sub, &_battery);
_orb_update(ORB_ID(vehicle_status), _vehicle_status_sub, &_vehicle_status);
}
void MulticopterLandDetector::_update_params()
@@ -194,11 +192,6 @@ bool MulticopterLandDetector::_get_ground_contact_state()
_arming_time = now;
}
// Only trigger in RW mode
if (!_vehicle_status.is_rotary_wing) {
return false;
}
// If in manual flight mode never report landed if the user has more than idle throttle
// Check if user commands throttle and if so, report no ground contact based on
// the user intent to take off (even if the system might physically still have
@@ -249,11 +242,6 @@ bool MulticopterLandDetector::_get_maybe_landed_state()
return true;
}
// Only trigger in RW mode
if (!_vehicle_status.is_rotary_wing) {
return false;
}
// If we control manually and are still landed, we want to stay idle until the pilot rises the throttle for takeoff
if (_state == LandDetectionState::LANDED && _has_manual_control_present()) {
if (_manual.z < _get_takeoff_throttle()) {