fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,246 Commits 852 Branches 161 Tags
Commit Graph

88 Commits

Author SHA1 Message Date
Lorenz Meier
a118e8dbdd Make commander error message more verbose 2014-07-11 15:17:21 +02:00
Lorenz Meier
79c5d434bd Commander: More hotfixes to prearm check routine 2014-07-11 15:10:11 +02:00
Lorenz Meier
b97c867420 Add a check command and fix error reporting 2014-07-11 14:51:13 +02:00
Lorenz Meier
4c13c67504 Hotfix: Close fd before reusing it again 2014-07-11 14:02:22 +02:00
Julian Oes
407eafbdbb Merge branch 'master' into offboard2_merge 
Conflicts:
	src/modules/navigator/navigator.h
	src/modules/navigator/navigator_main.cpp
 2014-07-07 15:11:12 +02:00
Anton Babushkin
06f08ad04d commander: require home position for MISSION, fallback to LOITER 2014-07-06 21:37:26 +02:00
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
fb98251e4d Warning fixes in commander 2014-07-01 09:52:36 +02:00
Lorenz Meier
9dbc83cce1 Merged master into prearm_checks 2014-06-30 16:24:48 +02:00
Lorenz Meier
799f568ab4 commander: Minor checks / improvements to power enforce patch 2014-06-30 14:33:56 +02:00
Lorenz Meier
154f14e747 Merged master into power_enforce 2014-06-30 00:50:38 +02:00
Julian Oes
5330ffe458 commander: detect if offboard control is lost and missing offboard states 2014-06-27 12:53:07 +02:00
Lorenz Meier
b20d0c0f01 commander: Remove prearm test print statements 2014-06-26 12:36:43 +02:00
Lorenz Meier
a1132580c5 commander: Add pre-arm check for main sensors. 2014-06-26 12:11:39 +02:00
Lorenz Meier
571e139c24 commander: Formatting and logic flow cleanup, no functional change 2014-06-24 21:33:03 +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
064329dd09 commander: put circuit breaker into effect 2014-05-25 20:34:32 +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
Lorenz Meier
5f752cdb7c commander: Better audio indications on arming reject reasons 2014-05-23 13:41:48 +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
349809f535 sensors, commander: code style fixed 2014-05-11 13:36:51 +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
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
d2553bfd29 Merge branch 'master' into offboard2 2014-03-30 00:25:26 +04:00
Don Gagne
b9a56fbeb9 Fixed bug with transition from in air restore to armed 
Also added better debug output for invalid transitions
 2014-03-27 13:05:51 -07: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
Don Gagne
4b980b508c arming_state_transition now outputs error messages 
If mavlink fd is passed in method will output reason for arming failure
to mavlink.
 2014-03-16 21:39:06 -07:00
Lorenz Meier
2fe9f65c45 commander: Fixed compile error and some stupidity in usage of path names 2014-03-16 19:16:18 +01:00
Lorenz Meier
6db2191a71 commander: Skip devices we do not want to touch in HIL 2014-03-16 18:50:20 +01:00
Lorenz Meier
c52969639f Merged upstream mavlink2_hil branch 2014-03-16 18:42:07 +01:00
Lorenz Meier
8383603f76 commander: Linting: Reduce scope of variable 2014-03-16 18:41:03 +01:00
Lorenz Meier
772fce9f82 commander: Improve HIL publication blocking call handling 2014-03-16 18:38:55 +01:00
Anton Babushkin
8818425e58 commander: fixed message formatting when disabling sensors publishing in HIL mode 2014-03-16 18:25:09 +04:00
Anton Babushkin
b165e6ba20 Merge branch 'master' into acro2 2014-03-08 22:19:18 +04:00
Anton Babushkin
66f00d056f Merge branch 'beta' into offboard2 2014-02-14 13:41:03 +01:00
Lorenz Meier
1b978293d9 Merged master into beta 2014-02-11 08:24:18 +01:00
Anton Babushkin
7861d5e0e5 Merge branch 'beta' into offboard2 2014-02-05 08:15:32 +01:00