Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 17:25:20 +03:00
Code Issues Wiki Activity

Fixed max esc rpm osd statistic when dshot telemetry is enabled

Browse source
This commit is contained in:
phobos- 2020-05-02 17:36:28 +02:00
parent 3271ee3e13
commit ad39dc4839
1 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/main/osd/osd.c
View file

@ -53,6 +53,7 @@
#include "config/feature.h" #include "config/feature.h"
#include "drivers/display.h" #include "drivers/display.h"
#include "drivers/dshot.h"
#include "drivers/flash.h" #include "drivers/flash.h"
#include "drivers/osd_symbols.h" #include "drivers/osd_symbols.h"
#include "drivers/sdcard.h" #include "drivers/sdcard.h"
@ -66,6 +67,7 @@
#include "flight/gyroanalyse.h" #include "flight/gyroanalyse.h"
#endif #endif
#include "flight/imu.h" #include "flight/imu.h"
#include "flight/mixer.h"
#include "flight/position.h" #include "flight/position.h"
#include "io/asyncfatfs/asyncfatfs.h" #include "io/asyncfatfs/asyncfatfs.h"
@ -76,6 +78,7 @@
#include "osd/osd.h" #include "osd/osd.h"
#include "osd/osd_elements.h" #include "osd/osd_elements.h"
#include "pg/motor.h"
#include "pg/pg.h" #include "pg/pg.h"
#include "pg/pg_ids.h" #include "pg/pg_ids.h"
#include "pg/stats.h" #include "pg/stats.h"
@ -451,6 +454,28 @@ static void osdResetStats(void)
stats.min_rssi_dbm = CRSF_SNR_MAX; stats.min_rssi_dbm = CRSF_SNR_MAX;
} }
#if defined(USE_ESC_SENSOR) || defined(USE_DSHOT_TELEMETRY)
static int32_t getAverageEscRpm(void)
{
#ifdef USE_DSHOT_TELEMETRY
if (motorConfig()->dev.useDshotTelemetry) {
uint32_t rpm = 0;
for (int i = 0; i < getMotorCount(); i++) {
rpm += getDshotTelemetry(i);
}
rpm = rpm / getMotorCount();
return rpm * 100 * 2 / motorConfig()->motorPoleCount;
}
#endif
#ifdef USE_ESC_SENSOR
if (featureIsEnabled(FEATURE_ESC_SENSOR)) {
return calcEscRpm(osdEscDataCombined->rpm);
}
#endif
return 0;
}
#endif
static void osdUpdateStats(void) static void osdUpdateStats(void)
{ {
int16_t value = 0; int16_t value = 0;
@ -513,16 +538,20 @@ static void osdUpdateStats(void)
} }
} }
#endif #endif
#ifdef USE_ESC_SENSOR #ifdef USE_ESC_SENSOR
if (featureIsEnabled(FEATURE_ESC_SENSOR)) { if (featureIsEnabled(FEATURE_ESC_SENSOR)) {
value = osdEscDataCombined->temperature; value = osdEscDataCombined->temperature;
if (stats.max_esc_temp < value) { if (stats.max_esc_temp < value) {
stats.max_esc_temp = value; stats.max_esc_temp = value;
} }
value = calcEscRpm(osdEscDataCombined->rpm); }
if (stats.max_esc_rpm < value) { #endif
stats.max_esc_rpm = value;
} #if defined(USE_ESC_SENSOR) || defined(USE_DSHOT_TELEMETRY)
int32_t rpm = getAverageEscRpm();
if (stats.max_esc_rpm < rpm) {
stats.max_esc_rpm = rpm;
} }
#endif #endif
} }
@ -729,7 +758,9 @@ static bool osdDisplayStat(int statistic, uint8_t displayRow)
tfp_sprintf(buff, "%d%c", osdConvertTemperatureToSelectedUnit(stats.max_esc_temp), osdGetTemperatureSymbolForSelectedUnit()); tfp_sprintf(buff, "%d%c", osdConvertTemperatureToSelectedUnit(stats.max_esc_temp), osdGetTemperatureSymbolForSelectedUnit());
osdDisplayStatisticLabel(displayRow, "MAX ESC TEMP", buff); osdDisplayStatisticLabel(displayRow, "MAX ESC TEMP", buff);
return true; return true;
#endif
#if defined(USE_ESC_SENSOR) || defined(USE_DSHOT_TELEMETRY)
case OSD_STAT_MAX_ESC_RPM: case OSD_STAT_MAX_ESC_RPM:
itoa(stats.max_esc_rpm, buff, 10); itoa(stats.max_esc_rpm, buff, 10);
osdDisplayStatisticLabel(displayRow, "MAX ESC RPM", buff); osdDisplayStatisticLabel(displayRow, "MAX ESC RPM", buff);