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,385 Commits 852 Branches 161 Tags
Commit Graph

311 Commits

Author SHA1 Message Date
Lorenz Meier
76f7960d77 Mavlink text feedback: Remove now unneeded audio tag for critical messages, make overall printing more efficient. Remove buffers where no buffers are needed. 2014-07-13 11:43:56 +02:00
Lorenz Meier
3ec9ffa661 Buzzer and led: Fix -Wshadow warnings. 2014-07-13 11:42:02 +02:00
Lorenz Meier
ea11bc6c4b Command handling: Fix up local variable usage and status prints. 2014-07-13 11:41:39 +02:00
Lorenz Meier
48a614c2cb Merge branch 'master' of github.com:PX4/Firmware into dataman_state_nav_rewrite 2014-07-11 16:59:01 +02:00
Lorenz Meier
79c5d434bd Commander: More hotfixes to prearm check routine 2014-07-11 15:10:11 +02:00
Lorenz Meier
a82d4fbb11 Hotfix: fix typo 2014-07-11 14:55:46 +02:00
Lorenz Meier
b97c867420 Add a check command and fix error reporting 2014-07-11 14:51:13 +02:00
Anton Babushkin
fc1669b096 Merge branch master into dataman_state_nav_rewrite 2014-07-10 14:11:25 +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
9a69c7ba0e Merge branch 'master' into dataman_nav_drton 2014-07-07 15:09:16 +02:00
Julian Oes
79cbf15d26 Merge branch 'master' into offboard2_merge 
Conflicts:
	src/modules/commander/commander.cpp
 2014-07-07 14:49:58 +02:00
Lorenz Meier
be73ad0bdb Merge pull request #1119 from PX4/navigator_rewrite_drton 
Navigator rewrite - DrTon
 2014-07-07 14:30:38 +02:00
Don Gagne
2a79689224 Fix unused variable warnings 2014-07-06 16:51:06 -07:00
Lorenz Meier
d67089b23f Merge pull request #1133 from PX4/datalink_fix 
Telemetry status: use separate topic for each link
 2014-07-06 23:12:33 +02:00
Anton Babushkin
06f08ad04d commander: require home position for MISSION, fallback to LOITER 2014-07-06 21:37:26 +02:00
Anton Babushkin
bd5d3ebf70 telemetry_statur: use 4 separate topics 2014-07-06 16:08:37 +02:00
Don Gagne
b9299e68d4 Compiler warning fixes 2014-07-05 13:35:12 -07:00
Antonio Sanniravong
d4eae37e47 Commander: Only consider latest active data link heartbeat for timeout. 2014-07-04 21:00:05 -04:00
Anton Babushkin
39dab45ac5 Merge branch 'master' into dataman_state_nav_rewrite 2014-07-04 12:22:55 +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
Julian Oes
fdceb8b062 Merge branch 'master' into navigator_rewrite_offboard2_merge 
Conflicts:
	mavlink/include/mavlink/v1.0/common/common.h
	src/modules/mavlink/mavlink_receiver.cpp
 2014-07-02 14:59:43 +02:00
Lorenz Meier
bbdf2bc07a commander: Notify negative on manual arming fails 2014-06-30 16:58:05 +02:00
Lorenz Meier
e88bbe288d Merge branch 'warning_fixes_v3' into prearm_checks 2014-06-30 16:34:15 +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
Anton Babushkin
0a159e1a24 mavlink, commander: bugs fixed 2014-06-30 12:31:29 +02:00
Anton Babushkin
1a6b2b9c1e Merge branch 'master' into dataman_state_nav_rewrite 2014-06-30 12:31:06 +02:00
Lorenz Meier
3f6851b987 Re-send the RC config warnings once the GCS is connected, fixed compile warnings 2014-06-30 12:19:08 +02:00
Lorenz Meier
154f14e747 Merged master into power_enforce 2014-06-30 00:50:38 +02:00
Lorenz Meier
28a31708f9 Merged estimator fixes and mavlink rate config bits 2014-06-30 00:46:29 +02:00
Don Gagne
2448e2adbc More tab fixes 2014-06-29 13:55:55 -07:00
Don Gagne
d5b5dcef24 Fix bugs found through compiler warnings 2014-06-29 12:01:43 -07:00
Lorenz Meier
ecee13861c Merged master 2014-06-29 19:12:35 +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
a122e88893 commander: hack to get velocity offboard control working 2014-06-27 12:54:39 +02:00
Julian Oes
5330ffe458 commander: detect if offboard control is lost and missing offboard states 2014-06-27 12:53:07 +02:00
Julian Oes
19fad94a34 Merge branch 'navigator_rewrite' into navigator_rewrite_estimator 2014-06-27 11:02:47 +02:00
Lorenz Meier
0fe8ed509a Merge branch 'master' into power_enforce 2014-06-26 17:28:01 +02:00
Lorenz Meier
690edbd672 Remove duplicate code in the arming check 2014-06-26 12:14:49 +02:00
Lorenz Meier
547f71d791 Add mavlink_fd to all commander arm transitions to provide user feedback why the arming command failed 2014-06-26 12:09:54 +02:00
Lorenz Meier
1cd82fc89c Add mavlink_fd to all commander arm transitions to provide user feedback why the arming command failed 2014-06-26 12:07:28 +02:00
Anton Babushkin
bdf1b9274c commander: modes fallback and reject messages fixed 2014-06-25 17:56:11 +02:00
Lorenz Meier
f318ee2194 Remove debug output in commander spamming console 2014-06-22 18:15:15 +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
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