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

temperature_calibration: properly initialize gyro subscriptions & bounds checking

Browse Source
This commit is contained in:
Beat Küng
2017-01-25 22:43:29 +01:00
committed by Lorenz Meier
parent e74e883c56
commit 54e9bda412
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/events/temperature_calibration.cpp
+5 -6
View File
@@ -152,6 +152,10 @@ void Tempcal::task_main()
unsigned num_gyro = orb_group_count(ORB_ID(sensor_gyro)); unsigned num_gyro = orb_group_count(ORB_ID(sensor_gyro));
unsigned num_samples[SENSOR_COUNT_MAX] = {0}; unsigned num_samples[SENSOR_COUNT_MAX] = {0};
if (num_gyro > SENSOR_COUNT_MAX) {
num_gyro = SENSOR_COUNT_MAX;
}
bool _cold_soaked[SENSOR_COUNT_MAX] = {false}; bool _cold_soaked[SENSOR_COUNT_MAX] = {false};
bool _hot_soaked[SENSOR_COUNT_MAX] = {false}; bool _hot_soaked[SENSOR_COUNT_MAX] = {false};
bool _tempcal_complete[SENSOR_COUNT_MAX] = {false}; bool _tempcal_complete[SENSOR_COUNT_MAX] = {false};
@@ -160,12 +164,7 @@ void Tempcal::task_main()
float _ref_temp[SENSOR_COUNT_MAX]; float _ref_temp[SENSOR_COUNT_MAX];
for (unsigned i = 0; i < num_gyro; i++) { for (unsigned i = 0; i < num_gyro; i++) {
if (gyro_sub[i] < 0) { gyro_sub[i] = orb_subscribe_multi(ORB_ID(sensor_gyro), i);
gyro_sub[i] = orb_subscribe_multi(ORB_ID(sensor_gyro), i);
}
}
for (unsigned i = 0; i < num_gyro; i++) {
fds[i].fd = gyro_sub[i]; fds[i].fd = gyro_sub[i];
fds[i].events = POLLIN; fds[i].events = POLLIN;
} }