From 153266b8dbddee42f613d41b8a29a7f2d6a0815a Mon Sep 17 00:00:00 2001 From: Andy Piper Date: Tue, 6 Aug 2024 19:29:41 +0100 Subject: [PATCH] AP_ESC_Telem: use highest ESC temp rather than motor temp --- libraries/AP_ESC_Telem/AP_ESC_Telem.cpp | 4 ++-- libraries/AP_ESC_Telem/AP_ESC_Telem.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/AP_ESC_Telem/AP_ESC_Telem.cpp b/libraries/AP_ESC_Telem/AP_ESC_Telem.cpp index 1f82ee3e8d..b94b7e4f26 100644 --- a/libraries/AP_ESC_Telem/AP_ESC_Telem.cpp +++ b/libraries/AP_ESC_Telem/AP_ESC_Telem.cpp @@ -260,13 +260,13 @@ bool AP_ESC_Telem::get_motor_temperature(uint8_t esc_index, int16_t& temp) const } // get the highest ESC temperature in centi-degrees if available, returns true if there is valid data for at least one ESC -bool AP_ESC_Telem::get_highest_motor_temperature(int16_t& temp) const +bool AP_ESC_Telem::get_highest_temperature(int16_t& temp) const { uint8_t valid_escs = 0; for (uint8_t i = 0; i < ESC_TELEM_MAX_ESCS; i++) { int16_t temp_temp; - if (get_motor_temperature(i, temp_temp)) { + if (get_temperature(i, temp_temp)) { temp = MAX(temp, temp_temp); valid_escs++; } diff --git a/libraries/AP_ESC_Telem/AP_ESC_Telem.h b/libraries/AP_ESC_Telem/AP_ESC_Telem.h index fa8a855729..2c93064b9e 100644 --- a/libraries/AP_ESC_Telem/AP_ESC_Telem.h +++ b/libraries/AP_ESC_Telem/AP_ESC_Telem.h @@ -53,7 +53,7 @@ public: bool get_motor_temperature(uint8_t esc_index, int16_t& temp) const; // get the highest ESC temperature in centi-degrees if available, returns true if there is valid data for at least one ESC - bool get_highest_motor_temperature(int16_t& temp) const; + bool get_highest_temperature(int16_t& temp) const; // get an individual ESC's current in Ampere if available, returns true on success bool get_current(uint8_t esc_index, float& amps) const;