diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-06-09 16:10:24 +0200 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-06-09 16:10:24 +0200 |
| commit | cad0877f67c393b698b8fc4f242944c9e1ba1bc5 (patch) | |
| tree | 663c4aa172bd5f2424352a65e4e01534830548ef /src/modules/navigator | |
| parent | 4ad435b483510158ea8a5b303cd680f9e982df84 (diff) | |
| download | px4-firmware-cad0877f67c393b698b8fc4f242944c9e1ba1bc5.tar.gz px4-firmware-cad0877f67c393b698b8fc4f242944c9e1ba1bc5.tar.bz2 px4-firmware-cad0877f67c393b698b8fc4f242944c9e1ba1bc5.zip | |
mavlink: waypoint manager fixes, mission saving on reboot
Diffstat (limited to 'src/modules/navigator')
| -rw-r--r-- | src/modules/navigator/navigator_main.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp index 04ea7da0e..a3426e65e 100644 --- a/src/modules/navigator/navigator_main.cpp +++ b/src/modules/navigator/navigator_main.cpp @@ -603,14 +603,12 @@ Navigator::task_main() warnx("Could not clear geofence"); } -#if 0 // *** UNTESTED... Anton, this is for you /* Get the last offboard mission id */ persistent_system_state_t sys_state; if (dm_read(DM_KEY_SYSTEM_STATE, 0, &sys_state, sizeof(sys_state)) == sizeof(sys_state)) { - if ((sys_state.current_offboard_waypoint_id >= 0) && (sys_state.current_offboard_waypoint_id <= 1)) - _mission.set_offboard_dataman_id(sys_state.current_offboard_waypoint_id); + if ((sys_state.offboard_waypoint_id >= 0) && (sys_state.offboard_waypoint_id <= 1)) + _mission.set_offboard_dataman_id(sys_state.offboard_waypoint_id); } -#endif /* * do subscriptions |