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

APM: support 16 character parameter names

Browse Source
This commit is contained in:
Andrew Tridgell 2012-11-20 21:36:13 +11:00
parent b0713ba412
commit a600ccece5
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ArduPlane/GCS_Mavlink.pde
View File

@ -1326,11 +1326,11 @@ void GCS_MAVLINK::handleMessage(mavlink_message_t* msg)
} else { } else {
vp = AP_Param::find(packet.param_id, &p_type); vp = AP_Param::find(packet.param_id, &p_type);
if (vp == NULL) { if (vp == NULL) {
gcs_send_text_fmt(PSTR("Unknown parameter /%s"), packet.param_id); gcs_send_text_fmt(PSTR("Unknown parameter %.16s"), packet.param_id);
break; break;
} }
} }
char param_name[ONBOARD_PARAM_NAME_LENGTH]; char param_name[AP_MAX_NAME_SIZE];
vp->copy_name(param_name, sizeof(param_name), true); vp->copy_name(param_name, sizeof(param_name), true);
float value = vp->cast_to_float(p_type); float value = vp->cast_to_float(p_type);
@ -1680,9 +1680,9 @@ mission_failed:
// set parameter // set parameter
char key[ONBOARD_PARAM_NAME_LENGTH+1]; char key[AP_MAX_NAME_SIZE+1];
strncpy(key, (char *)packet.param_id, ONBOARD_PARAM_NAME_LENGTH); strncpy(key, (char *)packet.param_id, AP_MAX_NAME_SIZE);
key[ONBOARD_PARAM_NAME_LENGTH] = 0; key[AP_MAX_NAME_SIZE] = 0;
// find the requested parameter // find the requested parameter
vp = AP_Param::find(key, &var_type); vp = AP_Param::find(key, &var_type);
@ -2021,7 +2021,7 @@ GCS_MAVLINK::queued_param_send()
// if the parameter can be cast to float, report it here and break out of the loop // if the parameter can be cast to float, report it here and break out of the loop
value = vp->cast_to_float(_queued_parameter_type); value = vp->cast_to_float(_queued_parameter_type);
char param_name[ONBOARD_PARAM_NAME_LENGTH]; char param_name[AP_MAX_NAME_SIZE];
vp->copy_name(param_name, sizeof(param_name), true); vp->copy_name(param_name, sizeof(param_name), true);
mavlink_msg_param_value_send( mavlink_msg_param_value_send(

2
ArduPlane/defines.h
View File

@ -232,8 +232,6 @@ enum gcs_severity {
// be // be
// safe // safe
#define ONBOARD_PARAM_NAME_LENGTH 15
// convert a boolean (0 or 1) to a sign for multiplying (0 maps to 1, 1 maps // convert a boolean (0 or 1) to a sign for multiplying (0 maps to 1, 1 maps
// to -1) // to -1)
#define BOOL_TO_SIGN(bvalue) ((bvalue) ? -1 : 1) #define BOOL_TO_SIGN(bvalue) ((bvalue) ? -1 : 1)