diff options
author | Julian Oes <julian@oes.ch> | 2014-05-07 21:11:21 +0200 |
---|---|---|
committer | Julian Oes <julian@oes.ch> | 2014-05-07 21:11:21 +0200 |
commit | 26f5e550c492fc00341d5a0ae445710325269813 (patch) | |
tree | d4136cbb97dd391ccce638103cd2a7b07ee2231c /src/modules/systemlib | |
parent | 470513d9bb67bc19bd0ac70d209c681dc321ddfb (diff) | |
parent | 23937150bce38463612ac170803a06a3424d480d (diff) | |
download | px4-firmware-26f5e550c492fc00341d5a0ae445710325269813.tar.gz px4-firmware-26f5e550c492fc00341d5a0ae445710325269813.tar.bz2 px4-firmware-26f5e550c492fc00341d5a0ae445710325269813.zip |
Merge remote-tracking branch 'px4/ekf_params' into navigator_cleanup_ekf_params
Conflicts:
src/modules/ekf_att_pos_estimator/fw_att_pos_estimator_main.cpp
Diffstat (limited to 'src/modules/systemlib')
-rw-r--r-- | src/modules/systemlib/mixer/mixer_load.c | 1 | ||||
-rw-r--r-- | src/modules/systemlib/system_params.c | 27 |
2 files changed, 20 insertions, 8 deletions
diff --git a/src/modules/systemlib/mixer/mixer_load.c b/src/modules/systemlib/mixer/mixer_load.c index b05273c0d..bf3428a50 100644 --- a/src/modules/systemlib/mixer/mixer_load.c +++ b/src/modules/systemlib/mixer/mixer_load.c @@ -41,6 +41,7 @@ #include <string.h> #include <stdio.h> #include <ctype.h> +#include <systemlib/err.h> #include "mixer_load.h" diff --git a/src/modules/systemlib/system_params.c b/src/modules/systemlib/system_params.c index ec2bc3a9a..702e435ac 100644 --- a/src/modules/systemlib/system_params.c +++ b/src/modules/systemlib/system_params.c @@ -62,12 +62,23 @@ PARAM_DEFINE_INT32(SYS_AUTOSTART, 0); PARAM_DEFINE_INT32(SYS_AUTOCONFIG, 0); /** - * Set usage of IO board - * - * Can be used to use a standard startup script but with a FMU only set-up. Set to 0 to force the FMU only set-up. - * - * @min 0 - * @max 1 - * @group System - */ +* Set usage of IO board +* +* Can be used to use a standard startup script but with a FMU only set-up. Set to 0 to force the FMU only set-up. +* +* @min 0 +* @max 1 +* @group System +*/ PARAM_DEFINE_INT32(SYS_USE_IO, 1); + +/** +* Set restart type +* +* Set by px4io to indicate type of restart +* +* @min 0 +* @max 2 +* @group System +*/ +PARAM_DEFINE_INT32(SYS_RESTART_TYPE, 2); |