fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-29 21:24:08 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,239 Commits 852 Branches 161 Tags
Commit Graph

148 Commits

Author SHA1 Message Date
Thomas Gubler
3efffb68e7 Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
	src/modules/navigator/geofence.cpp
	src/modules/navigator/mission.cpp
 2014-09-28 12:36:26 +02:00
Lorenz Meier
1a89b80024 Merge pull request #1345 from DonLakeFlyer/FTP 
More FTP work
 2014-09-06 15:02:41 +02:00
Thomas Gubler
3d01da35d0 write sysid & compid to telemetry status 2014-09-03 10:34:27 +02:00
Don Gagne
37ea85968d Tweak for mavlink_ftp api change 2014-09-02 15:34:20 -07:00
Thomas Gubler
49f1637d7f comment and whitespace 2014-09-02 23:32:24 +02:00
Thomas Gubler
752b89b998 parse hil_optical_flow message 
publish to flow and range finder topic
 2014-09-02 23:29:54 +02:00
Don Gagne
0eea110f6f Modified to use new FILE_TRANSFER_PROTOCOL message 
- Also corrected system/component id transmit/check
 2014-08-27 17:14:49 -07:00
Lorenz Meier
0d87dc9923 mavlink: Handle command int packets 2014-08-18 16:50:13 +02:00
Lorenz Meier
c3522f8592 Publish telemetry status on telemetry update and on heartbeat update events to avoid inducing heartbeat update latencies resulting in spurious telemetry link dropped detections. Makes overall state handling simpler 2014-08-17 10:58:28 +02:00
Lorenz Meier
3f63b67eb6 Merged master into vision_estimate 2014-08-13 09:08:16 +02:00
Lorenz Meier
5225d87854 Updated MAVLink to latest revision 2014-08-10 01:24:04 +02:00
Lorenz Meier
93a822fee4 Merged master 2014-07-31 11:37:32 +02:00
Julian Oes
58aa9f28f0 mavlink: when detecting spoof, be more verbose 2014-07-24 17:59:02 +02:00
Anton Babushkin
ef363edfcd mavlink: TX/RX rate counters added 2014-07-23 08:19:24 +02:00
Lorenz Meier
91becef344 Cleanup of heartbeat handling and status printing. Ready to go mainline 2014-07-23 08:18:55 +02:00
Lorenz Meier
0c0b1a4c66 Print mavlink radio module rates 2014-07-23 08:18:45 +02:00
Lorenz Meier
11eeb7466d Merge branch 'ext_mag_param' into logging 2014-07-16 15:00:58 +02:00
Lorenz Meier
e696ed5509 Merged master 2014-07-15 22:07:03 +02:00
Lorenz Meier
1ac2b307e4 Enable stricter compile mode and ensure the most relevant bits are initialized. Needs more work to avoid the remaining warnings 2014-07-15 18:23:17 +02:00
Lorenz Meier
d9f3352d72 Merge branch 'master' of github.com:PX4/Firmware into vision_estimate 2014-07-14 13:48:03 +02:00
Anton Babushkin
fc1669b096 Merge branch master into dataman_state_nav_rewrite 2014-07-10 14:11:25 +02:00
Lorenz Meier
629e73bcf4 Merged master into vision_estimate 2014-07-09 11:21:39 +02:00
Lorenz Meier
9f1661f1f8 Silence FTP transactions, be vocal about errors 2014-07-08 09:58:08 +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
Anton Babushkin
bd5d3ebf70 telemetry_statur: use 4 separate topics 2014-07-06 16:08:37 +02:00
Anton Babushkin
39dab45ac5 Merge branch 'master' into dataman_state_nav_rewrite 2014-07-04 12:22:55 +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
4b9f9281f5 Merged master into vision_estimate 2014-07-01 14:00:54 +02:00
Anton Babushkin
1a6b2b9c1e Merge branch 'master' into dataman_state_nav_rewrite 2014-06-30 12:31:06 +02:00
Kynos
503ebddc1b Merged upstream master into gnss_rework branch 2014-06-30 01:34:12 +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
Julian Oes
faebf17514 Merge branch 'navigator_rewrite' into navigator_rewrite_offboard2_merge 2014-06-27 14:41:38 +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
Lorenz Meier
6e597a66de merged master 2014-06-26 13:31:33 +02:00
Lorenz Meier
194aa49110 Merged rate config changes 2014-06-23 14:35:59 +02:00
Lorenz Meier
9a1b724070 Merged master 2014-06-22 18:21:03 +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
e0c78e51e3 mavlink: only publish telemetry status from GCS 2014-06-19 14:14:24 +02:00
Julian Oes
94e004955d mavlink: publish telemtry status without radio status 2014-06-19 09:33:28 +02:00
t0ni0
e078ef992f Removed publications closing 
This is an attempt to correct the offboard setpoints being passed on as "NaN" values
 2014-06-17 13:30:45 -04:00
Anton Babushkin
91f0b9eee4 mavlink: store last heartbeat time in telemetry_status topic 2014-06-16 17:32:58 +02:00