Bars display problem on 9XR-PRO
This commit is contained in:
@@ -928,8 +928,14 @@ void menuModelTelemetry(uint8_t event)
|
|||||||
#if defined(CPUARM)
|
#if defined(CPUARM)
|
||||||
putsMixerSource(TELEM_COL1, y, barSource, m_posHorz==0 ? attr : 0);
|
putsMixerSource(TELEM_COL1, y, barSource, m_posHorz==0 ? attr : 0);
|
||||||
if (barSource) {
|
if (barSource) {
|
||||||
putsChannelValue(TELEM_BARS_COLMIN, y, barSource, bar.barMin, (m_posHorz==1 ? attr : 0) | LEFT);
|
if (barSource <= MIXSRC_LAST_CH) {
|
||||||
putsChannelValue(TELEM_BARS_COLMAX, y, barSource, bar.barMax, (m_posHorz==2 ? attr : 0) | LEFT);
|
putsChannelValue(TELEM_BARS_COLMIN, y, barSource, calc100toRESX(bar.barMin), (m_posHorz==1 ? attr : 0) | LEFT);
|
||||||
|
putsChannelValue(TELEM_BARS_COLMAX, y, barSource, calc100toRESX(bar.barMax), (m_posHorz==2 ? attr : 0) | LEFT);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
putsChannelValue(TELEM_BARS_COLMIN, y, barSource, bar.barMin, (m_posHorz==1 ? attr : 0) | LEFT);
|
||||||
|
putsChannelValue(TELEM_BARS_COLMAX, y, barSource, bar.barMax, (m_posHorz==2 ? attr : 0) | LEFT);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
lcd_putsiAtt(TELEM_COL1, y, STR_VTELEMCHNS, barSource, m_posHorz==0 ? attr : 0);
|
lcd_putsiAtt(TELEM_COL1, y, STR_VTELEMCHNS, barSource, m_posHorz==0 ? attr : 0);
|
||||||
|
|||||||
@@ -246,6 +246,10 @@ bool displayGaugesTelemetryScreen(FrSkyScreenData & screen)
|
|||||||
#if defined(CPUARM)
|
#if defined(CPUARM)
|
||||||
getvalue_t barMin = bar.barMin;
|
getvalue_t barMin = bar.barMin;
|
||||||
getvalue_t barMax = bar.barMax;
|
getvalue_t barMax = bar.barMax;
|
||||||
|
if (source <= MIXSRC_LAST_CH) {
|
||||||
|
barMin = calc100toRESX(barMin);
|
||||||
|
barMax = calc100toRESX(barMax);
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
getvalue_t barMin = convertBarTelemValue(source, bar.barMin);
|
getvalue_t barMin = convertBarTelemValue(source, bar.barMin);
|
||||||
getvalue_t barMax = convertBarTelemValue(source, 255-bar.barMax);
|
getvalue_t barMax = convertBarTelemValue(source, 255-bar.barMax);
|
||||||
|
|||||||
Reference in New Issue
Block a user