Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 16:55:36 +03:00
Code Issues Wiki Activity

Fix compile error if USE_ESC_SENSOR is not defined (#8403)

Browse source 
Fix compile error if USE_ESC_SENSOR is not defined
This commit is contained in:
Michael Keller 2019-06-12 13:18:31 +12:00
parent 1de260c8fb
commit e1cb42295e
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/osd/osd_elements.c
View file

@ -64,6 +64,7 @@
#include "drivers/display.h"
#include "drivers/max7456_symbols.h"
#include "drivers/pwm_output.h"
#include "drivers/time.h"
#include "drivers/vtx_common.h"
@ -157,21 +158,22 @@ static uint32_t blinkBits[(OSD_ITEM_COUNT + 31) / 32];
#define IS_BLINK(item) (blinkBits[(item) / 32] & (1 << ((item) % 32)))
#define BLINK(item) (IS_BLINK(item) && blinkState)
#if defined(USE_ESC_SENSOR) || defined(USE_RPM_FILTER)
#if defined(USE_ESC_SENSOR) || defined(USE_DSHOT_TELEMETRY)
typedef int (*getEscRpmOrFreqFnPtr)(int i);
static int getEscRpm(int i)
{
#ifdef USE_RPM_FILTER
#ifdef USE_DSHOT_TELEMETRY
if (motorConfig()->dev.useDshotTelemetry) {
return 100.0f / (motorConfig()->motorPoleCount / 2.0f) * getDshotTelemetry(i);
}
#endif
#ifdef USE_ESC_SENSOR
if (featureIsEnabled(FEATURE_ESC_SENSOR)) {
return calcEscRpm(getEscSensorData(i)->rpm);
} else {
return 0;
}
#endif
return 0;
}
static int getEscRpmFreq(int i)
@ -648,7 +650,7 @@ static void osdElementEscTemperature(osdElementParms_t *element)
}
#endif // USE_ESC_SENSOR
#if defined(USE_ESC_SENSOR) || defined(USE_RPM_FILTER)
#if defined(USE_ESC_SENSOR) || defined(USE_DSHOT_TELEMETRY)
static void osdElementEscRpm(osdElementParms_t *element)
{
renderOsdEscRpmOrFreq(&getEscRpm,element);
@ -1362,7 +1364,7 @@ const osdElementDrawFn osdElementDrawFunction[OSD_ITEM_COUNT] = {
#ifdef USE_ESC_SENSOR
[OSD_ESC_TMP] = osdElementEscTemperature,
#endif
#if defined(USE_RPM_FILTER) || defined(USE_ESC_SENSOR)
#if defined(USE_DSHOT_TELEMETRY) || defined(USE_ESC_SENSOR)
[OSD_ESC_RPM] = osdElementEscRpm,
#endif
[OSD_REMAINING_TIME_ESTIMATE] = osdElementRemainingTimeEstimate,
@ -1397,7 +1399,7 @@ const osdElementDrawFn osdElementDrawFunction[OSD_ITEM_COUNT] = {
[OSD_STICK_OVERLAY_RIGHT] = osdElementStickOverlay,
#endif
[OSD_DISPLAY_NAME] = osdElementDisplayName,
#if defined(USE_RPM_FILTER) || defined(USE_ESC_SENSOR)
#if defined(USE_DSHOT_TELEMETRY) || defined(USE_ESC_SENSOR)
[OSD_ESC_RPM_FREQ] = osdElementEscRpmFreq,
#endif
};
@ -1444,7 +1446,7 @@ void osdAnalyzeActiveElements(void)
}
#endif
#if defined(USE_RPM_FILTER) || defined(USE_ESC_SENSOR)
#if defined(USE_DSHOT_TELEMETRY) || defined(USE_ESC_SENSOR)
if ((featureIsEnabled(FEATURE_ESC_SENSOR)) || (motorConfig()->dev.useDshotTelemetry)) {
osdAddActiveElement(OSD_ESC_RPM);
osdAddActiveElement(OSD_ESC_RPM_FREQ);