Commit Graph

3490 Commits

Author SHA1 Message Date
Julian Oes 4e08457afe Merge remote-tracking branch 'px4/pr/1058' into navigator_rewrite_offboard
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/commander/state_machine_helper.cpp
	src/modules/mavlink/mavlink_receiver.cpp
	src/modules/mavlink/mavlink_receiver.h
	src/modules/uORB/topics/vehicle_status.h
2014-06-20 18:18:39 +02:00
Julian Oes e0c78e51e3 mavlink: only publish telemetry status from GCS 2014-06-19 14:14:24 +02:00
Julian Oes 5bab3b1bac Merge pull request #1057 from achambers16/navigator_rewrite_modes_list
Navigator rewrite: create list of navigation modes
2014-06-19 10:36:32 +02:00
Julian Oes 62faa2ee51 commander/navigator: renamed FS modes to RTL and RTGS (return to ground station) 2014-06-19 10:26:56 +02:00
Julian Oes 94e004955d mavlink: publish telemtry status without radio status 2014-06-19 09:33:28 +02:00
t0ni0 9d18da4433 Adds NaN checks and setpoint resets for offboard posctl 2014-06-18 16:45:38 -04:00
Julian Oes e24925c743 commander: added some failsafe logic 2014-06-18 19:01:41 +02:00
t0ni0 e078ef992f Removed publications closing
This is an attempt to correct the offboard setpoints being passed on as "NaN" values
2014-06-17 13:30:45 -04:00
Anton Babushkin 55e5f747de commander: modes display fixes, don't activate failsafe while disarmed 2014-06-17 13:19:50 +02:00
t0ni0 6183390547 Commander attitude flag fix 2014-06-16 17:47:10 -04:00
Anton Babushkin e0ed0625f8 commander: failsafe_state removed, replaced with bool failsafe, navigation state and failsafe determined directly from main state and conditions 2014-06-16 17:34:21 +02:00
Anton Babushkin 91f0b9eee4 mavlink: store last heartbeat time in telemetry_status topic 2014-06-16 17:32:58 +02:00
Julian Oes 9772aa5814 mavlink: set current DO_JUMP repetitions to 0 initially 2014-06-15 11:59:45 +02:00
Benjamin O'Connell-Armand 74ae18c245 Fixed rates flags 2014-06-14 18:46:18 -04:00
Benjamin O'Connell-Armand 670d8c91e9 Merge branch 'offboard2' of https://github.com/elikos/Firmware into offboard2 2014-06-14 15:50:24 -04:00
Benjamin O'Connell-Armand 128ec447ad Fix various compilation issue 2014-06-14 15:50:21 -04:00
andre-nguyen 02653f6cd9 Merge branch 'offboard2' of github.com:elikos/Firmware into offboard2 2014-06-14 15:27:26 -04:00
andre-nguyen 6cf890b46b indentation and fix commander flags. It's impossible to control position at the same time as attitude so we have to disable some things. My logic is that all the control flags for position control should be opposite of the attitude control mode. 2014-06-14 15:27:07 -04:00
t0ni0 7d05f2df7c Added support for velocity setpoint in mavlink_receiver and mc_pos_control 2014-06-13 20:38:43 -04:00
Thomas Gubler a702a350ce Merge remote-tracking branch 'upstream/mtecs' into navigator_rewrite 2014-06-13 23:37:16 +02:00
Thomas Gubler 195c4005e1 mtecs: update default params 2014-06-13 23:36:26 +02:00
Anton Babushkin e14d475142 navigator: update Loiter navigator mode to use new method names 2014-06-13 14:31:19 +02:00
Andrew Chambers 51f05612eb Added some comments 2014-06-12 16:33:15 -07:00
Andrew Chambers e53c2ab985 Switched to using c-type arrays 2014-06-12 16:22:04 -07:00
Andrew Chambers 9bb8b12f43 Using a vector to store navigation modes 2014-06-12 15:50:06 -07:00
Julian Oes 3b39a8a789 navigator: rename update and reset calls to on_active and on_inactive 2014-06-12 19:37:25 +02:00
Julian Oes 59ae8cc054 Merge branch 'navigator_rewrite' of github.com:PX4/Firmware into navigator_rewrite 2014-06-12 19:12:44 +02:00
Julian Oes d48a8bc073 navigator: renamed the different RTL states 2014-06-12 19:09:18 +02:00
Thomas Gubler f4898b94c6 Merge remote-tracking branch 'upstream/mtecs' into navigator_rewrite 2014-06-11 23:20:59 +02:00
Julian Oes d9a64bb587 navigator: don't give up after DO_JUMPS 2014-06-11 23:16:22 +02:00
Thomas Gubler f9946c98a8 mtecs: filter airspeed 2014-06-11 21:03:27 +02:00
Thomas Gubler a1bcd5d313 mtecs: small cleanup, move subclass to own file 2014-06-11 20:22:37 +02:00
Thomas Gubler 7fa5458bc6 mtecs: add D gain for speed outer loop 2014-06-11 19:51:33 +02:00
Thomas Gubler e548eeb589 Merge remote-tracking branch 'upstream/master' into mtecs 2014-06-11 19:44:17 +02:00
Julian Oes cfcba921a1 Merge remote-tracking branch 'px4/master' into navigator_rewrite 2014-06-11 13:29:28 +02:00
t0ni0 ca6463efd8 Modified mavlink receiver to scale offboard position and velocity messages to centimeters 2014-06-10 22:33:06 -04:00
Julian Oes 6f24afd68a navigator: always listen to new current mission index and to new missions 2014-06-10 17:33:12 +02:00
Julian Oes fd1f1c81ef navigator: added parameter for acceptance radius for take-off mission items 2014-06-10 17:24:04 +02:00
Julian Oes 064a75a3c2 mavlink: put update call back in 2014-06-10 15:02:20 +02:00
Julian Oes 784041e0ab Merge branch 'master' into navigator_rewrite 2014-06-10 14:31:49 +02:00
Julian Oes d5c0933d65 mavlink: report global position setpoint and do this always no just when updated, otherwise the values are not visible in QGC 2014-06-10 14:29:17 +02:00
Julian Oes fab1b4e366 navigator: don't say triplet is valid in ALTCTL 2014-06-10 14:25:23 +02:00
t0ni0 d9b5efb263 Closed additional file descriptor 2014-06-09 19:09:38 -04:00
Andrew Chambers 128389d3b1 Converted style to work with wiki. Cleaned up bad fields. 2014-06-09 16:01:44 -07:00
Julian Oes d3f182d433 navigator: don't check reached for land waypoints 2014-06-09 11:37:33 +02:00
Julian Oes d8f77a2b39 Merge remote-tracking branch 'px4/master' into navigator_rewrite
Conflicts:
	src/modules/position_estimator_inav/position_estimator_inav_main.c
2014-06-09 07:48:50 +02:00
t0ni0 0a86fd0d9f Changed struct name used for local_pos_sp 2014-06-08 15:22:04 -04:00
Thomas Gubler 85b2dfa0c6 fix initialization of perfcounters in fw att controllers 2014-06-08 12:30:27 +02:00
t0ni0 2a79a9a4e4 Close fds when not needed
File descriptors get closed when not needed by offboard mode
to allow position and attitude controllers to advertise and publish.
2014-06-07 12:31:50 -04:00
Julian Oes 13b6dffb2e navigator: don't reset descend WP in RTL 2014-06-07 17:18:58 +02:00