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

461 Commits

Author SHA1 Message Date
Thomas Gubler 839710daf8 Update offboard control uorb topic 
Work towards supporting the new external setpoint mavlink messages
 2014-07-03 14:46:25 +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
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 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
Lorenz Meier 1a0f53ec3a mavlink-ftp: Remove two extra bytes we don not need 2014-06-26 13:50:46 +02:00
Lorenz Meier 6e597a66de merged master 2014-06-26 13:31:33 +02:00
Thomas Gubler f9d5cf332c Revert "Hotfix: Only orb_copy items in mavlink app if the timestamp changed" 
This reverts commit a9653fa10d.
 2014-06-25 17:05:20 +02:00
Lorenz Meier 11fa104a2a Merge branch 'master' into navigator_rewrite_estimator 2014-06-23 14:57:19 +02:00
Lorenz Meier 68442e31ac Hotfix: Move channel count to right position 2014-06-23 14:56:48 +02:00
Lorenz Meier 194aa49110 Merged rate config changes 2014-06-23 14:35:59 +02:00
Lorenz Meier f02de30c32 Merge branch 'master' into navigator_rewrite_estimator 2014-06-23 13:53:22 +02:00
Lorenz Meier bf5061aa21 Fix error reporting in stream config, report if a stream was not found at all in stream list and return error 2014-06-23 13:52:09 +02:00
Lorenz Meier a9653fa10d Hotfix: Only orb_copy items in mavlink app if the timestamp changed 2014-06-23 13:51:05 +02:00
Lorenz Meier 87857cdd48 Hotfix: Fix message name typo 2014-06-23 13:45:20 +02:00
Lorenz Meier 9a1b724070 Merged master 2014-06-22 18:21:03 +02:00
Lorenz Meier 72afa2ca2b Capture TX issues in performance counter instead of spamming console in mavlink app 2014-06-22 18:15: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 62faa2ee51 commander/navigator: renamed FS modes to RTL and RTGS (return to ground station) 2014-06-19 10:26:56 +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 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
Anton Babushkin 91f0b9eee4 mavlink: store last heartbeat time in telemetry_status topic 2014-06-16 17:32:58 +02:00
Kynos 137564b4a6 Merge master with the exception of ubx.cpp and ubx.h 2014-06-15 12:30:06 +02:00
Julian Oes 9772aa5814 mavlink: set current DO_JUMP repetitions to 0 initially 2014-06-15 11:59:45 +02:00
Benjamin O'Connell-Armand 128ec447ad Fix various compilation issue 2014-06-14 15:50:21 -04:00
t0ni0 7d05f2df7c Added support for velocity setpoint in mavlink_receiver and mc_pos_control 2014-06-13 20:38:43 -04:00
Julian Oes d48a8bc073 navigator: renamed the different RTL states 2014-06-12 19:09:18 +02:00