Thomas Gubler
98d643fdf8
Merge branch 'launchpitchlimit' into launchpitchlimit_swissfang
2014-09-08 13:01:02 +02:00
Thomas Gubler
df181455eb
launch pitch limit: add mtecs interface
2014-09-08 13:00:26 +02:00
Thomas Gubler
33c0cd2e56
Merge remote-tracking branch 'private_swissfang/master' into launchpitchlimit_swissfang
2014-09-08 12:45:09 +02:00
Thomas Gubler
daf1618420
additional upper pitch limit during launch
...
The pitch limit can be used by the laucnhdetector to limit pitch during
critical phases of a launch. For example this can be used to limit pitch
while attached to a bungee differently from the standard pitch limit.
2014-09-08 12:42:42 +02:00
Thomas Gubler
cf601c09bf
swissfang: don't build MC apps on FMU1
2014-09-07 12:21:49 +02:00
Lorenz Meier
819c43fee6
Merge branch 'terrainaltfield' of github.com:PX4/Firmware into swissfang
2014-09-06 15:12:21 +02:00
Lorenz Meier
510750166a
Merge branch 'stable' of github.com:swissfang/Firmware into swissfang
2014-09-06 14:39:48 +02:00
Lorenz Meier
e8c634d87a
Merge pull request #9 from swissfang/tecsaltrate
...
Tecs altrate feedforward
2014-09-06 14:38:59 +02:00
Lorenz Meier
e57a758350
Merge pull request #11 from swissfang/fwintegratorlanded
...
FW: in seatbelt/althold on ground reset integrators (swissfang)
2014-09-06 10:54:50 +02:00
Thomas Gubler
f315be5416
FW: in seatbelt/althold on ground reset integrators
2014-09-06 10:36:51 +02:00
Lorenz Meier
2fe50a6524
Merge pull request #10 from swissfang/loiteracceptance
...
navigator: loiter mission items: better reached check for FW (swissfang)
2014-09-05 22:37:34 +02:00
Thomas Gubler
0a6267e010
update comment
2014-09-05 10:18:51 +02:00
Thomas Gubler
d7f93f4ece
loiter mission items: better reached check for FW
2014-09-05 10:04:42 +02:00
Thomas Gubler
9b2a40068a
Merge remote-tracking branch 'private_swissfang/master' into stable
2014-09-04 20:32:14 +02:00
Thomas Gubler
4e9a52fe45
heightrate ff: fix order of calculations
2014-09-04 12:32:10 +02:00
Thomas Gubler
dd1945bb76
add heightrate ff for tecs
2014-09-04 10:59:35 +02:00
Lorenz Meier
ee2eb98167
Merge pull request #1346 from PX4/mavlinkabsrelalt
...
fix mission item to mavink waypoint conversion
2014-09-04 00:01:25 +02:00
Lorenz Meier
75e9497ab1
Fix FX79 mixer
2014-09-03 18:15:30 +02:00
Lorenz Meier
5134015800
always obey commands in bottle drop
2014-09-03 18:15:12 +02:00
Thomas Gubler
7dfc67d032
fix mission item to mavink waypoint conversion
2014-09-03 17:52:24 +02:00
Lorenz Meier
8c2a158e12
Trust the laser sensor more
2014-09-03 12:15:27 +02:00
Lorenz Meier
2761f98ab6
Merge pull request #1344 from PX4/hildistancesensor
...
parse hil_optical_flow message
2014-09-03 00:30:38 +02:00
Thomas Gubler
6188678f77
Merge pull request #1303 from PX4/launchdetectionstates
...
Launchdetection improvements
2014-09-03 00:29:33 +02:00
Thomas Gubler
49f1637d7f
comment and whitespace
2014-09-02 23:32:24 +02:00
Thomas Gubler
752b89b998
parse hil_optical_flow message
...
publish to flow and range finder topic
2014-09-02 23:29:54 +02:00
Lorenz Meier
4c7cc10b62
Working and replay-tested altitude fusion
2014-09-02 15:37:18 +02:00
Lorenz Meier
8729cf2327
Merge branch 'ekf_varweight' of github.com:PX4/Firmware into terrainaltfield
2014-09-02 14:38:27 +02:00
Lorenz Meier
71a2025f7d
Add filter estimates
2014-09-01 11:35:41 +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
Thomas Gubler
2780dc39ce
Merge pull request #1338 from PX4/throttle_limit_simplified
...
Simplify throttle limiting on approach
2014-08-31 22:34:32 +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
84d26185df
Better initial config for Phantom
2014-08-31 21:11:20 +02:00
Lorenz Meier
ec740c5509
Merge branch 'sf0x_paranoid'
2014-08-31 21:10:31 +02:00
Lorenz Meier
af3b3680e0
Fixed SF02/F driver, tested ok
2014-08-31 21:10:04 +02:00
Lorenz Meier
f5f0892b7a
Merge branch 'sf0x_paranoid' of github.com:PX4/Firmware into swissfang
2014-08-31 21:02:23 +02:00
Lorenz Meier
a46e1aa60e
Fix reschedule logic for SF02/F driver
2014-08-31 20:55:29 +02:00
Lorenz Meier
7109d3b32e
Merge branch 'sf0x_paranoid' of github.com:PX4/Firmware into swissfang
2014-08-31 19:54:03 +02:00
Lorenz Meier
ee91320299
SF02/F driver: Improve parsing
2014-08-31 19:53:01 +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
Thomas Gubler
f123e3ae1a
Merge pull request #1336 from PX4/laser_landing
...
Rely on laser altitude once valid
2014-08-31 18:08:55 +02:00
Lorenz Meier
7a253d50f8
Add more paranoid checks to sf0x altitude parsing
2014-08-31 17:59:21 +02:00
Lorenz Meier
0e954b30c2
Rely on laser altitude once valid
2014-08-31 17:58:43 +02:00
Lorenz Meier
c17c585c3e
Merge pull request #1335 from PX4/landingtecsunderspeed
...
disable underspeed protection when landing also in tecs
2014-08-31 17:03:03 +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