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

AP_Param: fixed build of CubeOrange-periph

This commit is contained in:
Andrew Tridgell 2024-02-15 12:23:10 +11:00
parent 08468904db
commit df45140a56
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libraries/AP_Param/AP_Param.cpp
View File

@ -2369,8 +2369,7 @@ bool AP_Param::load_defaults_file(const char *filename, bool last_pass)
} }
#endif // AP_PARAM_DEFAULTS_FILE_PARSING_ENABLED #endif // AP_PARAM_DEFAULTS_FILE_PARSING_ENABLED
#if AP_PARAM_MAX_EMBEDDED_PARAM > 0 || defined(HAL_HAVE_AP_ROMFS_EMBEDDED_H)
#if AP_PARAM_MAX_EMBEDDED_PARAM > 0 || (AP_FILESYSTEM_FILE_READING_ENABLED && defined(HAL_HAVE_AP_ROMFS_EMBEDDED_H))
/* /*
count the number of parameter defaults present in supplied string count the number of parameter defaults present in supplied string
*/ */
@ -2416,18 +2415,6 @@ bool AP_Param::count_param_defaults(const volatile char *ptr, int32_t length, ui
return true; return true;
} }
#if AP_PARAM_MAX_EMBEDDED_PARAM > 0
/*
* load a default set of parameters from a embedded parameter region
* @last_pass: if this is the last pass on defaults - unknown parameters are
* ignored but if this is set a warning will be emitted
*/
void AP_Param::load_embedded_param_defaults(bool last_pass)
{
load_param_defaults(param_defaults_data.data, param_defaults_data.length, last_pass);
}
#endif // AP_PARAM_MAX_EMBEDDED_PARAM > 0
/* /*
* load parameter defaults from supplied string * load parameter defaults from supplied string
*/ */
@ -2508,7 +2495,21 @@ void AP_Param::load_param_defaults(const volatile char *ptr, int32_t length, boo
} }
num_param_overrides = num_defaults; num_param_overrides = num_defaults;
} }
#endif // AP_PARAM_MAX_EMBEDDED_PARAM > 0 #endif // AP_PARAM_MAX_EMBEDDED_PARAM > 0 || defined(HAL_HAVE_AP_ROMFS_EMBEDDED_H)
#if AP_PARAM_MAX_EMBEDDED_PARAM > 0
/*
* load a default set of parameters from a embedded parameter region
* @last_pass: if this is the last pass on defaults - unknown parameters are
* ignored but if this is set a warning will be emitted
*/
void AP_Param::load_embedded_param_defaults(bool last_pass)
{
load_param_defaults(param_defaults_data.data, param_defaults_data.length, last_pass);
}
#endif // AP_PARAM_MAX_EMBEDDED_PARAM > 0
/* /*
find a default value given a pointer to a default value in flash find a default value given a pointer to a default value in flash