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

498 Commits

Author SHA1 Message Date
Lorenz Meier 7b768d11c3 Improve mission feedback, fix compile errors 2014-07-12 14:31:09 +02:00
Lorenz Meier 629ab5540f Fix severity handling of text messages 2014-07-12 14:30:49 +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
Anton Babushkin dca8daeec5 mavlink: use all outputs in HIL mode 2014-07-10 21:37:00 +02:00
Anton Babushkin e57579fa21 mavlink, navigator: compile errors/warnings fixed 2014-07-10 17:08:23 +02:00
Anton Babushkin fc1669b096 Merge branch master into dataman_state_nav_rewrite 2014-07-10 14:11:25 +02:00
Anton Babushkin 9b2d444cc5 dataman: use DM_KEY_WAYPOINTS_OFFBOARD() macro everywhere 2014-07-10 14:08:09 +02:00
Lorenz Meier 9f1661f1f8 Silence FTP transactions, be vocal about errors 2014-07-08 09:58:08 +02:00
Lorenz Meier a23c2e3dd2 Merged master into offboard2_merge 2014-07-07 22:31:54 +02:00
Lorenz Meier 9a1e920f4b Merge pull request #1137 from DonLakeFlyer/FTPLogging 
Better FTP logging
 2014-07-07 22:14:30 +02:00
Don Gagne f5c14ff140 Turn off noisier logging 2014-07-07 10:17:39 -07: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
Don Gagne 2a79689224 Fix unused variable warnings 2014-07-06 16:51:06 -07:00
Don Gagne b8ba6400f2 More logging 2014-07-06 16:04:30 -07:00
Don Gagne 91537934c4 Better logging 2014-07-06 14:58:27 -07:00
Anton Babushkin bd5d3ebf70 telemetry_statur: use 4 separate topics 2014-07-06 16:08:37 +02:00
Anton Babushkin e97161e96b mavlink: stack size for main thread increased 2014-07-04 15:53:26 +02:00
Anton Babushkin 39dab45ac5 Merge branch 'master' into dataman_state_nav_rewrite 2014-07-04 12:22:55 +02:00
Anton Babushkin d7394c7ef9 mavlink: stack size increased 2014-07-03 19:00:22 +02:00
Kynos 1cca3ca8a5 Use NAV-PVT with ubx7 and ubx8 modules 
This replaces NAV-SOL, NAV-POSLLH, NAV-VELNED and NAV-TIMEUTC.
 2014-07-03 13:33:29 +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 a9fd5ed90a Merged master to gnss_rework 2014-07-02 00:33:36 +02:00
Lorenz Meier 45016b0df0 Merge pull request #984 from PX4/rc_channels 
rc_channels cleanup
 2014-06-30 17:11:14 +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 8e41cbfdfa mavlink: Warning fixes 2014-06-30 12:18:38 +02:00
Don Gagne 92adbe9216 Fix compiler warnings 2014-06-29 17:47:24 -07:00
Kynos 43b9d96cf4 Merged upstream master, add missing change 2014-06-30 01:55:40 +02:00
Kynos 503ebddc1b Merged upstream master into gnss_rework branch 2014-06-30 01:34:12 +02:00
Lorenz Meier 28a31708f9 Merged estimator fixes and mavlink rate config bits 2014-06-30 00:46:29 +02:00
Don Gagne f3af2f9f62 Fix tabbing to 8 spaces, keep tab 2014-06-29 13:47:56 -07:00
Lorenz Meier 72071cdcd3 Fix failed merge 2014-06-29 19:22:22 +02:00
Lorenz Meier ecee13861c Merged master 2014-06-29 19:12:35 +02:00
Lorenz Meier 5db51bd704 Merged master into navigator_rewrite 2014-06-29 13:11:29 +02:00
Lorenz Meier e00d9407b9 Merged master 2014-06-29 13:03:53 +02:00
Lorenz Meier e84cab86ab Merge pull request #923 from PX4/mavlink-ftp 
Mavlink File Transfer Protocol (FTP)
 2014-06-29 12:45:41 +02:00
Don Gagne a398d5cbcc Support for List, Open, Read, Terminate commands 
Fixed various bugs. Flattened Mavlink::Session class while fixing bugs
in this area.
 2014-06-27 20:33:39 -07: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 ee6e000098 mavlink: fix comment in swarm message receiver 2014-06-27 14:08:13 +02:00
Julian Oes 4c4d14347e mavlink: only save a offboard_control, don't publish to setpoint topics (let the navigator do this) 2014-06-27 12:54:52 +02:00
Julian Oes f5699e6490 mavlink: always copy offboard setpoints, not just when control mode changed, also bugfixes in orb calls 2014-06-27 12:53:44 +02:00
Anton Babushkin 9e5c94b41e mavlink: spaces replaced with tabs 2014-06-26 22:41:35 +02:00
Anton Babushkin 62156e78ae mavlink: init structs for HEARTBEAT if uORB topic copy failed 2014-06-26 22:37:11 +02:00
Lorenz Meier f76040e554 mavlink: Always send heartbeat and do not require both topics to update 2014-06-26 16:18:46 +02:00
Lorenz Meier 7546b99a24 mavlink-ftp: Add extra padding because the ringbuffer implementation relies on its use 2014-06-26 14:26:35 +02:00
Lorenz Meier f9db1723e3 mavlink-ftp: Remove commented out code 2014-06-26 14:20:29 +02:00