fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-17 10:47:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,806 Commits 852 Branches 161 Tags
4e08457afec89e41bb14fb09293c885f988bfd0c
Commit Graph

257 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 62faa2ee51 commander/navigator: renamed FS modes to RTL and RTGS (return to ground station) 2014-06-19 10:26:56 +02:00
Julian Oes e24925c743 commander: added some failsafe logic 2014-06-18 19:01:41 +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
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
Thomas Gubler f9946c98a8 mtecs: filter airspeed 2014-06-11 21:03:27 +02:00
Julian Oes 078eed41af Merge remote-tracking branch 'px4/mtecs' into navigator_rewrite 2014-06-06 23:16:39 +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
Anton Babushkin 950571eaf6 Merge branch 'master' into offboard2 2014-05-21 10:40:58 +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
Anton Babushkin 8c4b35cc23 Merge branch 'master' into offboard2 2014-05-16 12:12:43 +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
Anton Babushkin 88b18bbad1 ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL 2014-05-11 13:35:05 +02:00
Anton Babushkin 808badb34d Use "POSCTL" switch name consistently 2014-05-11 12:54:15 +02:00
TickTock- 31089a290b Replaces poshold/althold with posctrl/altctrl 2014-04-28 21:47:45 -07:00
TickTock- 269800b48c renamed EASY to POSHOLD and SEATBELT to ALTHOLD 2014-04-27 14:06:00 -07:00
TickTock- 6a7b104c2b compiles 2014-04-27 13:12:28 -07:00
TickTock- 07c35010aa Merged in upstream master 2014-04-27 12:43:13 -07:00
Lorenz Meier c74248c8b1 Merged mpc_rc with master 2014-04-27 15:45:33 +02:00
Julian Oes e882824ee1 eph and epv renaming, make this compile again 2014-04-26 23:31:15 +02:00
Julian Oes e8531e8360 Merge remote-tracking branch 'px4/ekf_home_init' into navigator_cleanup_ekf_home_init 
Conflicts:
	src/modules/commander/commander.cpp
	src/modules/mc_pos_control/mc_pos_control_main.cpp
	src/modules/navigator/navigator_main.cpp
	src/modules/uORB/topics/vehicle_global_position.h
 2014-04-26 23:08:11 +02:00
Lorenz Meier 13dfe0447c Send current local position estimate as well 2014-04-26 16:07:29 +02:00
Lorenz Meier 22d3bcdab6 Merged mpc_rc into ekf_params 2014-04-26 15:13:03 +02:00
Julian Oes 3a12cb4648 Merge remote-tracking branch 'px4/master' into navigator_cleanup 2014-04-26 12:56:18 +02:00
Lorenz Meier 4a949a9565 Merge pull request #749 from DonLakeFlyer/ArmDisarm 
Arm/Disarm duplication removal and support for Disarm in VEHICLE_CMD_COMPONENT_ARM_DISARM
 2014-04-26 12:24:42 +02:00
TickTock- 31b5d0f5c8 Merge branch 'mpc_rc' of https://github.com/TickTock-/Firmware into rc_merged 2014-04-25 20:30:01 -07:00
Anton Babushkin 22aaae197b Merge branch 'rc_timeout' into mpc_rc 2014-04-24 22:40:46 +02:00
Anton Babushkin 63c50676f9 MISSION switch renamed to LOITER 2014-04-24 22:38:19 +02:00
TickTock- 7e621070ca renamed mission_switch to loiter_switch and assisted_switch to easy_switch 2014-04-22 18:23:27 -07:00