fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-18 12:07:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'seatbelt_multirotor_new' of github.com:PX4/Firmware into fmuv2_bringup_new_state_machine_drton

Browse Source
This commit is contained in:
Lorenz Meier
2013-08-20 16:24:29 +02:00
parent c6c41bfae6 db950f7489
commit ec49c72a8b
8 changed files with 118 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/commander.cpp
+11
View File
@@ -788,6 +788,17 @@ int commander_thread_main(int argc, char *argv[])
/* update condition_local_position_valid and condition_local_altitude_valid */
check_valid(local_position.timestamp, POSITION_TIMEOUT, local_position.xy_valid, &(status.condition_local_position_valid), &status_changed);
check_valid(local_position.timestamp, POSITION_TIMEOUT, local_position.z_valid, &(status.condition_local_altitude_valid), &status_changed);
if (status.condition_local_altitude_valid) {
if (status.condition_landed != local_position.landed) {
status.condition_landed = local_position.landed;
status_changed = true;
if (status.condition_landed) {
mavlink_log_info(mavlink_fd, "[cmd] LANDED");
} else {
mavlink_log_info(mavlink_fd, "[cmd] IN AIR");
}
}
}
/* update battery status */
orb_check(battery_sub, &updated);