Commit Graph

9299 Commits

Author SHA1 Message Date
Julian Oes a7e1ba9a00 Merge pull request #15 from swissfang/obcfailsafe
Obcfailsafe
2014-09-20 19:07:13 +10:00
Thomas Gubler 54380e34b3 navigator: fix status information, remove fence_valid flag (this is handled by the geofence class) 2014-09-20 09:45:22 +02:00
Thomas Gubler 2148464a70 geofence: better usefeedback if loaded 2014-09-20 08:44:30 +02:00
Thomas Gubler 6962c5eedf Merge remote-tracking branch 'private_swissfang/master' into obcfailsafe
Conflicts:
	src/modules/navigator/mission.cpp
2014-09-20 08:22:51 +02:00
Julian Oes 237f8805f0 Merge pull request #16 from swissfang/fohaltitude_swissfang
Fohaltitude swissfang
2014-09-20 00:12:22 +10:00
Thomas Gubler 7a5958b3bb Merge branch 'fohaltitude' into fohaltitude_swissfang 2014-09-19 16:01:10 +02:00
Thomas Gubler 940264f6ab Revert "datalink check: ignore onboard computer"
This reverts commit 3f8793210b.

Conflicts:
	src/modules/commander/commander.cpp
	src/modules/commander/commander_params.c
2014-09-13 16:23:28 +02:00
Thomas Gubler 06ad49a690 Merge remote-tracking branch 'private_swissfang/stable' into obcfailsafe
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
2014-09-13 15:50:51 +02:00
Thomas Gubler dd5627726d Merge pull request #14 from swissfang/launchpitchlimit_swissfang
FW: additional upper pitch limit during launch (swissfang)
2014-09-11 22:01:57 +02:00
Lorenz Meier 6791ab72a9 Run faster for better accuracy. 2014-09-11 01:06:30 +02:00
Lorenz Meier 1512bf727c Remove useless modulo throttling, which is a nice source of potential non-trivial non-determinism / timing issues. 2014-09-11 01:04:02 +02:00
Lorenz Meier bc880a3ff9 Fix dt calculation which is used to calculate correct drop time. 2014-09-11 01:02:35 +02:00
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 e8503ab3f9 gps failure has priority over engine falure, in case both fail make sure
that the gps failure mode does not turn on the engine
2014-09-07 15:33:11 +02:00
Thomas Gubler 97f7c0088f fix typo in comment 2014-09-07 15:32:28 +02:00
Thomas Gubler eb90979ba8 if V_RCL_LT < 0 go directly to termination 2014-09-07 15:31:58 +02:00
Thomas Gubler 9608e7adeb flight termination mavlink outtput: limit rate 2014-09-07 15:29:53 +02:00
Thomas Gubler 3d6fcfcf6b Merge remote-tracking branch 'private_swissfang/master' into obcfailsafe 2014-09-07 15:25:54 +02:00
Thomas Gubler 74601939a8 Revert "do send termination info only once"
This reverts commit 5418412777.
2014-09-07 13:45:21 +02:00
Thomas Gubler 5418412777 do send termination info only once 2014-09-07 13:05:03 +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 1d9c99956f make rc loss timeout a param 2014-09-05 12:06:05 +02:00
Thomas Gubler f62be0eebd Merge branch 'loiteracceptance' into obcfailsafe 2014-09-05 10:19:08 +02:00
Thomas Gubler 0a6267e010 update comment 2014-09-05 10:18:51 +02:00
Thomas Gubler eec6777585 Merge branch 'loiteracceptance' into obcfailsafe 2014-09-05 10:11:28 +02:00
Thomas Gubler d7f93f4ece loiter mission items: better reached check for FW 2014-09-05 10:04:42 +02:00
Thomas Gubler 033e4892ca engine failure detection 2014-09-05 08:59:00 +02:00
Thomas Gubler faa221e6cb Merge remote-tracking branch 'private_swissfang/stable' into obcfailsafe 2014-09-04 21:11:07 +02:00
Thomas Gubler 9b2a40068a Merge remote-tracking branch 'private_swissfang/master' into stable 2014-09-04 20:32:14 +02:00
Thomas Gubler 2d5b2edc03 Merge remote-tracking branch 'private_swissfang/master' into obcfailsafe 2014-09-04 20:28:25 +02:00
Thomas Gubler 2d3b6a88de swissfang: don't build MC apps on FMU1 2014-09-04 17:18:06 +02:00
Thomas Gubler 4e9a52fe45 heightrate ff: fix order of calculations 2014-09-04 12:32:10 +02:00
Thomas Gubler 67422c9896 foh alt mode: never sink below previous wp alt 2014-09-04 11:41:13 +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
Thomas Gubler 9cf5e6f7b2 whitespace 2014-09-03 22:08:03 +02:00
Thomas Gubler 5a35d20b7b FOH mode for altitude
This introduces a parameter for the navigator. When enabled the navigator
publishes a first order old (FOH) type altitude setpoint instead of the
default zero order hold. For takeoff and landing the FOH mode is not
active. The FOH altitude is calculated such that the sp reaches the
altitude of the waypoint when the system is at a horizontal distance
equal to the acceptance radius. Also the altitude setpoint will only
converge towards the waypoint altitude but never diverge.
2014-09-03 21:30:56 +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