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

AP_Param: make load_defaults_file() available on ChibiOS

This commit is contained in:
Andrew Tridgell 2022-09-13 19:26:41 +10:00
parent 8e102ecfcc
commit 39fdc38c71
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_Param/AP_Param.cpp
View File

@ -2149,7 +2149,7 @@ bool AP_Param::parse_param_line(char *line, char **vname, float &value, bool &re
}
#if HAL_OS_POSIX_IO == 1
#if HAVE_FILESYSTEM_SUPPORT
// increments num_defaults for each default found in filename
bool AP_Param::count_defaults_in_file(const char *filename, uint16_t &num_defaults)
@ -2290,7 +2290,7 @@ bool AP_Param::load_defaults_file(const char *filename, bool last_pass)
return true;
}
#endif // HAL_OS_POSIX_IO
#endif // HAVE_FILESYSTEM_SUPPORT
#if AP_PARAM_MAX_EMBEDDED_PARAM > 0
/*

5
libraries/AP_Param/AP_Param.h
View File

@ -547,6 +547,8 @@ public:
static bool load_int32(uint16_t key, uint32_t group_element, int32_t &value);
#endif
static bool load_defaults_file(const char *filename, bool last_pass);
protected:
// store default value in linked list
@ -696,14 +698,11 @@ private:
static bool parse_param_line(char *line, char **vname, float &value, bool &read_only);
#if HAL_OS_POSIX_IO == 1
/*
load a parameter defaults file. This happens as part of load_all()
*/
static bool count_defaults_in_file(const char *filename, uint16_t &num_defaults);
static bool read_param_defaults_file(const char *filename, bool last_pass);
static bool load_defaults_file(const char *filename, bool last_pass);
#endif
/*
load defaults from embedded parameters