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

fixed support for AP_PARAM_SPARE 

spare group elements are needed if we remove a group parameter
This commit is contained in:
Andrew Tridgell 2012-02-13 07:43:09 +11:00
parent accaf9bb30
commit 678a1df3be
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/AP_Common/AP_Param.cpp
View File

@ -148,7 +148,8 @@ bool AP_Param::check_var_info(void)
} else {
uint8_t size = type_size((enum ap_var_type)type);
if (size == 0) {
// not a valid type - the top level list can't contain AP_PARAM_NONE
// not a valid type - the top level list can't contain
// AP_PARAM_NONE or AP_PARAM_SPARE
return false;
}
total_size += size + sizeof(struct Param_header);
@ -287,6 +288,8 @@ const struct AP_Param::Info *AP_Param::find_var_info_group(const struct GroupInf
if (info != NULL) {
return info;
}
} else if (type == AP_PARAM_SPARE) {
continue;
} else if ((uintptr_t)this == base + PGM_POINTER(&group_info[i].offset)) {
*group_element = GROUP_OFFSET(group_base, i, group_shift);
*group_ret = &group_info[i];
@ -413,6 +416,8 @@ AP_Param::find_group(const char *name, uint8_t vindex, const struct GroupInfo *g
if (ap != NULL) {
return ap;
}
} else if (type == AP_PARAM_SPARE) {
continue;
} else if (strcasecmp_P(name, group_info[i].name) == 0) {
uintptr_t p = PGM_POINTER(&_var_info[vindex].ptr);
*ptype = (enum ap_var_type)type;
@ -591,6 +596,8 @@ AP_Param *AP_Param::next_group(uint8_t vindex, const struct GroupInfo *group_inf
if (ap != NULL) {
return ap;
}
} else if (type == AP_PARAM_SPARE) {
continue;
} else {
if (*found_current) {
// got a new one

5
libraries/AP_Common/AP_Param.h
View File

@ -33,6 +33,11 @@
// declare a group var_info line
#define AP_GROUPINFO(name, class, element) { AP_CLASSTYPE(class, element), name, AP_VAROFFSET(class, element) }
// declare a spare (unused) group var_info line
// use these when a parameter is removed to ensure that the index of
// the other parameters doesn't change
#define AP_GROUPSPARE { AP_PARAM_SPARE, "" }
// declare a nested group entry in a group var_info
#define AP_NESTEDGROUPINFO(class) { AP_PARAM_GROUP, "", 0, class::var_info }