Commit Graph

2891 Commits

Author SHA1 Message Date
Lorenz Meier e88bbe288d Merge branch 'warning_fixes_v3' into prearm_checks 2014-06-30 16:34:15 +02:00
Lorenz Meier 3c5f35da73 Merge pull request #1100 from PX4/warning_fixes_v3
Warning fixes v3
2014-06-30 16:33:53 +02:00
Lorenz Meier ad4411bfc1 Fix line endings for patch 2014-06-30 16:32:32 +02:00
Lorenz Meier 9dbc83cce1 Merged master into prearm_checks 2014-06-30 16:24:48 +02:00
Lorenz Meier 799f568ab4 commander: Minor checks / improvements to power enforce patch 2014-06-30 14:33:56 +02:00
Lorenz Meier a5e7f5ca30 Merge branch 'master' of github.com:PX4/Firmware into power_enforce 2014-06-30 13:27:42 +02:00
Lorenz Meier d45d204691 Merge branch 'master' into warning_fixes_v3 2014-06-30 12:31:51 +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 b5f9e95af0 INAV: Warning fixes 2014-06-30 12:22:26 +02:00
Lorenz Meier 083d605f8a sensors: Warning fixes 2014-06-30 12:22:06 +02:00
Lorenz Meier 751f8462f6 IO firmware: Warning / bug fixes 2014-06-30 12:21:23 +02:00
Lorenz Meier a66f88b29a systemlib: Warning fixes 2014-06-30 12:20:47 +02:00
Lorenz Meier 20de2da032 Navigator: Warning fixes 2014-06-30 12:20:23 +02:00
Lorenz Meier 3f6851b987 Re-send the RC config warnings once the GCS is connected, fixed compile warnings 2014-06-30 12:19:08 +02:00
Lorenz Meier 8e41cbfdfa mavlink: Warning fixes 2014-06-30 12:18:38 +02:00
Anton Babushkin b9e2fa2c0d mc_pos_control: compiler warning fix 2014-06-30 12:03:48 +02:00
Anton Babushkin 59775efaad navigator: takeoff on start of mission implemented 2014-06-30 12:02:29 +02:00
Anton Babushkin 8495c44053 Merge commit '857b843d445f59f2dc393e4d5f879fc56f77a0e0' into navigator_rewrite_drton 2014-06-30 11:01:40 +02:00
Anton Babushkin a4315aee2e navigator: mission mode fixed 2014-06-30 10:47:08 +02:00
Thomas Gubler e8c34fa174 force setpoint uorb topic: add yaw field 2014-06-30 10:25:57 +02:00
Lorenz Meier 6aed623b6c Merge branch 'master' of github.com:PX4/Firmware into power_enforce 2014-06-30 10:04:34 +02:00
Thomas Gubler ffb0ebf13c Merge remote-tracking branch 'upstream/master' into forcesetpoint
Conflicts:
	src/modules/uORB/objects_common.cpp
2014-06-30 09:53:07 +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 154f14e747 Merged master into power_enforce 2014-06-30 00:50:38 +02:00
Lorenz Meier 28a31708f9 Merged estimator fixes and mavlink rate config bits 2014-06-30 00:46:29 +02:00
Lorenz Meier 6f75d1a20f Merge pull request #1093 from DonLakeFlyer/WarningsBugs
Fix bugs found through compiler warnings
2014-06-30 00:35:47 +02:00
Don Gagne 2448e2adbc More tab fixes 2014-06-29 13:55:55 -07:00
Don Gagne f3af2f9f62 Fix tabbing to 8 spaces, keep tab 2014-06-29 13:47:56 -07:00
Don Gagne 33c20e15a2 Backing out sbus changes 2014-06-29 13:35:15 -07:00
Don Gagne f0558a97dd Use same warnx/exit pattern 2014-06-29 12:53:59 -07:00
Don Gagne d5b5dcef24 Fix bugs found through compiler warnings 2014-06-29 12:01:43 -07:00
Lorenz Meier afb5271bfb Merge branch 'master' of github.com:PX4/Firmware into navigator_rewrite_estimator 2014-06-29 19:27:03 +02: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 94c69e11ae Merge pull request #1089 from PX4/navigator_rewrite
Navigator rewrite
2014-06-29 19:10:42 +02:00
Anton Babushkin adf230ce4e navigator: more API changes, duplicate code removed 2014-06-29 15:35:34 +02:00
Thomas Gubler 263a2fa9b2 mtecs: add flightpathangle filter 2014-06-29 14:52:09 +02:00
Anton Babushkin 8a442c2125 Merge branch 'navigator_rewrite' into navigator_rewrite_drton 2014-06-29 14:10:04 +02:00
Anton Babushkin 0bf9c2a9b2 navigator: API changes, reparing to move manual modes to navigator, WIP 2014-06-29 14:09:22 +02:00
Lorenz Meier 628477ee2c Update estimator from Paul 2014-06-29 14:01:58 +02:00
Lorenz Meier 5db51bd704 Merged master into navigator_rewrite 2014-06-29 13:11:29 +02:00
Anton Babushkin 12be974bd6 navigator: whitespace fix 2014-06-29 13:07:38 +02:00
Lorenz Meier e00d9407b9 Merged master 2014-06-29 13:03:53 +02:00
Lorenz Meier 0426fd3a52 estimator: Fix local variable compile warnings. 2014-06-29 12:59:04 +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
Lorenz Meier e5bd00e628 Merge pull request #1037 from PX4/mtecs
mTECS
2014-06-29 12:39:04 +02:00
Lorenz Meier 852d973e74 Merge pull request #1063 from pigeonhunter/offset_tuning
Offset tuning implemented in sensors app
2014-06-29 12:17:41 +02:00