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 up adjustment range OSD display and made it configurable.

Browse source
This commit is contained in:
mikeller 2017-11-12 03:53:44 +13:00
parent 41806636d6
commit fc28817448
5 changed files with 26 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/fc/rc_adjustments.c
View file

@ -42,10 +42,6 @@
#include "io/beeper.h"
#include "io/motors.h"
#if defined(USE_OSD) && defined(USE_OSD_ADJUSTMENTS)
#include "io/osd.h"
#endif
#include "fc/config.h"
#include "fc/controlrate_profile.h"
#include "fc/rc_adjustments.h"
@ -207,7 +203,7 @@ static const adjustmentConfig_t defaultAdjustmentConfigs[ADJUSTMENT_FUNCTION_COU
};
#if defined(USE_OSD) && defined(USE_OSD_ADJUSTMENTS)
static const char * adjustmentLabels[] = {
static const char const *adjustmentLabels[] = {
"RC RATE",
"RC EXPO",
"THROTTLE EXPO",
@ -233,6 +229,9 @@ static const char * adjustmentLabels[] = {
"D SETPOINT TRANSITION",
"HORIZON STRENGTH",
};
const char const *adjustmentRangeName;
int adjustmentRangeValue = -1;
#endif
#define ADJUSTMENT_FUNCTION_CONFIG_INDEX_OFFSET 1
@ -434,6 +433,10 @@ void processRcAdjustments(controlRateConfig_t *controlRateConfig)
if (cmp32(now, adjustmentState->timeoutAt) >= 0) {
adjustmentState->timeoutAt = now + RESET_FREQUENCY_2HZ;
MARK_ADJUSTMENT_FUNCTION_AS_READY(adjustmentIndex);
#if defined(USE_OSD) && defined(USE_OSD_ADJUSTMENTS)
adjustmentRangeValue = -1;
#endif
}
if (!canUseRxData) {
@ -467,8 +470,9 @@ void processRcAdjustments(controlRateConfig_t *controlRateConfig)
}
#if defined(USE_OSD) && defined(USE_OSD_ADJUSTMENTS)
if (newValue != -1) {
osdShowAdjustment(adjustmentLabels[adjustmentFunction], newValue);
if (newValue != -1 && adjustmentState->config->adjustmentFunction != ADJUSTMENT_RATE_PROFILE) { // Rate profile already has an OSD element
adjustmentRangeName = &adjustmentLabels[adjustmentFunction - 1][0];
adjustmentRangeValue = newValue;
}
#else
UNUSED(newValue);