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

AP_Mount: Xacti get_param_name_str returns empty string on failure

Browse Source
This commit is contained in:
Randy Mackay 2023-10-02 20:10:16 +09:00 committed by Andrew Tridgell
parent 046cf5630e
commit 18bf9669b0
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/AP_Mount/AP_Mount_Xacti.cpp
View File

@ -633,12 +633,13 @@ void AP_Mount_Xacti::handle_param_save_response(AP_DroneCAN* ap_dronecan, const
} }
// get parameter name for a particular param enum value // get parameter name for a particular param enum value
// returns an empty string if not found (which should never happen)
const char* AP_Mount_Xacti::get_param_name_str(Param param) const const char* AP_Mount_Xacti::get_param_name_str(Param param) const
{ {
// check to avoid reading beyond end of array. This should never happen // check to avoid reading beyond end of array. This should never happen
if ((uint8_t)param > ARRAY_SIZE(_param_names)) { if ((uint8_t)param > ARRAY_SIZE(_param_names)) {
INTERNAL_ERROR(AP_InternalError::error_t::invalid_arg_or_result); INTERNAL_ERROR(AP_InternalError::error_t::invalid_arg_or_result);
return nullptr; return "";
} }
return _param_names[(uint8_t)param]; return _param_names[(uint8_t)param];
} }
@ -683,10 +684,6 @@ bool AP_Mount_Xacti::get_param_string(Param param)
// convert param to string // convert param to string
const char* param_name_str = get_param_name_str(param); const char* param_name_str = get_param_name_str(param);
if (param_name_str == nullptr) {
return false;
}
if (_detected_modules[_instance].ap_dronecan->get_parameter_on_node(_detected_modules[_instance].node_id, param_name_str, &param_string_cb)) { if (_detected_modules[_instance].ap_dronecan->get_parameter_on_node(_detected_modules[_instance].node_id, param_name_str, &param_string_cb)) {
last_send_getset_param_ms = AP_HAL::millis(); last_send_getset_param_ms = AP_HAL::millis();
return true; return true;
@ -705,9 +702,6 @@ bool AP_Mount_Xacti::process_set_param_int32_queue()
if (_set_param_int32_queue->pop(param_to_set)) { if (_set_param_int32_queue->pop(param_to_set)) {
// convert param to string // convert param to string
const char* param_name_str = get_param_name_str(param_to_set.param); const char* param_name_str = get_param_name_str(param_to_set.param);
if (param_name_str == nullptr) {
return false;
}
if (_detected_modules[_instance].ap_dronecan->set_parameter_on_node(_detected_modules[_instance].node_id, param_name_str, param_to_set.value, &param_int_cb)) { if (_detected_modules[_instance].ap_dronecan->set_parameter_on_node(_detected_modules[_instance].node_id, param_name_str, param_to_set.value, &param_int_cb)) {
last_send_getset_param_ms = AP_HAL::millis(); last_send_getset_param_ms = AP_HAL::millis();
return true; return true;

1
libraries/AP_Mount/AP_Mount_Xacti.h
View File

@ -134,6 +134,7 @@ private:
static const char* _param_names[]; // array of Xacti parameter strings static const char* _param_names[]; // array of Xacti parameter strings
// get parameter name for a particular param enum value // get parameter name for a particular param enum value
// returns an empty string if not found (which should never happen)
const char* get_param_name_str(Param param) const; const char* get_param_name_str(Param param) const;
// helper function to get and set parameters // helper function to get and set parameters