fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-31 07:21:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,456 Commits 852 Branches 161 Tags
574b7fc854bd331ab3e45bae4f1fb06675e3aae5
Commit Graph
56 Commits
Author SHA1 Message Date
Julian Oes 73d6121a9d Merge branch 'master' into offboard2_merge 
Conflicts:
	src/modules/uORB/topics/rc_channels.h
 2014-07-02 15:15:26 +02:00
Lorenz Meier 154f14e747 Merged master into power_enforce 2014-06-30 00:50:38 +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 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
Julian Oes d48a8bc073 navigator: renamed the different RTL states 2014-06-12 19:09:18 +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
Lorenz Meier 55ad5588a8 system status topic: Add support for circuit breaker 2014-05-25 20:35:16 +02:00
Lorenz Meier c7bf00562d commander: Enforce (in presence of power sensing) that a) system is not purely servo rail powered and b) power rail voltage is higher than 4.5V on the main avionics rail 2014-05-25 08:22:54 +02:00
Anton Babushkin 950571eaf6 Merge branch 'master' into offboard2 2014-05-21 10:40:58 +02:00
Anton Babushkin b12928548c Merge branch 'master' into acro2 2014-05-20 00:03:00 +02:00
Anton Babushkin 8c4b35cc23 Merge branch 'master' into offboard2 2014-05-16 12:12:43 +02:00
Anton Babushkin 88b18bbad1 ALTCTRL/POSCTRL renamed to ALTCTL/POSCTL 2014-05-11 13:35:05 +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
Lorenz Meier c74248c8b1 Merged mpc_rc with master 2014-04-27 15:45:33 +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
Julian Oes c3c0328e8b navigator: lot's of cleanup (WIP) 2014-04-21 17:36:59 +02:00
Anton Babushkin 6f38ed3b4b commander, navigator: use updated manual_control_setpoint 2014-04-03 20:23:34 +04:00
Don Gagne 521539897e Simpler state transition code 
Also fixed ARMING_STATE_ARMED_ERROR->ARMING_STATE_STANDBY_ERROR
transition.
 2014-03-26 14:51:57 -07:00
Lorenz Meier 8016032a40 Merged beta into paul_estimator 2014-02-16 17:07:02 +01:00
Lorenz Meier b1ea8afad5 Merge branch 'master' of github.com:PX4/Firmware into paul_estimator 2014-02-09 18:00:31 +01:00
Anton Babushkin 7861d5e0e5 Merge branch 'beta' into offboard2 2014-02-05 08:15:32 +01:00
Anton Babushkin dfd4dc3e6a Merge branch 'beta' into acro2 2014-02-02 22:45:46 +01:00
Lorenz Meier 020e7dcae3 Merged master into beta 2014-02-01 19:13:13 +01:00
Lorenz Meier c1d1d67534 Improved RC calibration behaviour, fully supported setting trim offsets 2014-02-01 13:22:52 +01:00
Anton Babushkin 7f4f9a5f5f ACRO mode implemented 2014-01-31 22:44:05 +01:00
Anton Babushkin cf6d89301b Merge branch 'beta' into offboard2 2014-01-29 21:27:44 +01:00
Anton Babushkin d1508a7813 vehicle_control_mode publication moved to commander, WIP 2014-01-27 20:49:17 +01:00
Anton Babushkin c7f0553938 cammander: state machine can now deny current state (e.g. when position lock lost during EASY mode), added FAILSAFE_STATE_LAND 2014-01-26 11:50:34 +01:00
Anton Babushkin 92ddf7903b commander: more user-friendly states indication 2014-01-25 23:37:26 +01:00
Anton Babushkin ebc7cb03b7 «flighttermination state» replaced by more general «failsafe state» 2014-01-25 23:24:12 +01:00
Anton Babushkin 1dc9785083 OFFBOARD switch added, WIP 2014-01-22 16:52:35 +01:00
Lorenz Meier bc64391c53 AUTOMATED code-style fix on topics. NO MANUAL OR SEMANTIC EDITS 2014-01-12 12:59:15 +01:00
Anton Babushkin 33385a783c Added NONE = not mapped state for mission and return switches 2013-12-30 14:04:24 +04:00
Anton Babushkin 7e29028429 Moving nav state from commander to navigator, WIP 2013-12-29 12:16:49 +04:00
Thomas Gubler 278e05e425 added simple flight termination state machine which enbales parachute on request 2013-12-08 16:52:41 +01:00
Julian Oes 55cfa5152c Made low/critical warnings consisting 2013-08-29 16:41:59 +02:00
Anton Babushkin 66c61fbe96 Full failsafe rewrite. 2013-08-27 23:08:00 +02:00
Lorenz Meier c57b345e70 merged 2013-08-19 09:44:42 +02:00
Anton Babushkin ffc2a8b7a3 vehicle_local_position topic updated, position_estimator_inav and commander fixes, only altitude estimate required for SETBELT now. 2013-08-18 23:05:26 +02:00
Lorenz Meier e597f97982 Merged master 2013-08-18 12:04:07 +02:00
Lorenz Meier 57f8fe3719 merged master, updated fixed wing 2013-08-16 14:44:00 +02:00
Julian Oes 02c23c785e System status load is now from 0 to 1 instead of non-intuitive 0 to 1000 2013-08-16 10:17:57 +02:00
Lorenz Meier 74d519d9d0 Hotfix: Fixed Doxygen tags for uORB topics 2013-08-15 13:38:59 +02:00
Anton Babushkin 8c1067a017 State machine rewritten, compiles, WIP 2013-07-28 23:12:16 +04:00