Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merged master | Lorenz Meier | 2014-06-29 | 12 | -515/+218 |
|\ | |||||
| * | navigator: make MissionBlock subclass of NavigatorMode | Anton Babushkin | 2014-06-27 | 8 | -38/+32 |
| | | |||||
| * | navigator: use common "acceptance radius" parameter for all modes | Anton Babushkin | 2014-06-27 | 7 | -29/+15 |
| | | |||||
| * | navigator: is_mission_item_reached() for LOITER items fixed | Anton Babushkin | 2014-06-27 | 1 | -7/+2 |
| | | |||||
| * | navigator: added NAV_CMD_IDLE, added RTL_STATE_LOITER and RTL_STATE_LANDED ↵ | Anton Babushkin | 2014-06-27 | 3 | -31/+81 |
| | | | | | | | | instead of FINISHED | ||||
| * | navigator: spaces/tabs fixed, old commented code removed | Anton Babushkin | 2014-06-26 | 2 | -358/+36 |
| | | |||||
| * | navigator: minor formatting fix | Anton Babushkin | 2014-06-26 | 1 | -1/+1 |
| | | |||||
| * | navigator: don't reset RTL state on loiter | Anton Babushkin | 2014-06-26 | 1 | -27/+31 |
| | | |||||
| * | navigator: loiter fixes | Anton Babushkin | 2014-06-26 | 7 | -39/+34 |
| | | |||||
| * | navigator: RTL return altitude fixed | Anton Babushkin | 2014-06-25 | 1 | -30/+33 |
| | | |||||
| * | navigator: move set_previous_pos_sp to MissionBlock class | Anton Babushkin | 2014-06-25 | 4 | -17/+15 |
| | | |||||
* | | Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite | Anton Babushkin | 2014-06-21 | 2 | -20/+24 |
|\| | |||||
| * | Merge pull request #1057 from achambers16/navigator_rewrite_modes_list | Julian Oes | 2014-06-19 | 2 | -17/+20 |
| |\ | | | | | | | Navigator rewrite: create list of navigation modes | ||||
| | * | Added some comments | Andrew Chambers | 2014-06-12 | 1 | -0/+4 |
| | | | |||||
| | * | Switched to using c-type arrays | Andrew Chambers | 2014-06-12 | 2 | -10/+10 |
| | | | |||||
| | * | Using a vector to store navigation modes | Andrew Chambers | 2014-06-12 | 2 | -17/+16 |
| | | | |||||
| * | | commander/navigator: renamed FS modes to RTL and RTGS (return to ground station) | Julian Oes | 2014-06-19 | 1 | -2/+1 |
| | | | |||||
| * | | commander: added some failsafe logic | Julian Oes | 2014-06-18 | 1 | -0/+4 |
| | | | |||||
| * | | commander: failsafe_state removed, replaced with bool failsafe, navigation ↵ | Anton Babushkin | 2014-06-16 | 1 | -3/+1 |
| | | | | | | | | | | | | state and failsafe determined directly from main state and conditions | ||||
* | | | mavlink: mission manager moved to separate class and reworked | Anton Babushkin | 2014-06-14 | 2 | -43/+66 |
| | | | |||||
* | | | Move MISSION_STATE read/write from mavlink to navigator and commander | Anton Babushkin | 2014-06-13 | 3 | -7/+38 |
| | | | |||||
* | | | Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite | Anton Babushkin | 2014-06-13 | 9 | -28/+28 |
|\| | | |||||
| * | | navigator: update Loiter navigator mode to use new method names | Anton Babushkin | 2014-06-13 | 2 | -5/+5 |
| |/ | |||||
| * | navigator: rename update and reset calls to on_active and on_inactive | Julian Oes | 2014-06-12 | 7 | -21/+21 |
| | | |||||
| * | navigator: renamed the different RTL states | Julian Oes | 2014-06-12 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite | Anton Babushkin | 2014-06-12 | 19 | -1569/+2265 |
|\| | |||||
| * | navigator: don't give up after DO_JUMPS | Julian Oes | 2014-06-11 | 1 | -20/+23 |
| | | |||||
| * | navigator: always listen to new current mission index and to new missions | Julian Oes | 2014-06-10 | 1 | -0/+14 |
| | | |||||
| * | navigator: added parameter for acceptance radius for take-off mission items | Julian Oes | 2014-06-10 | 4 | -5/+25 |
| | | |||||
| * | navigator: don't say triplet is valid in ALTCTL | Julian Oes | 2014-06-10 | 1 | -0/+8 |
| | | |||||
| * | navigator: don't check reached for land waypoints | Julian Oes | 2014-06-09 | 1 | -0/+4 |
| | | |||||
| * | navigator: don't reset descend WP in RTL | Julian Oes | 2014-06-07 | 1 | -2/+1 |
| | | |||||
| * | navigator: audio messages about what is happening, RTL during mission not ↵ | Julian Oes | 2014-06-06 | 3 | -17/+54 |
| | | | | | | | | triggered but after mission | ||||
| * | navigator: RTL working again | Julian Oes | 2014-06-06 | 5 | -117/+148 |
| | | |||||
| * | navigator: typo | Julian Oes | 2014-06-06 | 1 | -1/+1 |
| | | |||||
| * | navigator: param enhancements | Julian Oes | 2014-06-06 | 7 | -18/+93 |
| | | |||||
| * | navigator: new class structure, loiter and mission working | Julian Oes | 2014-06-06 | 13 | -242/+564 |
| | | |||||
| * | geofence: fixed warnings | Julian Oes | 2014-06-06 | 1 | -4/+5 |
| | | |||||
| * | mission_feasability_checker: fixed warnings | Julian Oes | 2014-06-06 | 1 | -1/+2 |
| | | |||||
| * | navigator: mission and loiter working now | Julian Oes | 2014-06-06 | 7 | -47/+202 |
| | | |||||
| * | navigator: parameter cleanup | Julian Oes | 2014-06-04 | 8 | -167/+39 |
| | | |||||
| * | navigator: use different param names for mission and RTL | Julian Oes | 2014-06-04 | 5 | -8/+8 |
| | | |||||
| * | navigator: missions work again, loiter when finished or no mission available ↵ | Julian Oes | 2014-06-04 | 6 | -38/+191 |
| | | | | | | | | or sd card removed works as well | ||||
| * | navigator: compile fix | Julian Oes | 2014-06-03 | 2 | -2/+3 |
| | | |||||
| * | navigator: bugfixing (WIP: mission topic not copying) | Julian Oes | 2014-06-03 | 5 | -20/+34 |
| | | |||||
| * | Merge remote-tracking branch 'px4/master' into navigator_rewrite | Julian Oes | 2014-06-03 | 3 | -31/+62 |
| |\ | | | | | | | | | | | | | Conflicts: src/modules/navigator/navigator_main.cpp | ||||
| * | | navigator: mission class added (WIP) | Julian Oes | 2014-06-03 | 7 | -468/+730 |
| | | | |||||
| * | | commander and navigator: lot's of changes, failsafe handling in commander, ↵ | Julian Oes | 2014-05-27 | 1 | -233/+7 |
| | | | | | | | | | | | | navigator only for execution (WIP) | ||||
| * | | Merge branch 'master' into navigator_rewrite | Julian Oes | 2014-05-26 | 9 | -23/+29 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/drivers/gps/gps.cpp src/drivers/gps/mtk.cpp src/modules/commander/commander.cpp src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp src/modules/navigator/mission.cpp src/modules/navigator/mission.h src/modules/navigator/navigator_main.cpp src/modules/navigator/navigator_state.h src/modules/position_estimator_inav/position_estimator_inav_main.c | ||||
| * | | | eph and epv renaming, make this compile again | Julian Oes | 2014-04-26 | 1 | -10/+11 |
| | | | |