Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 14:38:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Param: rework embedded defualts list as no longer needed

Browse Source
This commit is contained in:
Iampete1 2022-12-30 02:19:56 +00:00 committed by Andrew Tridgell
parent 02af134ba6
commit 49d23e16df
2 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libraries/AP_Param/AP_Param.cpp
View File

@ -102,9 +102,6 @@ ObjectBuffer_TS<AP_Param::param_save> AP_Param::save_queue{30};
bool AP_Param::registered_save_handler; bool AP_Param::registered_save_handler;
AP_Param::defaults_list *AP_Param::default_list; AP_Param::defaults_list *AP_Param::default_list;
#if AP_PARAM_MAX_EMBEDDED_PARAM > 0
AP_Param::defaults_list *AP_Param::embedded_default_list;
#endif
// we need a dummy object for the parameter save callback // we need a dummy object for the parameter save callback
static AP_Param save_dummy; static AP_Param save_dummy;
@ -2404,9 +2401,6 @@ void AP_Param::load_embedded_param_defaults(bool last_pass)
num_read_only++; num_read_only++;
} }
idx++; idx++;
#if AP_PARAM_DEFAULTS_ENABLED
add_default(vp, value, embedded_default_list);
#endif
if (!vp->configured_in_storage()) { if (!vp->configured_in_storage()) {
vp->set_float(value, var_type); vp->set_float(value, var_type);
} }
@ -2700,17 +2694,6 @@ void AP_Param::check_default(AP_Param *ap, float *default_value)
if (default_value == nullptr || ap == nullptr) { if (default_value == nullptr || ap == nullptr) {
return; return;
} }
#if AP_PARAM_MAX_EMBEDDED_PARAM > 0
// Check embedded list first
if (embedded_default_list != nullptr) {
for (defaults_list *item = embedded_default_list; item; item = item->next) {
if (item->ap == ap) {
*default_value = item->val;
return;
}
}
}
#endif
if (default_list != nullptr) { if (default_list != nullptr) {
for (defaults_list *item = default_list; item; item = item->next) { for (defaults_list *item = default_list; item; item = item->next) {
if (item->ap == ap) { if (item->ap == ap) {
@ -2721,11 +2704,18 @@ void AP_Param::check_default(AP_Param *ap, float *default_value)
} }
} }
void AP_Param::add_default(AP_Param *ap, float v, defaults_list*& list) void AP_Param::add_default(AP_Param *ap, float v)
{ {
if (list != nullptr) { // Embedded defaults trump runtime, don't allow override
for (uint16_t i=0; i<num_param_overrides; i++) {
if (ap == param_overrides[i].object_ptr) {
return;
}
}
if (default_list != nullptr) {
// check is param is already in list // check is param is already in list
for (defaults_list *item = list; item; item = item->next) { for (defaults_list *item = default_list; item; item = item->next) {
// update existing entry // update existing entry
if (item->ap == ap) { if (item->ap == ap) {
item->val = v; item->val = v;
@ -2741,8 +2731,8 @@ void AP_Param::add_default(AP_Param *ap, float v, defaults_list*& list)
} }
new_item->ap = ap; new_item->ap = ap;
new_item->val = v; new_item->val = v;
new_item->next = list; new_item->next = default_list;
list = new_item; default_list = new_item;
} }
#endif // AP_PARAM_DEFAULTS_ENABLED #endif // AP_PARAM_DEFAULTS_ENABLED

6
libraries/AP_Param/AP_Param.h
View File

@ -572,7 +572,7 @@ public:
protected: protected:
// store default value in linked list // store default value in linked list
static void add_default(AP_Param *ap, float v) { add_default(ap, v, default_list); } static void add_default(AP_Param *ap, float v);
private: private:
static AP_Param *_singleton; static AP_Param *_singleton;
@ -801,11 +801,7 @@ private:
float val; float val;
defaults_list *next; defaults_list *next;
}; };
#if AP_PARAM_MAX_EMBEDDED_PARAM > 0
static defaults_list *embedded_default_list;
#endif
static defaults_list *default_list; static defaults_list *default_list;
static void add_default(AP_Param *ap, float v, defaults_list *&list);
static void check_default(AP_Param *ap, float *default_value); static void check_default(AP_Param *ap, float *default_value);
}; };