fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-03 08:30:34 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,843 Commits 852 Branches 161 Tags
e8e81650dcd2c5aed749a8564d6403151eb209e9
Commit Graph

651 Commits

Author SHA1 Message Date
Lorenz Meier 45016b0df0 Merge pull request #984 from PX4/rc_channels 
rc_channels cleanup
 2014-06-30 17:11:14 +02:00
Anton Babushkin 1a6b2b9c1e Merge branch 'master' into dataman_state_nav_rewrite 2014-06-30 12:31:06 +02:00
Thomas Gubler e8c34fa174 force setpoint uorb topic: add yaw field 2014-06-30 10:25:57 +02:00
Thomas Gubler ffb0ebf13c Merge remote-tracking branch 'upstream/master' into forcesetpoint 
Conflicts:
	src/modules/uORB/objects_common.cpp
 2014-06-30 09:53:07 +02:00
Kynos 503ebddc1b Merged upstream master into gnss_rework branch 2014-06-30 01:34:12 +02:00
Lorenz Meier 154f14e747 Merged master into power_enforce 2014-06-30 00:50:38 +02:00
Lorenz Meier afb5271bfb Merge branch 'master' of github.com:PX4/Firmware into navigator_rewrite_estimator 2014-06-29 19:27:03 +02:00
Lorenz Meier ecee13861c Merged master 2014-06-29 19:12:35 +02:00
Lorenz Meier 94c69e11ae Merge pull request #1089 from PX4/navigator_rewrite 
Navigator rewrite
 2014-06-29 19:10:42 +02:00
Thomas Gubler 263a2fa9b2 mtecs: add flightpathangle filter 2014-06-29 14:52:09 +02:00
Thomas Gubler 7b15a424f0 Merge remote-tracking branch 'upstream/master' into mtecs 2014-06-28 16:52:27 +02:00
Julian Oes faebf17514 Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_merge 2014-06-27 14:41:38 +02:00
Julian Oes b8d07532a7 Merge branch 'navigator_rewrite' into navigator_rewrite_estimator 2014-06-27 14:41:19 +02:00
Julian Oes cc8f7f4c97 Merge branch 'master' into navigator_rewrite 
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/commander/state_machine_helper.h
	src/modules/mavlink/mavlink_messages.cpp
 2014-06-27 14:39:36 +02:00
Julian Oes 332f03fa67 Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_merge 2014-06-27 12:55:42 +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 19fad94a34 Merge branch 'navigator_rewrite' into navigator_rewrite_estimator 2014-06-27 11:02:47 +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
Lorenz Meier 0fe8ed509a Merge branch 'master' into power_enforce 2014-06-26 17:28:01 +02:00
Thomas Gubler 52d539d3cd extend integrator reset flags in uorb attitude setpoint topic to all axes 2014-06-24 17:39:48 +02:00
Thomas Gubler 3ddb502d2e force setpoint: fix comment 2014-06-24 14:14:13 +02:00
Thomas Gubler 88adeee669 define force setpoint uorb topic 2014-06-23 13:35:14 +02:00
Anton Babushkin 164f19176e Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite 2014-06-21 14:26:40 +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 c23bc93681 Merge branch 'navigator_rewrite' into navigator_rewrite_estimator 2014-06-19 10:30:44 +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 eb1af6096e Merge branch 'navigator_rewrite' into navigator_rewrite_estimator 2014-06-19 09:28:23 +02:00
Julian Oes e24925c743 commander: added some failsafe logic 2014-06-18 19:01:41 +02:00
Julian Oes efd05d701a Merge branch 'navigator_rewrite' into navigator_rewrite_estimator 2014-06-18 14:14:50 +02:00
Anton Babushkin 55e5f747de commander: modes display fixes, don't activate failsafe while disarmed 2014-06-17 13:19:50 +02: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
Kynos 137564b4a6 Merge master with the exception of ubx.cpp and ubx.h 2014-06-15 12:30:06 +02:00
Anton Babushkin 5be741607c mavlink: mission manager moved to separate class and reworked 2014-06-14 23:57:29 +02:00
Thomas Gubler 719779a07b Merge remote-tracking branch 'upstream/navigator_rewrite' into navigator_rewrite_estimator 2014-06-13 23:38:02 +02:00
Anton Babushkin d84cbd008c Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite 2014-06-13 15:11:06 +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
Anton Babushkin 842e7c3df9 Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite 2014-06-12 16:51:37 +02:00
Thomas Gubler 214a8cab49 Merge remote-tracking branch 'upstream/navigator_rewrite' into navigator_rewrite_estimator 2014-06-11 23:23:54 +02:00
Thomas Gubler f4898b94c6 Merge remote-tracking branch 'upstream/mtecs' into navigator_rewrite 2014-06-11 23:20:59 +02:00
Thomas Gubler f9946c98a8 mtecs: filter airspeed 2014-06-11 21:03:27 +02:00
Lorenz Meier 578680135e introduce multi device support on uORB 2014-06-10 15:03:58 +02:00
Anton Babushkin cad0877f67 mavlink: waypoint manager fixes, mission saving on reboot 2014-06-09 16:10:24 +02:00
Kynos 9f754e0e9a U-blox driver rework, step 3 
More sat info isolation
Flush input after changing baudrate to allow driver restart w/o GNSS
module restart
 2014-06-08 14:05:35 +02:00
Julian Oes e70604ea95 Merge remote-tracking branch 'px4/mtecs_estimator' into navigator_rewrite_estimator 
Conflicts:
	src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
 2014-06-07 13:15:44 +02:00
Julian Oes 078eed41af Merge remote-tracking branch 'px4/mtecs' into navigator_rewrite 2014-06-06 23:16:39 +02:00
James Goppert c4ed97f3c1 Added uORB tiny pub/sub for usage without struct on stack. 2014-06-05 10:49:31 -04:00
Lorenz Meier cb246a79ca Added vision position estimate topic 2014-06-05 16:47:16 +02:00