Commit Graph

4386 Commits

Author SHA1 Message Date
Anton Babushkin 132c9180ea mc_pos_control: move position offset limiting to separate method 2014-09-01 18:47:56 +02:00
Anton Babushkin 8ad1aa789b mc_pos_control: reset position setpoint on entering to AUTO mode 2014-09-01 18:13:29 +02:00
Anton Babushkin 3c7b9ef94d Merge commit '2780dc39ce5d47f2d9dfa921062100a1dc86c2be' into mpc_track 2014-09-01 15:19:42 +02:00
Thomas Gubler 7dd950b01f Merge remote-tracking branch 'upstream/terrainaltfield' into fwlandingterrain 2014-09-01 11:42:46 +02:00
Lorenz Meier 71a2025f7d Add filter estimates 2014-09-01 11:35:41 +02:00
Thomas Gubler 63e741824c fw landing: use terrain estimate from global pos 2014-09-01 11:27:28 +02:00
Thomas Gubler 1f951b0df9 add logging for gpos terrain alt 2014-09-01 10:42:56 +02:00
Thomas Gubler 0f548ab88c add global pos valid flag 2014-09-01 10:38:40 +02:00
Thomas Gubler 9f94e4ac84 add terrain alt field to global pos topic 2014-09-01 10:33:59 +02:00
Lorenz Meier 69109b6227 Compile and link ST24 parser in IO firmware 2014-09-01 00:45:41 +02:00
Lorenz Meier 22d2e26b9c Simply throttle limiting on approach - limit throttle still defaults to 1 2014-08-31 21:55:31 +02:00
Lorenz Meier c9a92e6030 Merge branch 'master' into swissfang 2014-08-31 21:12:23 +02:00
Lorenz Meier b81277a1ef Merge branch 'sf0x_paranoid' of github.com:PX4/Firmware into swissfang 2014-08-31 18:42:43 +02:00
sjwilks 159ba7f3bc Merge pull request #8 from swissfang/mavlink_pixhawk
mavlink: use pixhawk dialect
2014-08-31 18:20:32 +02:00
Lorenz Meier 0e954b30c2 Rely on laser altitude once valid 2014-08-31 17:58:43 +02:00
Lorenz Meier 706e5809a1 Fix variable name in param 2014-08-31 17:02:33 +02:00
Thomas Gubler ab022d5133 disable underspeed protection when landing also in tecs 2014-08-31 16:23:37 +02:00
Lorenz Meier 056693df44 Add drag coefficients to adjust bottle drop to other objects to ease testing 2014-08-31 15:55:03 +02:00
Lorenz Meier 592f6f2bcb Revert "Fix drop offset: We want to drop so that the wind carries the bottle into the drop zone"
This reverts commit ef0a0a1a6e.
2014-08-30 16:44:30 +02:00
Lorenz Meier b53c0d6d7f Merge branch 'master' of github.com:PX4/Firmware into swissfang 2014-08-30 15:09:40 +02:00
Thomas Gubler fe0642d5e9 Merge remote-tracking branch 'upstream/master' into obcfailsafe 2014-08-30 11:47:23 +02:00
Thomas Gubler 3b3115b668 Merge branch 'termination_failsafe' into obcfailsafe 2014-08-30 11:43:05 +02:00
Pavel Kirienko 580b726536 UAVCAN: missing declaration warning fix 2014-08-29 14:34:29 +04:00
Lorenz Meier 6773eb9880 Introduce FMU initialised status flag, only run failsafe trap if initialized once 2014-08-28 21:39:38 +02:00
Lorenz Meier c85d7aae06 Make sure we got to valid input at least once before kicking in failsafe 2014-08-28 20:36:59 +02:00
Lorenz Meier e7359066d7 Merge branch 'master' of github.com:PX4/Firmware into indoor 2014-08-28 14:44:41 +02:00
Lorenz Meier 37910d2230 Merge branch 'master' of github.com:PX4/Firmware into swissfang 2014-08-28 14:37:13 +02:00
Lorenz Meier 2c724685d8 Merge pull request #1332 from PX4/FTP
Modified to use new FILE_TRANSFER_PROTOCOL message
2014-08-28 09:28:42 +02:00
Don Gagne fce0a3b728 Gave up on using bitfields 2014-08-27 21:39:55 -07: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
Thomas Gubler 92c3e52fec Merge remote-tracking branch 'upstream/termination_failsafe' into obcfailsafe 2014-08-27 21:34:07 +02:00
Thomas Gubler 0502761799 Merge remote-tracking branch 'upstream/master' into obcfailsafe 2014-08-27 21:33:42 +02:00
Lorenz Meier 62b98cc944 Merge pull request #1329 from hsteinhaus/uavcan_prio
uavcan: increased thread prio, reduces roundtrip latency by a factor of ...
2014-08-27 13:40:25 +02:00
Lorenz Meier 91d50301c6 Do not enter RC override if FMU is lost and termination failsafe mode requested 2014-08-27 10:46:10 +02:00
Lorenz Meier a4ff5b5cdd Merge branch 'master' of github.com:PX4/Firmware into swissfang 2014-08-27 09:49:49 +02:00
Lorenz Meier 863b6d2d94 Merge branch 'master' of github.com:PX4/Firmware into indoor 2014-08-27 09:46:21 +02:00
Lorenz Meier 49846d476f IO firmware supports termination failsafe 2014-08-27 08:00:12 +02:00
Lorenz Meier b928897ab5 mavlink: code style only fix 2014-08-27 07:58:36 +02:00
Thomas Gubler 9cc1f1ab9d flight termination on gps failure && datalink loss: do not activate in manual modes 2014-08-26 23:12:28 +02:00
Thomas Gubler 5e5322c593 fix flight termination circuit breaker name, tested 2014-08-26 22:46:09 +02:00
Thomas Gubler 3d528a2c97 introduce new nav state to allow normal rtl with RC switch 2014-08-26 22:22:59 +02:00
Holger Steinhaus 6ece4cf7c4 ORB topic for drive testing requests 2014-08-26 21:08:16 +02:00
Lorenz Meier 7819e364bc Merge pull request #1322 from PX4/payload_commands
Support additional payload commands and let commander ignore them
2014-08-26 21:01:23 +02:00
Holger Steinhaus 5aafa1b021 mixer_multirotor: motor limit notification for PX4FMU 2014-08-26 20:36:02 +02:00
Holger Steinhaus ccdfab245b mixer_multirotor: topic for motor limit notification 2014-08-26 20:26:47 +02:00
Lorenz Meier e14366fef3 Merged master 2014-08-26 20:17:57 +02:00
Holger Steinhaus 87b2375be4 Ignore single channels during PWM output 2014-08-26 14:38:32 +02:00
Lorenz Meier 4af4e4e1e5 Support additional payload commands and let commander ignore them 2014-08-26 10:14:36 +02:00
Lorenz Meier 47e39841df Merge branch 'bottle_drop_friday' of github.com:swissfang/Firmware into swissfang 2014-08-26 09:37:56 +02:00
Lorenz Meier 9434633912 Merged upstream/master 2014-08-26 09:29:55 +02:00