Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpoin... | Thomas Gubler | 2014-07-14 | 3 | -55/+189 |
|\ | |||||
| * | Final default values and more comments for params | Lorenz Meier | 2014-07-12 | 1 | -7/+11 |
| * | More obvious error message for mission reject | Lorenz Meier | 2014-07-12 | 1 | -1/+1 |
| * | mavlink, navigator: compile errors/warnings fixed | Anton Babushkin | 2014-07-10 | 1 | -8/+4 |
| * | Merge branch master into dataman_state_nav_rewrite | Anton Babushkin | 2014-07-10 | 7 | -5/+221 |
| |\ | |||||
| * | | dataman: use DM_KEY_WAYPOINTS_OFFBOARD() macro everywhere | Anton Babushkin | 2014-07-10 | 1 | -18/+5 |
| * | | navigator: reject mission if the first waypoint is too far from home | Anton Babushkin | 2014-07-07 | 3 | -3/+89 |
| * | | Merge branch 'dataman_state_nav_rewrite' into follower2 | Anton Babushkin | 2014-07-04 | 2 | -31/+90 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into dataman_state_nav_rewrite | Anton Babushkin | 2014-07-04 | 2 | -2/+4 |
| | |\ \ | |||||
| | * \ \ | Merged master | Lorenz Meier | 2014-06-29 | 12 | -515/+218 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite | Anton Babushkin | 2014-06-21 | 2 | -20/+24 |
| | |\ \ \ \ | |||||
| | * | | | | | 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 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite | Anton Babushkin | 2014-06-12 | 19 | -1569/+2265 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | dataman: rename SYSTEM_STATE section to MISSION_STATE | Anton Babushkin | 2014-06-12 | 1 | -1/+1 |
| | * | | | | | | | mavlink: waypoint manager fixes, mission saving on reboot | Anton Babushkin | 2014-06-09 | 1 | -4/+2 |
| | * | | | | | | | Create system state entry in dataman - ATTN Anton | Jean Cyr | 2014-06-08 | 1 | -0/+9 |
* | | | | | | | | | fix merge errors in offboard.cpp | Thomas Gubler | 2014-07-08 | 1 | -8/+11 |
* | | | | | | | | | Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpoin... | Thomas Gubler | 2014-07-08 | 13 | -329/+362 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Merge pull request #1145 from DonLakeFlyer/MoreWarnings | Lorenz Meier | 2014-07-08 | 2 | -6/+6 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Fix compiler warnings | Don Gagne | 2014-07-07 | 2 | -6/+6 |
| | |/ / / / / / / | |||||
| * | | | | | | | | navigator: adapt offboard class to new NavigatorMode API | Julian Oes | 2014-07-07 | 2 | -24/+19 |
| * | | | | | | | | navigator: forgot to fix conflicts | Julian Oes | 2014-07-07 | 2 | -2/+1 |
| * | | | | | | | | Merge branch 'master' into offboard2_merge | Julian Oes | 2014-07-07 | 12 | -315/+359 |
| |\| | | | | | | | |||||
| | * | | | | | | | navigator: takeoff altitude fixed | Anton Babushkin | 2014-07-04 | 1 | -1/+2 |
| | * | | | | | | | Merge branch 'master' into navigator_rewrite_drton | Anton Babushkin | 2014-07-04 | 2 | -1/+3 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | * | | | | | | | navigator: takeoff on start of mission implemented | Anton Babushkin | 2014-06-30 | 2 | -27/+109 |
| | * | | | | | | | navigator: mission mode fixed | Anton Babushkin | 2014-06-30 | 2 | -57/+27 |
| | * | | | | | | | navigator: more API changes, duplicate code removed | Anton Babushkin | 2014-06-29 | 6 | -119/+95 |
| | * | | | | | | | navigator: API changes, reparing to move manual modes to navigator, WIP | Anton Babushkin | 2014-06-29 | 10 | -86/+87 |
| | * | | | | | | | navigator: whitespace fix | Anton Babushkin | 2014-06-29 | 1 | -1/+1 |
| | * | | | | | | | navigator: NavigatorMode and MissionBlock API cleanup | Anton Babushkin | 2014-06-28 | 11 | -129/+144 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
* | | | | | | | | WIP, change uorb offboard control sp topic | Thomas Gubler | 2014-07-07 | 1 | -14/+16 |
* | | | | | | | | Update offboard control uorb topic | Thomas Gubler | 2014-07-03 | 1 | -27/+40 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'master' into offboard2_merge | Julian Oes | 2014-07-02 | 2 | -2/+4 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Navigator: Warning fixes | Lorenz Meier | 2014-06-30 | 2 | -2/+4 |
| |/ / / / / | |||||
* | | | | | | navigator: remove hacked scale factor for offboard control | Julian Oes | 2014-06-27 | 1 | -1/+1 |
* | | | | | | Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_merge | Julian Oes | 2014-06-27 | 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 in... | Anton Babushkin | 2014-06-27 | 3 | -31/+81 |
| * | | | | | 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 |
| | |_|_|/ | |/| | | | |||||
* | | | | | navigator: added offboard mode | Julian Oes | 2014-06-27 | 5 | -1/+221 |