fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-15 05:20:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,945 Commits 852 Branches 161 Tags
e8c34fa174c6a47d5d2def2417c58beb846bb30f
Commit Graph

268 Commits

Author SHA1 Message Date
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
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 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 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 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
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
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
Thomas Gubler 719779a07b Merge remote-tracking branch 'upstream/navigator_rewrite' into navigator_rewrite_estimator 2014-06-13 23:38:02 +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 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
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
Lorenz Meier 7a6d33ba47 Extend estimator status 2014-06-04 09:51:14 +02:00
Julian Oes 34731a4f4e Merge branch 'mtecs' into navigator_rewrite 2014-06-03 16:29:32 +02:00
Julian Oes d1d03c34b9 Merge remote-tracking branch 'px4/master' into navigator_rewrite 
Conflicts:
	src/modules/navigator/navigator_main.cpp
 2014-06-03 16:04:39 +02:00
Julian Oes 854bb7fe08 navigator: mission class added (WIP) 2014-06-03 16:01:28 +02:00
Lorenz Meier bc24691de2 Merge branch 'mtecs' into mtecs_wind_estimate 2014-06-01 15:37:27 +02:00
Lorenz Meier fecbebc5a6 Merge branch 'master' of github.com:PX4/Firmware into mtecs 2014-06-01 15:37:14 +02:00
Lorenz Meier ad811304c8 actuator_armed: Fixed comments and doxygen, no C-level changes 2014-06-01 15:36:26 +02:00
Lorenz Meier ff4aec6588 wind estimate: added uORB topic 2014-06-01 15:34:27 +02:00
Thomas Gubler 33356ed503 mtecs publish state 2014-05-30 19:36:06 +02:00
Julian Oes ed6c2a5168 commander and navigator: lot's of changes, failsafe handling in commander, navigator only for execution (WIP) 2014-05-27 21:56:32 +02:00
Julian Oes 063caba36b Merge branch 'master' into navigator_rewrite 
Conflicts:
	src/drivers/gps/gps.cpp
	src/drivers/gps/mtk.cpp
	src/modules/commander/commander.cpp
	src/modules/ekf_att_pos_estimator/ekf_att_pos_estimator_main.cpp
	src/modules/navigator/mission.cpp
	src/modules/navigator/mission.h
	src/modules/navigator/navigator_main.cpp
	src/modules/navigator/navigator_state.h
	src/modules/position_estimator_inav/position_estimator_inav_main.c
 2014-05-26 20:19:11 +02:00
Thomas Gubler 56ac13aafb introduce tecs status uorb message 2014-05-24 18:04:38 +02:00
Lorenz Meier 4f26a8b7c8 gps topic: Added snr and jamming fields 2014-05-23 15:02:51 +02:00
Lorenz Meier 7255aafcb5 Better docs in GPS topic 2014-05-23 13:00:22 +02:00
Lorenz Meier 639d86eab2 Merge pull request #979 from PX4/acro2 
ACRO mode
 2014-05-20 08:36:49 -07:00
Anton Babushkin b12928548c Merge branch 'master' into acro2 2014-05-20 00:03:00 +02:00
Anton Babushkin 692e8f84a9 commander: don't require good EPH for local_position_valid, position_estimator_inav: estimate EPH/EPV and publish it in local position topic 2014-05-16 22:12:07 +02:00
Thomas Gubler 15699549a2 manual control setpoint: add comment about sign 2014-05-12 13:35:11 +02:00
Thomas Gubler 7c75f61863 Merge remote-tracking branch 'upstream/master' into manualcontrolrename 
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/uORB/topics/manual_control_setpoint.h
 2014-05-12 09:39:52 +02:00
Thomas Gubler d9333a1993 manual control setpoint: rename variables 2014-05-12 09:20:40 +02:00
Anton Babushkin c131e4cada manual_control_setpoint: comments fixed 2014-05-11 23:46:12 +02:00