Commit Graph
333 Commits
Author SHA1 Message Date
Thomas Gubler c6de36d683 Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages 2014-10-05 13:17:37 +02:00
Thomas Gubler 7f9a231b40 Merge remote-tracking branch 'upstream/master' into offboard2_externalsetpointmessages
Conflicts:
	src/modules/navigator/navigator.h
	src/modules/navigator/navigator_main.cpp
2014-10-05 13:17:32 +02:00
Lorenz Meier 850c630e11 Navigator: Optimize for space 2014-10-05 13:09:19 +02:00
Lorenz Meier 2587074a07 Compile fixes in navigator 2014-10-05 13:07:56 +02:00
Lorenz Meier 2722921b30 Fixed function name of mission modification logic, attributed @DrTon 2014-10-05 12:30:29 +02:00
Thomas Gubler 3cebfd4045 Merge remote-tracking branch 'upstream/master' into takeoff_fix
Conflicts:
	src/modules/navigator/mission.cpp
2014-10-05 10:55:12 +02:00
Thomas Gubler 70606d400b remove wrong comments 2014-09-30 11:11:30 +02:00
Anton Babushkin 70e5d4027a navigator: autocontinue fix 2014-09-30 09:08:31 +04:00
Thomas Gubler 964fddb387 make geofence update rate independent from positon update rate 2014-09-28 16:08:25 +02:00
Thomas Gubler 3efffb68e7 Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/navigator/geofence.cpp
	src/modules/navigator/mission.cpp
2014-09-28 12:36:26 +02:00
Anton Babushkin 1cc5f3778d Merge branch 'master' into takeoff_fix 2014-09-28 13:41:21 +04:00
Anton Babushkin cf4604f5c3 navigator/mission.cpp: indentation fixed 2014-09-28 13:34:44 +04:00
Thomas Gubler ec09f08008 mf checker: fix landing check, ensure feedback from all checks is sent 2014-09-22 17:21:33 +02:00
Thomas Gubler 5a0e0d0412 navigator: fix status information, remove fence_valid flag (this is handled by the geofence class) 2014-09-22 10:55:02 +02:00
Thomas Gubler c7966d56f5 geofence: better usefeedback if loaded 2014-09-22 10:54:51 +02:00
Thomas Gubler a8239b2c45 if V_RCL_LT < 0 go directly to termination 2014-09-22 10:54:00 +02:00
Thomas Gubler e3cac1999a navigator: geofence with global pos: reduce update rate 2014-09-21 18:07:21 +02:00
Thomas Gubler ec39427d79 geofence: lat/lon is double
This is the same change as 5832948371 but
against the master branch.

Some time ago the type of lat and lon in the global_pos uorb topic was
changed but this use here was missed.
2014-09-19 09:51:56 +02:00
Lorenz Meier 5bf83caeff Merge pull request #1349 from PX4/fohaltitude
FOH mode for altitude (optional, enable with parameter)
2014-09-06 14:57:34 +02:00
Thomas Gubler 81837dcdde update comment 2014-09-05 10:18:25 +02:00
Thomas Gubler 4c7d670793 loiter mission items: better reached check for FW 2014-09-05 10:15:31 +02:00
Thomas Gubler 67422c9896 foh alt mode: never sink below previous wp alt 2014-09-04 11:41:13 +02:00
Thomas Gubler 9cf5e6f7b2 whitespace 2014-09-03 22:08:03 +02:00
Thomas Gubler 5a35d20b7b FOH mode for altitude
This introduces a parameter for the navigator. When enabled the navigator
publishes a first order old (FOH) type altitude setpoint instead of the
default zero order hold. For takeoff and landing the FOH mode is not
active. The FOH altitude is calculated such that the sp reaches the
altitude of the waypoint when the system is at a horizontal distance
equal to the acceptance radius. Also the altitude setpoint will only
converge towards the waypoint altitude but never diverge.
2014-09-03 21:30:56 +02:00
Thomas Gubler 3d528a2c97 introduce new nav state to allow normal rtl with RC switch 2014-08-26 22:22:59 +02:00
Thomas Gubler 06317046f2 move flight termination and geofence flags from setpoint triplet to mission result 2014-08-24 17:45:15 +02:00
Thomas Gubler a432d0493c correctly initialize stay in failsafe flag 2014-08-24 17:44:36 +02:00
Thomas Gubler bdccd69030 geofence: make some functions private, correctly update params 2014-08-24 15:27:31 +02:00
Thomas Gubler ae7c993936 datalink loss: add param to allow skipping of comms hold wp 2014-08-24 12:40:19 +02:00
Thomas Gubler c037cfe6f2 datalink loss (obc): add termination after loitering at airfield home 2014-08-24 12:29:30 +02:00
Thomas Gubler 81adc52671 geofence: add counter threshold for subsequent detections 2014-08-24 11:30:02 +02:00
Thomas Gubler 8262739b62 geofence: can select gps instead of global position 2014-08-24 11:14:15 +02:00
Thomas Gubler cc12e6051d obc rcloss: set altitude 2014-08-23 13:13:51 +02:00
Thomas Gubler fd3746a233 add OBC RC loss mode to navigator 2014-08-22 23:06:14 +02:00
Thomas Gubler 6ae8800ad0 move and rename params
airfield home is general
2014-08-22 23:05:19 +02:00
Thomas Gubler 752a0a5625 add obc gps failure mode 2014-08-22 00:40:45 +02:00
Thomas Gubler c402ac28ec Merge remote-tracking branch 'upstream/master' into obcfailsafe 2014-08-21 20:04:21 +02:00
Thomas Gubler 3e1de713af navigator: correct mode for land and termination 2014-08-21 09:39:43 +02:00
Thomas Gubler 760a7ff548 gpsfailure: add skeleton class, activate in commander 2014-08-20 07:45:01 +02:00
Thomas Gubler 57a250f946 navigator: remove offboard mode
offboard setpoints are now forwarded directly from mavlink
2014-08-19 09:56:32 +02:00
Thomas Gubler 7f9c996555 engine fail: small state machine fix 2014-08-19 07:30:19 +02:00
Thomas Gubler 5832948371 geofence: lat/lon is double
types changed but the geofence implentation was not updated, this was forgotten in 58792c5ca6
2014-08-17 12:37:14 +02:00
Thomas Gubler b100884220 geofence: support AMSL mode 2014-08-17 12:07:02 +02:00
Anton Babushkin 7b44485104 mission: takeoff and next waypoint related fixes 2014-08-16 18:46:42 +02:00
Thomas Gubler 14189816f7 dlloss: better output 2014-08-16 14:28:39 +02:00
Thomas Gubler 94765f1fe0 datalinkloss: use vstatus from navigator
For some reason the own subscription did not work (the task launch
pattern used for the navigator may be the reason again)
2014-08-16 13:17:26 +02:00
Anton Babushkin ee254be845 navigator: skip takeoff if already above takeoff altitude 2014-08-16 11:16:27 +02:00
Thomas Gubler 2791a70976 remove warnx 2014-08-15 20:57:21 +02:00
Thomas Gubler 5406ba78a8 make navigator mode a child of navigator 2014-08-15 20:53:03 +02:00
Thomas Gubler b71778d7e1 datalinkloss: change default param value 2014-08-15 01:41:48 +02:00