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

AP_Param: fixed Vector3f elements with 16 character names

This commit is contained in:
Andrew Tridgell 2012-11-20 22:27:11 +11:00
parent bc3c94140f
commit 5002be9aa8
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/AP_Common/AP_Param.cpp
View File

@ -460,7 +460,7 @@ bool AP_Param::scan(const AP_Param::Param_header *target, uint16_t *pofs)
void AP_Param::add_vector3f_suffix(char *buffer, size_t buffer_size, uint8_t idx) void AP_Param::add_vector3f_suffix(char *buffer, size_t buffer_size, uint8_t idx)
{ {
uint8_t len = strnlen(buffer, buffer_size); uint8_t len = strnlen(buffer, buffer_size);
if ((size_t)(len+3) >= buffer_size) { if ((size_t)(len+2) > buffer_size) {
// the suffix doesn't fit // the suffix doesn't fit
return; return;
} }
@ -472,7 +472,9 @@ void AP_Param::add_vector3f_suffix(char *buffer, size_t buffer_size, uint8_t idx
} else if (idx == 2) { } else if (idx == 2) {
buffer[len+1] = 'Z'; buffer[len+1] = 'Z';
} }
buffer[len+2] = 0; if ((size_t)(len+2) < buffer_size) {
buffer[len+2] = 0;
}
} }
// Copy the variable's whole name to the supplied buffer. // Copy the variable's whole name to the supplied buffer.
@ -528,11 +530,12 @@ AP_Param::find_group(const char *name, uint8_t vindex, const struct GroupInfo *g
return (AP_Param *)(p + PGM_POINTER(&group_info[i].offset)); return (AP_Param *)(p + PGM_POINTER(&group_info[i].offset));
} else if (type == AP_PARAM_VECTOR3F) { } else if (type == AP_PARAM_VECTOR3F) {
// special case for finding Vector3f elements // special case for finding Vector3f elements
uint8_t suffix_len = strlen_P(group_info[i].name); uint8_t suffix_len = strnlen_P(group_info[i].name, AP_MAX_NAME_SIZE);
if (strncmp_P(name, group_info[i].name, suffix_len) == 0 && if (strncmp_P(name, group_info[i].name, suffix_len) == 0 &&
name[suffix_len] == '_' && name[suffix_len] == '_' &&
name[suffix_len+1] != 0 && (name[suffix_len+1] == 'X' ||
name[suffix_len+2] == 0) { name[suffix_len+1] == 'Y' ||
name[suffix_len+1] == 'Z')) {
uintptr_t p = PGM_POINTER(&_var_info[vindex].ptr); uintptr_t p = PGM_POINTER(&_var_info[vindex].ptr);
AP_Float *v = (AP_Float *)(p + PGM_POINTER(&group_info[i].offset)); AP_Float *v = (AP_Float *)(p + PGM_POINTER(&group_info[i].offset));
*ptype = AP_PARAM_FLOAT; *ptype = AP_PARAM_FLOAT;