Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-01 21:48:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Param: use get_custom_defaults_file()

Browse Source
This commit is contained in:
Andrew Tridgell 2016-01-07 09:09:54 +11:00
parent b4cc3d9668
commit 415d800957
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/AP_Param/AP_Param.cpp
View File

@ -1081,9 +1081,7 @@ bool AP_Param::load_all(void)
if the HAL specifies a defaults parameter file then override if the HAL specifies a defaults parameter file then override
defaults using that file defaults using that file
*/ */
#ifdef HAL_PARAM_DEFAULTS_PATH load_defaults_file(hal.util->get_custom_defaults_file());
load_defaults_file(HAL_PARAM_DEFAULTS_PATH);
#endif
while (ofs < _storage.size()) { while (ofs < _storage.size()) {
_storage.read_block(&phdr, ofs, sizeof(phdr)); _storage.read_block(&phdr, ofs, sizeof(phdr));
@ -1553,6 +1551,9 @@ bool AP_Param::parse_param_line(char *line, char **vname, float &value)
*/ */
bool AP_Param::load_defaults_file(const char *filename) bool AP_Param::load_defaults_file(const char *filename)
{ {
if (filename == nullptr) {
return false;
}
FILE *f = fopen(filename, "r"); FILE *f = fopen(filename, "r");
if (f == NULL) { if (f == NULL) {
return false; return false;