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

AP_Param: add in nested group offset in load for conversion

This commit is contained in:
Andrew Tridgell 2016-03-08 15:29:48 +11:00
parent c15fa950c0
commit 71b6d3e33d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_Param/AP_Param.cpp
View File

@ -935,7 +935,13 @@ bool AP_Param::load(void)
// if the value isn't stored in EEPROM then set the default value
if (ginfo != NULL) {
ptrdiff_t base = (ptrdiff_t)info->ptr;
set_value((enum ap_var_type)phdr.type, (void*)(base + ginfo->offset),
// add in nested group offset
ptrdiff_t group_offset = 0;
for (uint8_t i=0; i<group_nesting.level; i++) {
group_offset += group_nesting.group_ret[i]->offset;
}
set_value((enum ap_var_type)phdr.type, (void*)(base + ginfo->offset + group_offset),
get_default_value(&ginfo->def_value));
} else {
set_value((enum ap_var_type)phdr.type, (void*)info->ptr,