From e0c6122208ef98282c5f188c01ff2007223e57db Mon Sep 17 00:00:00 2001 From: 3djc Date: Thu, 19 Nov 2020 16:31:03 +0100 Subject: [PATCH] Support more ghost menu commands (#8101) * Support more ghost menu commands --- radio/src/gui/480x272/radio_ghost_menu.cpp | 14 +++++++++++--- radio/src/gui/common/stdlcd/radio_ghost_menu.cpp | 2 ++ radio/src/targets/horus/board.h | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/480x272/radio_ghost_menu.cpp b/radio/src/gui/480x272/radio_ghost_menu.cpp index db71cf393..5425c57bd 100644 --- a/radio/src/gui/480x272/radio_ghost_menu.cpp +++ b/radio/src/gui/480x272/radio_ghost_menu.cpp @@ -92,9 +92,17 @@ bool menuGhostModuleConfig(event_t event) lcdDrawText(xOffset2, yOffset + line * lineSpacing, &reusableBuffer.ghostMenu.line[line].menuText[reusableBuffer.ghostMenu.line[line].splitLine], flags); } else { - if (reusableBuffer.ghostMenu.line[line].lineFlags & GHST_LINE_FLAGS_LABEL_SELECT) - flags = INVERS; - lcdDrawText(xOffset, yOffset + line * lineSpacing, reusableBuffer.ghostMenu.line[line].menuText, flags); + if (reusableBuffer.ghostMenu.line[line].lineFlags & GHST_LINE_FLAGS_LABEL_SELECT) { + lcdDrawText(xOffset, yOffset + line * lineSpacing, reusableBuffer.ghostMenu.line[line].menuText, INVERS); + } + else if (reusableBuffer.ghostMenu.line[line].lineFlags & GHST_LINE_FLAGS_VALUE_EDIT) { + if (BLINK_ON_PHASE) { + lcdDrawText(xOffset, yOffset + line * lineSpacing, reusableBuffer.ghostMenu.line[line].menuText, flags); + } + } + else { + lcdDrawText(xOffset, yOffset + line * lineSpacing, reusableBuffer.ghostMenu.line[line].menuText, flags); + } } } diff --git a/radio/src/gui/common/stdlcd/radio_ghost_menu.cpp b/radio/src/gui/common/stdlcd/radio_ghost_menu.cpp index d710c35d5..0ae5affac 100644 --- a/radio/src/gui/common/stdlcd/radio_ghost_menu.cpp +++ b/radio/src/gui/common/stdlcd/radio_ghost_menu.cpp @@ -104,6 +104,8 @@ void menuGhostModuleConfig(event_t event) else { if (reusableBuffer.ghostMenu.line[line].lineFlags & GHST_LINE_FLAGS_LABEL_SELECT) flags = INVERS; + if (reusableBuffer.ghostMenu.line[line].lineFlags & GHST_LINE_FLAGS_VALUE_EDIT) + flags |= BLINK; lcdDrawText(xOffset, yOffset + line * FH, reusableBuffer.ghostMenu.line[line].menuText, flags); } } diff --git a/radio/src/targets/horus/board.h b/radio/src/targets/horus/board.h index d440d2623..38daec33c 100644 --- a/radio/src/targets/horus/board.h +++ b/radio/src/targets/horus/board.h @@ -636,7 +636,7 @@ void sportUpdatePowerInit(); // Aux serial port driver #if defined(RADIO_TX16S) - #define DEBUG_BAUDRATE 250000 + #define DEBUG_BAUDRATE 400000 #else #define DEBUG_BAUDRATE 115200 #endif