From d33ba58b1ebe40a87f1adebcf27ccd8576d4b5a7 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 9 Dec 2023 02:28:22 +0100 Subject: [PATCH] fix(bw128): Show first 4 trims when radio has > 4 trims (#4392) --- radio/src/gui/128x64/view_main.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/radio/src/gui/128x64/view_main.cpp b/radio/src/gui/128x64/view_main.cpp index 4dc2932b4..e6dbf6908 100644 --- a/radio/src/gui/128x64/view_main.cpp +++ b/radio/src/gui/128x64/view_main.cpp @@ -217,6 +217,13 @@ void displayTrims(uint8_t phase) lcdDrawSolidVerticalLine(xm + 2, ym - 1, 3); lcdDrawSolidVerticalLine(xm + 3, ym - 2, 5); } + if (g_model.displayTrims != DISPLAY_TRIMS_NEVER && dir != 0 && i < 4) { + if (g_model.displayTrims == DISPLAY_TRIMS_ALWAYS || + (trimsDisplayTimer > 0 && (trimsDisplayMask & (1 << i)))) { + lcdDrawNumber(dir > 0 ? 12 : 40, xm - 2, -abs(dir), + TINSIZE | VERTICAL); + } + } } } else { @@ -260,6 +267,15 @@ void displayTrims(uint8_t phase) lcdDrawSolidHorizontalLine(xm - 1, ym - 2, 3); lcdDrawSolidHorizontalLine(xm - 2, ym - 3, 5); } + if (g_model.displayTrims != DISPLAY_TRIMS_NEVER && dir != 0 && i < 4) { + if (g_model.displayTrims == DISPLAY_TRIMS_ALWAYS || + (trimsDisplayTimer > 0 && (trimsDisplayMask & (1 << i)))) { + lcdDrawNumber( + (xm < LCD_W / 2 ? (dir > 0 ? TRIM_LH_POS : TRIM_LH_NEG) + : (dir > 0 ? TRIM_RH_POS : TRIM_RH_NEG)), + ym - 2, -abs(dir), TINSIZE); + } + } } }