Skip to content
Snippets Groups Projects
Commit 60a6fed3 authored by Andrew Tridgell's avatar Andrew Tridgell
Browse files

APM_OBC: don't use _saved_wp when zero

parent fc942b2f
No related branches found
No related tags found
No related merge requests found
...@@ -130,7 +130,10 @@ APM_OBC::check(APM_OBC::control_mode mode, ...@@ -130,7 +130,10 @@ APM_OBC::check(APM_OBC::control_mode mode,
} else if (gcs_link_ok) { } else if (gcs_link_ok) {
_state = STATE_AUTO; _state = STATE_AUTO;
gcs_send_text_fmt(PSTR("GCS OK")); gcs_send_text_fmt(PSTR("GCS OK"));
change_command(_saved_wp); if (_saved_wp != 0) {
change_command(_saved_wp);
_saved_wp = 0;
}
} }
break; break;
...@@ -143,7 +146,10 @@ APM_OBC::check(APM_OBC::control_mode mode, ...@@ -143,7 +146,10 @@ APM_OBC::check(APM_OBC::control_mode mode,
} else if (gps_lock_ok) { } else if (gps_lock_ok) {
gcs_send_text_fmt(PSTR("GPS OK")); gcs_send_text_fmt(PSTR("GPS OK"));
_state = STATE_AUTO; _state = STATE_AUTO;
change_command(_saved_wp); if (_saved_wp != 0) {
change_command(_saved_wp);
_saved_wp = 0;
}
} }
break; break;
} }
......
...@@ -43,6 +43,7 @@ public: ...@@ -43,6 +43,7 @@ public:
// auto mission when a failsafe condition is resolved // auto mission when a failsafe condition is resolved
enum ap_var_type var_type; enum ap_var_type var_type;
_command_index = (AP_Int8 *)AP_Param::find("CMD_INDEX", &var_type); _command_index = (AP_Int8 *)AP_Param::find("CMD_INDEX", &var_type);
_saved_wp = 0;
} }
void check(enum control_mode control_mode, void check(enum control_mode control_mode,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment