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

Params: Provide set and save API

Browse Source
This commit is contained in:
Lorenz Meier
2016-01-22 11:35:56 +01:00
parent 85c49ff642
commit 3a43038583
2 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/systemlib/param/param.c
+19 -10
View File
@@ -235,9 +235,9 @@ param_find_changed(param_t param)
}
static void
param_notify_changes(void)
param_notify_changes(bool is_saved)
{
struct parameter_update_s pup = { .timestamp = hrt_absolute_time() };
struct parameter_update_s pup = { .timestamp = hrt_absolute_time(), .saved = is_saved};
/*
* If we don't have a handle to our topic, create one now; otherwise
@@ -497,7 +497,7 @@ param_get(param_t param, void *val)
}
static int
param_set_internal(param_t param, const void *val, bool mark_saved, bool notify_changes)
param_set_internal(param_t param, const void *val, bool mark_saved, bool notify_changes, bool autosave)
{
int result = -1;
bool params_changed = false;
@@ -575,7 +575,7 @@ out:
* a thing has been set.
*/
if (params_changed && notify_changes) {
param_notify_changes();
param_notify_changes(autosave);
}
return result;
@@ -584,13 +584,19 @@ out:
int
param_set(param_t param, const void *val)
{
return param_set_internal(param, val, false, true);
return param_set_internal(param, val, false, true, false);
}
int
param_set_no_autosave(param_t param, const void *val)
{
return param_set_internal(param, val, false, true, true);
}
int
param_set_no_notification(param_t param, const void *val)
{
return param_set_internal(param, val, false, false);
return param_set_internal(param, val, false, false, false);
}
bool
@@ -643,7 +649,7 @@ param_reset(param_t param)
param_unlock();
if (s != NULL) {
param_notify_changes();
param_notify_changes(false);
}
return (!param_found);
@@ -663,7 +669,7 @@ param_reset_all(void)
param_unlock();
param_notify_changes();
param_notify_changes(false);
}
void
@@ -695,7 +701,7 @@ param_reset_excludes(const char *excludes[], int num_excludes)
param_unlock();
param_notify_changes();
param_notify_changes(false);
}
static const char *param_default_file = PX4_ROOTFSDIR"/eeprom/parameters";
@@ -851,6 +857,9 @@ param_export(int fd, bool only_unsaved)
debug("unrecognized parameter type");
goto out;
}
/* allow this process to be interrupted by another process / thread */
usleep(5);
}
result = 0;
@@ -955,7 +964,7 @@ param_import_callback(bson_decoder_t decoder, void *private, bson_node_t node)
goto out;
}
if (param_set_internal(param, v, state->mark_saved, true)) {
if (param_set_internal(param, v, state->mark_saved, true, false)) {
debug("error setting value for '%s'", node->name);
goto out;
}
src/modules/systemlib/param/param.h
+10
View File
@@ -211,6 +211,16 @@ __EXPORT int param_get(param_t param, void *val);
*/
__EXPORT int param_set(param_t param, const void *val);
/**
* Set the value of a parameter, but do not trigger an auto-save
*
* @param param A handle returned by param_find or passed by param_foreach.
* @param val The value to set; assumed to point to a variable of the parameter type.
* For structures, the pointer is assumed to point to a structure to be copied.
* @return Zero if the parameter's value could be set from a scalar, nonzero otherwise.
*/
__EXPORT int param_set_no_autosave(param_t param, const void *val);
/**
* Set the value of a parameter, but do not notify the system about the change.
*