From d3eb24bc013a47cde8c6ffe3bd577af06697a982 Mon Sep 17 00:00:00 2001 From: "DOMINATOR\\Eugene" Date: Sun, 28 Oct 2018 19:38:08 +0200 Subject: [PATCH] AP_Airspeed: Temperature conversion in consistence with other libraries --- libraries/AP_Airspeed/AP_Airspeed_UAVCAN.cpp | 4 ++-- libraries/AP_Airspeed/AP_Airspeed_UAVCAN.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/AP_Airspeed/AP_Airspeed_UAVCAN.cpp b/libraries/AP_Airspeed/AP_Airspeed_UAVCAN.cpp index 01bcf40b38..d20c33030d 100644 --- a/libraries/AP_Airspeed/AP_Airspeed_UAVCAN.cpp +++ b/libraries/AP_Airspeed/AP_Airspeed_UAVCAN.cpp @@ -129,7 +129,7 @@ void AP_Airspeed_UAVCAN::handle_airspeed(AP_UAVCAN* ap_uavcan, uint8_t node_id, if (driver != nullptr) { WITH_SEMAPHORE(driver->_sem_airspeed); driver->_pressure = cb.msg->differential_pressure; - driver->_temperature = cb.msg->static_air_temperature; + driver->_temperature = cb.msg->static_air_temperature - C_TO_KELVIN; driver->_last_sample_time_ms = AP_HAL::millis(); } @@ -164,7 +164,7 @@ bool AP_Airspeed_UAVCAN::get_temperature(float &temperature) return false; } - temperature = _temperature - C_TO_KELVIN; + temperature = _temperature; return true; } diff --git a/libraries/AP_Airspeed/AP_Airspeed_UAVCAN.h b/libraries/AP_Airspeed/AP_Airspeed_UAVCAN.h index 3a0a9e10d8..e505c2a92a 100644 --- a/libraries/AP_Airspeed/AP_Airspeed_UAVCAN.h +++ b/libraries/AP_Airspeed/AP_Airspeed_UAVCAN.h @@ -32,7 +32,7 @@ private: static AP_Airspeed_UAVCAN* get_uavcan_backend(AP_UAVCAN* ap_uavcan, uint8_t node_id); float _pressure; // Pascal - float _temperature; // Kelvin + float _temperature; // Celcius uint32_t _last_sample_time_ms; HAL_Semaphore _sem_airspeed;