Mirrors_Framework/ardupilot
1
0 Fork 0
mirror of https://github.com/ArduPilot/ardupilot.git synced 2026-11-15 21:05:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

APM_OBC: don't use _saved_wp when zero

Browse Source
This commit is contained in:
Andrew Tridgell committed 2012-08-28 20:18:23 +10:00
1 parent d13d117e61
commit 71500347ec
2 files changed
+9 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libraries/APM_OBC/APM_OBC.cpp
+8 -2
View File
@@ -130,7 +130,10 @@ APM_OBC::check(APM_OBC::control_mode mode,
} else if (gcs_link_ok) {
_state = STATE_AUTO;
gcs_send_text_fmt(PSTR("GCS OK"));
change_command(_saved_wp);
if (_saved_wp != 0) {
change_command(_saved_wp);
_saved_wp = 0;
}
}
break;
@@ -143,7 +146,10 @@ APM_OBC::check(APM_OBC::control_mode mode,
} else if (gps_lock_ok) {
gcs_send_text_fmt(PSTR("GPS OK"));
_state = STATE_AUTO;
change_command(_saved_wp);
if (_saved_wp != 0) {
change_command(_saved_wp);
_saved_wp = 0;
}
}
break;
}
libraries/APM_OBC/APM_OBC.h
+1
View File
@@ -43,6 +43,7 @@ public:
// auto mission when a failsafe condition is resolved
enum ap_var_type var_type;
_command_index = (AP_Int8 *)AP_Param::find("CMD_INDEX", &var_type);
_saved_wp = 0;
}
void check(enum control_mode control_mode,