From e515d53aaa448d9fdf788c4c502120fa7fe886be Mon Sep 17 00:00:00 2001 From: Armel FAUVEAU Date: Wed, 11 Feb 2026 01:20:16 +0100 Subject: [PATCH] Improve GUI --- App/ui/helper.c | 12 ++++++------ App/ui/main.c | 17 ++++++++++++----- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/App/ui/helper.c b/App/ui/helper.c index f49492c0..5f2d46c7 100644 --- a/App/ui/helper.c +++ b/App/ui/helper.c @@ -130,17 +130,17 @@ void UI_PrintStringSmallNormalInverse(const char *pString, uint8_t Start, uint8_ if (End != 0 && x_end > End) x_end = End; - gFrameBuffer[Line][x_start - 3] ^= 0x3E; - gFrameBuffer[Line][x_start - 2] ^= 0x7F; - gFrameBuffer[Line][x_start - 1] ^= 0xFF; + gFrameBuffer[Line][x_start - 2] ^= 0x3E; + gFrameBuffer[Line][x_start - 1] ^= 0x7F; + //gFrameBuffer[Line][x_start - 1] ^= 0xFF; for (uint8_t x = x_start; x < x_end; x++) { gFrameBuffer[Line][x] ^= 0xFF; gFrameBuffer[Line - 1][x] ^= 0x80; } - gFrameBuffer[Line][x_end + 0] ^= 0xFF; - gFrameBuffer[Line][x_end + 1] ^= 0x7F; - gFrameBuffer[Line][x_end + 2] ^= 0x3E; + //gFrameBuffer[Line][x_end + 0] ^= 0xFF; + gFrameBuffer[Line][x_end + 0] ^= 0x7F; + gFrameBuffer[Line][x_end + 1] ^= 0x3E; } diff --git a/App/ui/main.c b/App/ui/main.c index 6156efe5..50d9eb10 100644 --- a/App/ui/main.c +++ b/App/ui/main.c @@ -821,7 +821,7 @@ void UI_DisplayMain(void) if (IS_MR_CHANNEL(gEeprom.ScreenChannel[vfo_num])) { // channel mode - const unsigned int x = 3; + const unsigned int x = 2; const bool inputting = gInputBoxIndex != 0 && gEeprom.TX_VFO == vfo_num; if (!inputting || gScanStateDir != SCAN_OFF) sprintf(String, "%04u", gEeprom.ScreenChannel[vfo_num] + 1); @@ -948,10 +948,10 @@ void UI_DisplayMain(void) displayStr = String; } - GUI_DisplaySmallest(displayStr, xDisplay, line == 0 ? 2 : 34, false, true); + GUI_DisplaySmallest(displayStr, xDisplay, line == 0 ? 1 : 33, false, true); for (uint8_t x = xStart; x < 128; x++) { - gFrameBuffer[line][x] ^= 0xFE; + gFrameBuffer[line][x] ^= 0x7F; } } @@ -962,10 +962,10 @@ void UI_DisplayMain(void) uint8_t xStart = 117; uint8_t xDisplay = 119; - GUI_DisplaySmallest(displayStr, xDisplay, line == 0 ? 2 : 34, false, true); + GUI_DisplaySmallest(displayStr, xDisplay, line == 0 ? 1 : 33, false, true); for (uint8_t x = xStart; x < 128; x++) { - gFrameBuffer[line][x] ^= 0xFE; + gFrameBuffer[line][x] ^= 0x7F; } } @@ -1552,11 +1552,18 @@ void UI_DisplayMain(void) if (isMainOnly() && !gDTMF_InputMode) { sprintf(String, "VFO %s", activeTxVFO ? "B" : "A"); + GUI_DisplaySmallest(String, 108, 50, false, true); + + for (uint8_t x = 107; x < 128; x++) { + gFrameBuffer[6][x] ^= 0xFE; + } + /* UI_PrintStringSmallBold(String, 92, 0, 6); for (uint8_t i = 92; i < 128; i++) { gFrameBuffer[6][i] ^= 0x7F; } + */ } //#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS //}