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

parameters: simplify import mark_unsaved and don't fail bson decode unnecessarily

Browse Source
This commit is contained in:
Daniel Agar
2021-12-24 14:32:40 -05:00
parent d1cd4904dc
commit 3f3836afa8
8 changed files with 43 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/parameters/flashparams/flashparams.cpp
+6 -13
View File
@@ -187,18 +187,14 @@ out:
return result;
}
struct param_import_state {
bool mark_saved;
};
static int
param_import_callback(bson_decoder_t decoder, void *priv, bson_node_t node)
param_import_callback(bson_decoder_t decoder, bson_node_t node)
{
float f;
int32_t i;
void *v = nullptr;
int result = -1;
struct param_import_state *state = (struct param_import_state *)priv;
/*
* EOO means the end of the parameter object. (Currently not supporting
@@ -255,7 +251,7 @@ param_import_callback(bson_decoder_t decoder, void *priv, bson_node_t node)
goto out;
}
if (param_set_external(param, v, state->mark_saved, true)) {
if (param_set_external(param, v, true, true)) {
debug("error setting value for '%s'", node->name);
goto out;
}
@@ -268,23 +264,20 @@ out:
}
static int
param_import_internal(bool mark_saved)
param_import_internal()
{
bson_decoder_s decoder{};
int result = -1;
struct param_import_state state;
uint8_t *buffer = 0;
size_t buf_size;
parameter_flashfs_read(parameters_token, &buffer, &buf_size);
if (bson_decoder_init_buf(&decoder, buffer, buf_size, param_import_callback, &state)) {
if (bson_decoder_init_buf(&decoder, buffer, buf_size, param_import_callback)) {
debug("decoder init failed");
goto out;
}
state.mark_saved = mark_saved;
do {
result = bson_decoder_next(&decoder);
@@ -307,10 +300,10 @@ int flash_param_save(param_filter_func filter)
int flash_param_load()
{
param_reset_all();
return param_import_internal(true);
return param_import_internal();
}
int flash_param_import()
{
return param_import_internal(true);
return param_import_internal();
}