fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-29 03:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

systemcmds/param: add set-default sient (-s) option

Browse Source
This commit is contained in:
Daniel Agar
2021-09-01 15:16:00 -04:00
parent 054d0b995c
commit 5dfc07cb1b
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/nuttx/init/stm32f7/rc.board_arch_defaults
+2 -2
View File
@@ -9,8 +9,8 @@ param set-default SENS_IMU_MODE 0
param set-default EKF2_MULTI_MAG 0 param set-default EKF2_MULTI_MAG 0
param set-default SENS_MAG_MODE 1 param set-default SENS_MAG_MODE 1
param set-default IMU_GYRO_FFT_EN 1 param set-default -s IMU_GYRO_FFT_EN 1
param set-default UAVCAN_ENABLE 2 param set-default -s UAVCAN_ENABLE 2
set LOGGER_BUF 64 set LOGGER_BUF 64
platforms/nuttx/init/stm32h7/rc.board_arch_defaults
+2 -2
View File
@@ -9,8 +9,8 @@ param set-default SENS_IMU_MODE 0
param set-default EKF2_MULTI_MAG 3 param set-default EKF2_MULTI_MAG 3
param set-default SENS_MAG_MODE 0 param set-default SENS_MAG_MODE 0
param set-default IMU_GYRO_FFT_EN 1 param set-default -s IMU_GYRO_FFT_EN 1
param set-default UAVCAN_ENABLE 2 param set-default -s UAVCAN_ENABLE 2
set LOGGER_BUF 64 set LOGGER_BUF 64
src/systemcmds/param/param.cpp
+12 -5
View File
@@ -93,7 +93,7 @@ static int do_show_index(const char *index, bool used_index);
static void do_show_print(void *arg, param_t param); static void do_show_print(void *arg, param_t param);
static void do_show_print_for_airframe(void *arg, param_t param); static void do_show_print_for_airframe(void *arg, param_t param);
static int do_set(const char *name, const char *val, bool fail_on_not_found); static int do_set(const char *name, const char *val, bool fail_on_not_found);
static int do_set_custom_default(const char *name, const char *val); static int do_set_custom_default(const char *name, const char *val, bool silent_fail = false);
static int do_compare(const char *name, char *vals[], unsigned comparisons, enum COMPARE_OPERATOR cmd_op, static int do_compare(const char *name, char *vals[], unsigned comparisons, enum COMPARE_OPERATOR cmd_op,
enum COMPARE_ERROR_LEVEL err_level); enum COMPARE_ERROR_LEVEL err_level);
static int do_reset_all(const char *excludes[], int num_excludes); static int do_reset_all(const char *excludes[], int num_excludes);
@@ -154,6 +154,7 @@ $ reboot
PRINT_MODULE_USAGE_ARG("fail", "If provided, let the command fail if param is not found", true); PRINT_MODULE_USAGE_ARG("fail", "If provided, let the command fail if param is not found", true);
PRINT_MODULE_USAGE_COMMAND_DESCR("set-default", "Set parameter default to a value"); PRINT_MODULE_USAGE_COMMAND_DESCR("set-default", "Set parameter default to a value");
PRINT_MODULE_USAGE_PARAM_FLAG('s', "If provided, silent errors if parameter doesn't exists", true);
PRINT_MODULE_USAGE_ARG("<param_name> <value>", "Parameter name and value to set", false); PRINT_MODULE_USAGE_ARG("<param_name> <value>", "Parameter name and value to set", false);
PRINT_MODULE_USAGE_ARG("fail", "If provided, let the command fail if param is not found", true); PRINT_MODULE_USAGE_ARG("fail", "If provided, let the command fail if param is not found", true);
@@ -295,7 +296,10 @@ param_main(int argc, char *argv[])
} }
if (!strcmp(argv[1], "set-default")) { if (!strcmp(argv[1], "set-default")) {
if (argc == 4) { if (argc >= 5 && !strcmp(argv[2], "-s")) {
return do_set_custom_default(argv[3], argv[4], true);
} else if (argc == 4) {
return do_set_custom_default(argv[2], argv[3]); return do_set_custom_default(argv[2], argv[3]);
} else { } else {
@@ -823,12 +827,12 @@ do_set(const char *name, const char *val, bool fail_on_not_found)
} }
static int static int
do_set_custom_default(const char *name, const char *val) do_set_custom_default(const char *name, const char *val, bool silent_fail)
{ {
param_t param = param_find_no_notification(name); param_t param = param_find_no_notification(name);
/* set nothing if parameter cannot be found */ /* set nothing if parameter cannot be found */
if (param == PARAM_INVALID) { if (param == PARAM_INVALID && !silent_fail) {
/* param not found - fail silenty in scripts as it prevents booting */ /* param not found - fail silenty in scripts as it prevents booting */
PX4_ERR("Parameter %s not found.", name); PX4_ERR("Parameter %s not found.", name);
return PX4_ERROR; return PX4_ERROR;
@@ -869,7 +873,10 @@ do_set_custom_default(const char *name, const char *val)
break; break;
default: default:
PX4_ERR("<unknown / unsupported type %d>\n", 0 + param_type(param)); if (!silent_fail) {
PX4_ERR("<unknown / unsupported type %d>\n", 0 + param_type(param));
}
return 1; return 1;
} }