From 00eae055acb916ae33ad336af99fae4b0d8f9e28 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Thu, 23 Dec 2021 15:25:12 -0500 Subject: [PATCH] lib/sensor_calibration: don't save uninitialized priority parameter immediately --- src/lib/sensor_calibration/Accelerometer.cpp | 3 ++- src/lib/sensor_calibration/Gyroscope.cpp | 3 ++- src/lib/sensor_calibration/Magnetometer.cpp | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/lib/sensor_calibration/Accelerometer.cpp b/src/lib/sensor_calibration/Accelerometer.cpp index 4344952894..bd8c9b96cb 100644 --- a/src/lib/sensor_calibration/Accelerometer.cpp +++ b/src/lib/sensor_calibration/Accelerometer.cpp @@ -203,9 +203,10 @@ void Accelerometer::ParametersUpdate() if (_priority != -1) { PX4_ERR("%s %" PRIu32 " (%" PRId8 ") invalid priority %" PRId32 ", resetting to %" PRId32, SensorString(), _device_id, _calibration_index, _priority, new_priority); + + SetCalibrationParam(SensorString(), "PRIO", _calibration_index, new_priority); } - SetCalibrationParam(SensorString(), "PRIO", _calibration_index, new_priority); _priority = new_priority; } diff --git a/src/lib/sensor_calibration/Gyroscope.cpp b/src/lib/sensor_calibration/Gyroscope.cpp index 44dfa64ca9..815e782036 100644 --- a/src/lib/sensor_calibration/Gyroscope.cpp +++ b/src/lib/sensor_calibration/Gyroscope.cpp @@ -188,9 +188,10 @@ void Gyroscope::ParametersUpdate() if (_priority != -1) { PX4_ERR("%s %" PRIu32 " (%" PRId8 ") invalid priority %" PRId32 ", resetting to %" PRId32, SensorString(), _device_id, _calibration_index, _priority, new_priority); + + SetCalibrationParam(SensorString(), "PRIO", _calibration_index, new_priority); } - SetCalibrationParam(SensorString(), "PRIO", _calibration_index, new_priority); _priority = new_priority; } diff --git a/src/lib/sensor_calibration/Magnetometer.cpp b/src/lib/sensor_calibration/Magnetometer.cpp index 878ff04059..54011e2858 100644 --- a/src/lib/sensor_calibration/Magnetometer.cpp +++ b/src/lib/sensor_calibration/Magnetometer.cpp @@ -188,9 +188,10 @@ void Magnetometer::ParametersUpdate() if (_priority != -1) { PX4_ERR("%s %" PRIu32 " (%" PRId8 ") invalid priority %" PRId32 ", resetting to %" PRId32, SensorString(), _device_id, _calibration_index, _priority, new_priority); + + SetCalibrationParam(SensorString(), "PRIO", _calibration_index, new_priority); } - SetCalibrationParam(SensorString(), "PRIO", _calibration_index, new_priority); _priority = new_priority; }