Skip to content

Commit

Permalink
AP_Param: fixed setting of defaults for dynamic param trees
Browse files Browse the repository at this point in the history
when we load a VARPTR subtree we need to re-scan the parameter
defaults file from @ROMFS/defaults.parm in case there are defaults
applicable to this subtree
  • Loading branch information
tridge committed Feb 2, 2024
1 parent cd1e127 commit 408ed93
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
13 changes: 13 additions & 0 deletions libraries/AP_Param/AP_Param.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ uint16_t AP_Param::num_read_only;
ObjectBuffer_TS<AP_Param::param_save> AP_Param::save_queue{30};
bool AP_Param::registered_save_handler;

bool AP_Param::done_all_default_params;

AP_Param::defaults_list *AP_Param::default_list;

// we need a dummy object for the parameter save callback
Expand Down Expand Up @@ -1689,6 +1691,13 @@ void AP_Param::load_object_from_eeprom(const void *object_pointer, const struct
}
}

if (!done_all_default_params) {
/*
the new subtree may need defaults from defaults.parm
*/
reload_defaults_file(false);
}

// reset cached param counter as we may be loading a dynamic var_info
invalidate_count();
}
Expand Down Expand Up @@ -2250,6 +2259,7 @@ bool AP_Param::read_param_defaults_file(const char *filename, bool last_pass, ui
return false;
}

bool done_all = true;
char line[100];
while (AP::FS().fgets(line, sizeof(line)-1, file_apfs)) {
char *pname;
Expand All @@ -2270,6 +2280,7 @@ bool AP_Param::read_param_defaults_file(const char *filename, bool last_pass, ui
pname, filename);
#endif
}
done_all = false;
continue;
}
if (idx >= param_overrides_len) {
Expand All @@ -2289,6 +2300,8 @@ bool AP_Param::read_param_defaults_file(const char *filename, bool last_pass, ui
}
AP::FS().close(file_apfs);

done_all_default_params = done_all;

return true;
}

Expand Down
5 changes: 5 additions & 0 deletions libraries/AP_Param/AP_Param.h
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,11 @@ class AP_Param

static uint16_t _frame_type_flags;

/*
this is true if when scanning a defaults file we find all of the parameters
*/
static bool done_all_default_params;

/*
structure for built-in defaults file that can be modified using apj_tool.py
*/
Expand Down

0 comments on commit 408ed93

Please sign in to comment.