fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-02 05:04:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

lib/sensor_calibration: FindCurrentCalibrationIndex only call param_find once

Browse Source
This commit is contained in:
Daniel Agar 2023-02-14 19:22:57 -05:00
parent 0e1e1afcf9
commit 5e9459fcbd
No known key found for this signature in database
GPG Key ID: FD3CBA98017A69DE
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/lib/sensor_calibration/Utilities.cpp
View File

@ -1,6 +1,6 @@
/****************************************************************************
*
* Copyright (c) 2020-2021 PX4 Development Team. All rights reserved.
* Copyright (c) 2020-2023 PX4 Development Team. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -63,24 +63,21 @@ int8_t FindCurrentCalibrationIndex(const char *sensor_type, uint32_t device_id)
}
for (unsigned i = 0; i < MAX_SENSOR_COUNT; ++i) {
char str[20] {};
sprintf(str, "CAL_%s%u_ID", sensor_type, i);
char str[16 + 1];
snprintf(str, sizeof(str), "CAL_%s%u_ID", sensor_type, i);
int32_t device_id_val = 0;
param_t param_handle = param_find_no_notification(str);
param_t param_handle = param_find(str);
if (param_handle == PARAM_INVALID) {
continue;
}
// find again and get value, but this time mark it active
if (param_get(param_find(str), &device_id_val) != OK) {
continue;
}
int32_t device_id_val;
if ((uint32_t)device_id_val == device_id) {
return i;
if (param_get(param_handle, &device_id_val) == PX4_OK) {
if (static_cast<uint32_t>(device_id_val) == device_id) {
return i;
}
}
}