fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-20 02:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

commander: set home position on arming

Browse Source
This commit is contained in:
Anton Babushkin
2014-04-02 11:57:41 +04:00
parent fdb17c9776
commit 63cd319ff7
1 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/commander.cpp
+30 -6
View File
@@ -612,6 +612,7 @@ int commander_thread_main(int argc, char *argv[])
commander_initialized = false; commander_initialized = false;
bool arm_tune_played = false; bool arm_tune_played = false;
bool was_armed = false;
/* set parameters */ /* set parameters */
param_t _param_sys_type = param_find("MAV_TYPE"); param_t _param_sys_type = param_find("MAV_TYPE");
@@ -927,17 +928,15 @@ int commander_thread_main(int argc, char *argv[])
static float vdop_threshold_m = 8.0f; static float vdop_threshold_m = 8.0f;
/* update home position */ /* update home position */
if (!status.condition_home_position_valid && updated && if (!status.condition_home_position_valid && status.condition_global_position_valid && !armed.armed &&
(global_position.eph < hdop_threshold_m) && (global_position.epv < vdop_threshold_m) && (global_position.eph < hdop_threshold_m) && (global_position.epv < vdop_threshold_m)) {
(hrt_absolute_time() < global_position.timestamp + POSITION_TIMEOUT) && !armed.armed) {
/* copy position data to uORB home message, store it locally as well */
home.lat = global_position.lat; home.lat = global_position.lat;
home.lon = global_position.lon; home.lon = global_position.lon;
home.alt = global_position.alt; home.alt = global_position.alt;
warnx("home: lat = %.7f, lon = %.7f, alt = %.4f ", home.lat, home.lon, (double)home.alt); warnx("home: lat = %.7f, lon = %.7f, alt = %.2f ", home.lat, home.lon, (double)home.alt);
mavlink_log_info(mavlink_fd, "[cmd] home: %.7f, %.7f, %.4f", home.lat, home.lon, (double)home.alt); mavlink_log_info(mavlink_fd, "[cmd] home: %.7f, %.7f, %.2f", home.lat, home.lon, (double)home.alt);
/* announce new home position */ /* announce new home position */
if (home_pub > 0) { if (home_pub > 0) {
@@ -1284,7 +1283,32 @@ int commander_thread_main(int argc, char *argv[])
if (arming_state_changed) { if (arming_state_changed) {
status_changed = true; status_changed = true;
mavlink_log_info(mavlink_fd, "[cmd] arming state: %s", arming_states_str[status.arming_state]); mavlink_log_info(mavlink_fd, "[cmd] arming state: %s", arming_states_str[status.arming_state]);
/* update home position on arming */
if (armed.armed && !was_armed && status.condition_global_position_valid &&
(global_position.eph < hdop_threshold_m) && (global_position.epv < vdop_threshold_m)) {
// TODO remove code duplication
home.lat = global_position.lat;
home.lon = global_position.lon;
home.alt = global_position.alt;
warnx("home: lat = %.7f, lon = %.7f, alt = %.2f ", home.lat, home.lon, (double)home.alt);
mavlink_log_info(mavlink_fd, "[cmd] home: %.7f, %.7f, %.2f", home.lat, home.lon, (double)home.alt);
/* announce new home position */
if (home_pub > 0) {
orb_publish(ORB_ID(home_position), home_pub, &home);
} else {
home_pub = orb_advertise(ORB_ID(home_position), &home);
}
/* mark home position as set */
status.condition_home_position_valid = true;
}
} }
was_armed = armed.armed;
if (main_state_changed) { if (main_state_changed) {
status_changed = true; status_changed = true;