Commit Graph

468 Commits

Author SHA1 Message Date
Anton Babushkin 9a69c7ba0e Merge branch 'master' into dataman_nav_drton 2014-07-07 15:09:16 +02:00
Don Gagne 2a79689224 Fix unused variable warnings 2014-07-06 16:51:06 -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
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 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
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
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