From 3a436498507974f7286d6d18d27c1f8bd1f5f9e8 Mon Sep 17 00:00:00 2001 From: Lorenz Meier Date: Mon, 9 Feb 2015 13:58:49 +0100 Subject: sensors app: Fix loading of calibration params --- src/modules/sensors/sensors.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'src/modules/sensors') diff --git a/src/modules/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp index 61dd4ebe2..82671372d 100644 --- a/src/modules/sensors/sensors.cpp +++ b/src/modules/sensors/sensors.cpp @@ -1363,7 +1363,7 @@ Sensors::parameter_update_poll(bool forced) /* initially status is ok per config */ failed = false; - (void)sprintf(str, "CAL_GYRO%u_ID", s); + (void)sprintf(str, "CAL_GYRO%u_ID", i); int device_id; failed |= (OK != param_get(param_find(str), &device_id)); @@ -1395,9 +1395,10 @@ Sensors::parameter_update_poll(bool forced) res = ioctl(fd, GYROIOCSSCALE, (long unsigned int)&gscale); if (res) { warnx(CAL_FAILED_APPLY_CAL_MSG); + } else { + gyro_count++; + config_ok = true; } - gyro_count++; - config_ok = true; } break; } @@ -1429,7 +1430,7 @@ Sensors::parameter_update_poll(bool forced) /* initially status is ok per config */ failed = false; - (void)sprintf(str, "CAL_ACC%u_ID", s); + (void)sprintf(str, "CAL_ACC%u_ID", i); int device_id; failed |= (OK != param_get(param_find(str), &device_id)); @@ -1461,9 +1462,10 @@ Sensors::parameter_update_poll(bool forced) res = ioctl(fd, ACCELIOCSSCALE, (long unsigned int)&gscale); if (res) { warnx(CAL_FAILED_APPLY_CAL_MSG); + } else { + accel_count++; + config_ok = true; } - accel_count++; - config_ok = true; } break; } @@ -1495,7 +1497,7 @@ Sensors::parameter_update_poll(bool forced) /* initially status is ok per config */ failed = false; - (void)sprintf(str, "CAL_MAG%u_ID", s); + (void)sprintf(str, "CAL_MAG%u_ID", i); int device_id; failed |= (OK != param_get(param_find(str), &device_id)); @@ -1527,9 +1529,10 @@ Sensors::parameter_update_poll(bool forced) res = ioctl(fd, MAGIOCSSCALE, (long unsigned int)&gscale); if (res) { warnx(CAL_FAILED_APPLY_CAL_MSG); + } else { + mag_count++; + config_ok = true; } - mag_count++; - config_ok = true; } break; } -- cgit v1.2.3