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

440 Commits

Author SHA1 Message Date
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 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 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
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 68442e31ac Hotfix: Move channel count to right position 2014-06-23 14:56:48 +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
Anton Babushkin 164f19176e Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite 2014-06-21 14:26:40 +02:00
Anton Babushkin da2f68a6a0 mavlink: don't lock dataman when updating mission state 2014-06-21 14:25:29 +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
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
Anton Babushkin 3b6458859f Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite 2014-06-15 17:30:44 +02:00
Julian Oes 9772aa5814 mavlink: set current DO_JUMP repetitions to 0 initially 2014-06-15 11:59:45 +02:00
Anton Babushkin 5be741607c mavlink: mission manager moved to separate class and reworked 2014-06-14 23:57:29 +02:00
Anton Babushkin ffd9ac7e08 mavlink: fix WPM initialization 2014-06-14 01:31:23 +02:00
Anton Babushkin 91b590ef58 Move MISSION_STATE read/write from mavlink to navigator and commander 2014-06-13 23:40:48 +02:00
Anton Babushkin d84cbd008c Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite 2014-06-13 15:11:06 +02:00
Julian Oes d48a8bc073 navigator: renamed the different RTL states 2014-06-12 19:09:18 +02:00
Anton Babushkin 842e7c3df9 Merge branch 'navigator_rewrite' into dataman_state_nav_rewrite 2014-06-12 16:51:37 +02:00
Anton Babushkin 2951962c21 dataman: rename SYSTEM_STATE section to MISSION_STATE 2014-06-12 13:11:45 +02:00
Anton Babushkin 3f1f015fe0 Merge branch 'mavlink_stack' into dataman_state 2014-06-12 12:35:35 +02:00
Anton Babushkin 44481e3773 mavlink: sign of climb rate fixed in VFR_HUD message 2014-06-12 12:01:54 +02:00
Anton Babushkin e076b5a636 Merge branch 'master' into mavlink_stack 2014-06-12 10:12:09 +02:00
Anton Babushkin 342e08977a MavlinkOrbSubscription API reworked 2014-06-11 14:00:44 +02:00
Julian Oes cfcba921a1 Merge remote-tracking branch 'px4/master' into navigator_rewrite 2014-06-11 13:29:28 +02:00
Anton Babushkin fb4bcf87ba Merge branch 'master' into mavlink_stack 2014-06-10 15:12:09 +02:00
Julian Oes 064a75a3c2 mavlink: put update call back in 2014-06-10 15:02:20 +02:00
Anton Babushkin 3015f2e7af mavlink: retry timeout moved to define 2014-06-10 14:32:37 +02:00
Julian Oes d5c0933d65 mavlink: report global position setpoint and do this always no just when updated, otherwise the values are not visible in QGC 2014-06-10 14:29:17 +02:00
Anton Babushkin cad0877f67 mavlink: waypoint manager fixes, mission saving on reboot 2014-06-09 16:10:24 +02:00
Jean Cyr a6cf04a6ff Create system state entry in dataman - ATTN Anton 
Create persistent system state id for data manager to store system state
that will persist across resets.
 2014-06-08 14:08:22 -04:00
px4dev 0ef6605498 Fix packing of directory entries in the List reply 2014-06-08 10:13:55 -07:00
Lorenz Meier a103fef948 Fixed threading and transmission issues for FTP 2014-06-08 18:51:35 +02:00
Lorenz Meier f84e18f27a Formatting and some ftp drive-by 2014-06-08 18:51:17 +02:00
px4dev e890661900 Don't queue empty work items. 2014-06-07 14:46:46 -07:00
px4dev 99dfef357b fix extraction of path info from FTP request 2014-06-07 12:54:04 -07:00