diff options
| author | Julian Oes <julian@oes.ch> | 2014-02-24 15:17:13 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2014-02-24 15:17:13 +0100 |
| commit | 926c4701c71fb2689025decbc454d14c6df85e76 (patch) | |
| tree | f5b00f98fbc2c91cedee93ebdbb2ffa5a541a6a6 /src/modules/navigator | |
| parent | 9c5894239facb3d8e160147a6a1a3c195ec76bfb (diff) | |
| download | px4-firmware-926c4701c71fb2689025decbc454d14c6df85e76.tar.gz px4-firmware-926c4701c71fb2689025decbc454d14c6df85e76.tar.bz2 px4-firmware-926c4701c71fb2689025decbc454d14c6df85e76.zip | |
mavlink: set current WP working as expected, report current WP with 0.5 Hz
Diffstat (limited to 'src/modules/navigator')
| -rw-r--r-- | src/modules/navigator/navigator_main.cpp | 2 | ||||
| -rw-r--r-- | src/modules/navigator/navigator_mission.cpp | 8 | ||||
| -rw-r--r-- | src/modules/navigator/navigator_mission.h | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/modules/navigator/navigator_main.cpp b/src/modules/navigator/navigator_main.cpp index 5559d7b56..4d135a0ef 100644 --- a/src/modules/navigator/navigator_main.cpp +++ b/src/modules/navigator/navigator_main.cpp @@ -1105,7 +1105,7 @@ Navigator::set_mission_item() if (ret == OK) { - _mission.report_current_mission_item(); + _mission.report_current_offboard_mission_item(); /* reset time counter for new item */ _time_first_inside_orbit = 0; diff --git a/src/modules/navigator/navigator_mission.cpp b/src/modules/navigator/navigator_mission.cpp index fdc4ffff6..72dddebfe 100644 --- a/src/modules/navigator/navigator_mission.cpp +++ b/src/modules/navigator/navigator_mission.cpp @@ -89,7 +89,7 @@ Mission::set_current_offboard_mission_index(int new_index) _current_offboard_mission_index = 0; } } - report_current_mission_item(); + report_current_offboard_mission_item(); } void @@ -296,11 +296,9 @@ Mission::report_mission_item_reached() } void -Mission::report_current_mission_item() +Mission::report_current_offboard_mission_item() { - if (_current_mission_type == MISSION_TYPE_OFFBOARD) { - _mission_result.index_current_mission = _current_offboard_mission_index; - } + _mission_result.index_current_mission = _current_offboard_mission_index; } void diff --git a/src/modules/navigator/navigator_mission.h b/src/modules/navigator/navigator_mission.h index 845c16583..2bd4da82e 100644 --- a/src/modules/navigator/navigator_mission.h +++ b/src/modules/navigator/navigator_mission.h @@ -73,7 +73,7 @@ public: void move_to_next(); void report_mission_item_reached(); - void report_current_mission_item(); + void report_current_offboard_mission_item(); void publish_mission_result(); private: |