fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-29 16:50:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,829 Commits 852 Branches 161 Tags
332f03fa67729c338ad162cf89935564e9e99653
Commit Graph

7829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julian Oes 332f03fa67 Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_merge 2014-06-27 12:55:42 +02:00
Julian Oes ee872d91b0 mc_pos_control: read velocity setpoints form offboard control and do position offset control 2014-06-27 12:55:27 +02:00
Julian Oes 0b172d662a position_setpoint_triplet: add local position and velocity setpoints 2014-06-27 12:55:11 +02:00
Julian Oes df9381636a offboard_control_setpoint: armed does not make sense there 2014-06-27 12:55:03 +02:00
Julian Oes 4c4d14347e mavlink: only save a offboard_control, don't publish to setpoint topics (let the navigator do this) 2014-06-27 12:54:52 +02:00
Julian Oes a122e88893 commander: hack to get velocity offboard control working 2014-06-27 12:54:39 +02:00
Julian Oes 7992a063c9 navigator: added offboard mode 2014-06-27 12:54:29 +02:00
Julian Oes 98fffe6107 mc_pos_control: added missing subscribe 2014-06-27 12:54:00 +02:00
Julian Oes 993e4d41d8 sensors: missing param for offboard switch 2014-06-27 12:53:52 +02:00
Julian Oes f5699e6490 mavlink: always copy offboard setpoints, not just when control mode changed, also bugfixes in orb calls 2014-06-27 12:53:44 +02:00
Julian Oes c99683752c navigator: added missing offboard state 2014-06-27 12:53:24 +02:00
Julian Oes 5330ffe458 commander: detect if offboard control is lost and missing offboard states 2014-06-27 12:53:07 +02:00
Anton Babushkin affc312411 navigator: make MissionBlock subclass of NavigatorMode 2014-06-27 11:34:19 +02:00
Anton Babushkin 52eb49ba0b navigator: use common "acceptance radius" parameter for all modes 2014-06-27 11:09:49 +02:00
Anton Babushkin 1bae18377a navigator: is_mission_item_reached() for LOITER items fixed 2014-06-27 00:29:00 +02:00
Anton Babushkin 9ae44291b1 navigator: added NAV_CMD_IDLE, added RTL_STATE_LOITER and RTL_STATE_LANDED instead of FINISHED 2014-06-27 00:27:08 +02:00
Anton Babushkin 8e8798a522 navigator: spaces/tabs fixed, old commented code removed 2014-06-26 23:39:17 +02:00
Anton Babushkin 6e5aafb3a7 navigator: minor formatting fix 2014-06-26 13:44:41 +02:00
Anton Babushkin 63e14c73ba navigator: don't reset RTL state on loiter 2014-06-26 12:18:19 +02:00
Anton Babushkin c5a5604ae9 navigator: loiter fixes 2014-06-26 00:17:25 +02:00
Anton Babushkin 39454ca99d navigator: RTL return altitude fixed 2014-06-25 17:56:30 +02:00
Anton Babushkin bdf1b9274c commander: modes fallback and reject messages fixed 2014-06-25 17:56:11 +02:00
Anton Babushkin 9d3d5a30af navigator: move set_previous_pos_sp to MissionBlock class 2014-06-25 17:31:12 +02:00
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