1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-25 17:25:18 +03:00

Changed throttle field in osd to always show throttle output

This commit is contained in:
Airwide 2020-09-29 20:59:43 +02:00
parent fbd8d426a7
commit ec44b038ec

View file

@ -867,20 +867,17 @@ void osdCrosshairPosition(uint8_t *x, uint8_t *y)
} }
/** /**
* Formats throttle position prefixed by its symbol. If autoThr * Formats throttle position prefixed by its symbol.
* is true and the navigation system is controlling THR, it * Shows output to motor, not stick position
* uses the THR value applied by the system rather than the
* input value received by the sticks.
**/ **/
static void osdFormatThrottlePosition(char *buff, bool autoThr, textAttributes_t *elemAttr) static void osdFormatThrottlePosition(char *buff, bool autoThr, textAttributes_t *elemAttr)
{ {
buff[0] = SYM_BLANK; buff[0] = SYM_BLANK;
buff[1] = SYM_THR; buff[1] = SYM_THR;
int16_t thr = rxGetChannelValue(THROTTLE); int16_t thr = rcCommand[THROTTLE];
if (autoThr && navigationIsControllingThrottle()) { if (autoThr && navigationIsControllingThrottle()) {
buff[0] = SYM_AUTO_THR0; buff[0] = SYM_AUTO_THR0;
buff[1] = SYM_AUTO_THR1; buff[1] = SYM_AUTO_THR1;
thr = rcCommand[THROTTLE];
if (isFixedWingAutoThrottleManuallyIncreased()) if (isFixedWingAutoThrottleManuallyIncreased())
TEXT_ATTRIBUTES_ADD_BLINK(*elemAttr); TEXT_ATTRIBUTES_ADD_BLINK(*elemAttr);
} }