From 77082188d872373f7e2a1b074e6b8d2fb31bd198 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Thu, 22 Apr 2021 10:50:35 -0700 Subject: [PATCH] temperature_calibration:Use inttypes --- .../TemperatureCompensation.cpp | 14 +++++++------- .../TemperatureCompensationModule.cpp | 11 +++++++---- .../temperature_calibration/task.cpp | 4 ++-- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/modules/temperature_compensation/TemperatureCompensation.cpp b/src/modules/temperature_compensation/TemperatureCompensation.cpp index 502f40cd21..c7508f4fbc 100644 --- a/src/modules/temperature_compensation/TemperatureCompensation.cpp +++ b/src/modules/temperature_compensation/TemperatureCompensation.cpp @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (c) 2016-2020 PX4 Development Team. All rights reserved. + * Copyright (c) 2016-2020, 2021 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 @@ -433,38 +433,38 @@ int TemperatureCompensation::update_offsets_baro(int topic_instance, float tempe void TemperatureCompensation::print_status() { PX4_INFO("Temperature Compensation:"); - PX4_INFO(" gyro: enabled: %i", _parameters.gyro_tc_enable); + PX4_INFO(" gyro: enabled: %" PRId32, _parameters.gyro_tc_enable); if (_parameters.gyro_tc_enable == 1) { for (int i = 0; i < GYRO_COUNT_MAX; ++i) { uint8_t mapping = _gyro_data.device_mapping[i]; if (_gyro_data.device_mapping[i] != 255) { - PX4_INFO(" using device ID %i for topic instance %i", _parameters.gyro_cal_data[mapping].ID, i); + PX4_INFO(" using device ID %" PRId32 " for topic instance %i", _parameters.gyro_cal_data[mapping].ID, i); } } } - PX4_INFO(" accel: enabled: %i", _parameters.accel_tc_enable); + PX4_INFO(" accel: enabled: %" PRId32, _parameters.accel_tc_enable); if (_parameters.accel_tc_enable == 1) { for (int i = 0; i < ACCEL_COUNT_MAX; ++i) { uint8_t mapping = _accel_data.device_mapping[i]; if (_accel_data.device_mapping[i] != 255) { - PX4_INFO(" using device ID %i for topic instance %i", _parameters.accel_cal_data[mapping].ID, i); + PX4_INFO(" using device ID %" PRId32 " for topic instance %i", _parameters.accel_cal_data[mapping].ID, i); } } } - PX4_INFO(" baro: enabled: %i", _parameters.baro_tc_enable); + PX4_INFO(" baro: enabled: %" PRId32, _parameters.baro_tc_enable); if (_parameters.baro_tc_enable == 1) { for (int i = 0; i < BARO_COUNT_MAX; ++i) { uint8_t mapping = _baro_data.device_mapping[i]; if (_baro_data.device_mapping[i] != 255) { - PX4_INFO(" using device ID %i for topic instance %i", _parameters.baro_cal_data[mapping].ID, i); + PX4_INFO(" using device ID %" PRId32 " for topic instance %i", _parameters.baro_cal_data[mapping].ID, i); } } } diff --git a/src/modules/temperature_compensation/TemperatureCompensationModule.cpp b/src/modules/temperature_compensation/TemperatureCompensationModule.cpp index dae395858d..0d826f43a1 100644 --- a/src/modules/temperature_compensation/TemperatureCompensationModule.cpp +++ b/src/modules/temperature_compensation/TemperatureCompensationModule.cpp @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (c) 2016-2020 PX4 Development Team. All rights reserved. + * Copyright (c) 2016-2020, 2021 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 @@ -66,7 +66,8 @@ void TemperatureCompensationModule::parameters_update() int temp = _temperature_compensation.set_sensor_id_gyro(report.device_id, uorb_index); if (temp < 0) { - PX4_INFO("No temperature calibration available for gyro %i (device id %u)", uorb_index, report.device_id); + PX4_INFO("No temperature calibration available for gyro %" PRIu8 " (device id %" PRIu32 ")", uorb_index, + report.device_id); _corrections.gyro_device_ids[uorb_index] = 0; } else { @@ -83,7 +84,8 @@ void TemperatureCompensationModule::parameters_update() int temp = _temperature_compensation.set_sensor_id_accel(report.device_id, uorb_index); if (temp < 0) { - PX4_INFO("No temperature calibration available for accel %i (device id %u)", uorb_index, report.device_id); + PX4_INFO("No temperature calibration available for accel %" PRIu8 " (device id %" PRIu32 ")", uorb_index, + report.device_id); _corrections.accel_device_ids[uorb_index] = 0; } else { @@ -100,7 +102,8 @@ void TemperatureCompensationModule::parameters_update() int temp = _temperature_compensation.set_sensor_id_baro(report.device_id, uorb_index); if (temp < 0) { - PX4_INFO("No temperature calibration available for baro %i (device id %u)", uorb_index, report.device_id); + PX4_INFO("No temperature calibration available for baro %" PRIu8 " (device id %" PRIu32 ")", uorb_index, + report.device_id); _corrections.baro_device_ids[uorb_index] = 0; } else { diff --git a/src/modules/temperature_compensation/temperature_calibration/task.cpp b/src/modules/temperature_compensation/temperature_calibration/task.cpp index 049324c176..cb5d0112d8 100644 --- a/src/modules/temperature_compensation/temperature_calibration/task.cpp +++ b/src/modules/temperature_compensation/temperature_calibration/task.cpp @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (c) 2017 PX4 Development Team. All rights reserved. + * Copyright (c) 2017, 2021 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 @@ -116,7 +116,7 @@ void TemperatureCalibration::task_main() int32_t min_temp_rise = 24; param_get(param_find("SYS_CAL_TDEL"), &min_temp_rise); - PX4_INFO("Waiting for %i degrees difference in sensor temperature", min_temp_rise); + PX4_INFO("Waiting for %" PRId32 " degrees difference in sensor temperature", min_temp_rise); int32_t min_start_temp = 5; param_get(param_find("SYS_CAL_TMIN"), &min_start_temp);