Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Param: fixed setting of defaults for dynamic param trees 

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
This commit is contained in:
Andrew Tridgell 2024-02-02 12:24:00 +11:00 committed by Randy Mackay
parent 9bf73db55e
commit e2bccebfb8
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/AP_Param/AP_Param.cpp
View File

@ -115,6 +115,8 @@ uint16_t AP_Param::num_read_only;
ObjectBuffer_TS<AP_Param::param_save> AP_Param::save_queue{30}; ObjectBuffer_TS<AP_Param::param_save> AP_Param::save_queue{30};
bool AP_Param::registered_save_handler; bool AP_Param::registered_save_handler;
bool AP_Param::done_all_default_params;
AP_Param::defaults_list *AP_Param::default_list; AP_Param::defaults_list *AP_Param::default_list;
// we need a dummy object for the parameter save callback // we need a dummy object for the parameter save callback
@ -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 // reset cached param counter as we may be loading a dynamic var_info
invalidate_count(); invalidate_count();
} }
@ -2250,6 +2259,7 @@ bool AP_Param::read_param_defaults_file(const char *filename, bool last_pass, ui
return false; return false;
} }
bool done_all = true;
char line[100]; char line[100];
while (AP::FS().fgets(line, sizeof(line)-1, file_apfs)) { while (AP::FS().fgets(line, sizeof(line)-1, file_apfs)) {
char *pname; char *pname;
@ -2270,6 +2280,7 @@ bool AP_Param::read_param_defaults_file(const char *filename, bool last_pass, ui
pname, filename); pname, filename);
#endif #endif
} }
done_all = false;
continue; continue;
} }
if (idx >= param_overrides_len) { if (idx >= param_overrides_len) {
@ -2289,6 +2300,8 @@ bool AP_Param::read_param_defaults_file(const char *filename, bool last_pass, ui
} }
AP::FS().close(file_apfs); AP::FS().close(file_apfs);
done_all_default_params = done_all;
return true; return true;
} }

5
libraries/AP_Param/AP_Param.h
View File

@ -636,6 +636,11 @@ private:
static uint16_t _frame_type_flags; 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 structure for built-in defaults file that can be modified using apj_tool.py
*/ */