Thomas Gubler 0d7ae9276e Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages ...

Conflicts:
	src/modules/navigator/offboard.cpp

2014-07-08 11:06:47 +02:00

..

geofence_params.c

navigator: comment only changes / code style fixes

2014-05-15 07:22:36 +02:00

geofence.cpp

geofence: fixed warnings

2014-06-06 17:17:06 +02:00

geofence.h

navigator: comment only changes / code style fixes

2014-05-15 07:22:36 +02:00

loiter.cpp

navigator: API changes, reparing to move manual modes to navigator, WIP

2014-06-29 14:09:22 +02:00

loiter.h

navigator: API changes, reparing to move manual modes to navigator, WIP

2014-06-29 14:09:22 +02:00

mission_block.cpp

Fix compiler warnings

2014-07-07 15:11:46 -07:00

mission_block.h

navigator: more API changes, duplicate code removed

2014-06-29 15:35:34 +02:00

mission_feasibility_checker.cpp

mission_feasability_checker: fixed warnings

2014-06-06 17:16:49 +02:00

mission_feasibility_checker.h

Merge pull request #694 from thomasgubler/beta_homealtitudewarning

2014-05-28 16:05:56 +02:00

mission_params.c

navigator: param enhancements

2014-06-06 18:13:45 +02:00

mission.cpp

Fix compiler warnings

2014-07-07 15:11:46 -07:00

mission.h

navigator: takeoff on start of mission implemented

2014-06-30 12:02:29 +02:00

module.mk

navigator: added offboard mode

2014-06-27 12:54:29 +02:00

navigator_main.cpp

navigator: forgot to fix conflicts

2014-07-07 15:13:27 +02:00

navigator_mode.cpp

navigator: API changes, reparing to move manual modes to navigator, WIP

2014-06-29 14:09:22 +02:00

navigator_mode.h

navigator: API changes, reparing to move manual modes to navigator, WIP

2014-06-29 14:09:22 +02:00

navigator_params.c

navigator: use common "acceptance radius" parameter for all modes

2014-06-27 11:09:49 +02:00

navigator.h

navigator: forgot to fix conflicts

2014-07-07 15:13:27 +02:00

offboard.cpp

navigator: adapt offboard class to new NavigatorMode API

2014-07-07 18:18:13 +02:00

offboard.h

navigator: adapt offboard class to new NavigatorMode API

2014-07-07 18:18:13 +02:00

rtl_params.c

navigator: use common "acceptance radius" parameter for all modes

2014-06-27 11:09:49 +02:00

rtl.cpp

Merge branch 'master' into navigator_rewrite_drton

2014-07-04 15:28:02 +02:00

rtl.h

navigator: more API changes, duplicate code removed

2014-06-29 15:35:34 +02:00