fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-17 19:50:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

parameters: param_get_default_value avoid locking if value is static default

Browse Source
This commit is contained in:
Daniel Agar
2021-04-23 13:44:59 -04:00
parent 27a113ecab
commit c0b8f2952c
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/parameters/parameters.cpp
+24 -3
View File
@@ -559,9 +559,30 @@ param_get_default_value_internal(param_t param, void *default_val)
int
param_get_default_value(param_t param, void *default_val)
{
param_lock_reader();
int ret = param_get_default_value_internal(param, default_val);
param_unlock_reader();
if (!handle_in_range(param)) {
return PX4_ERROR;
}
int ret = 0;
if (!params_custom_default[param]) {
// return static default value
switch (param_type(param)) {
case PARAM_TYPE_INT32:
memcpy(default_val, &px4::parameters[param].val.i, sizeof(px4::parameters[param].val.i));
return PX4_OK;
case PARAM_TYPE_FLOAT:
memcpy(default_val, &px4::parameters[param].val.f, sizeof(px4::parameters[param].val.f));
return PX4_OK;
}
} else {
param_lock_reader();
ret = param_get_default_value_internal(param, default_val);
param_unlock_reader();
}
return ret;
}