From a68ad817d77d518844ff9f47231dca434c82d9b3 Mon Sep 17 00:00:00 2001 From: Malte Langermann <54738901+gagarinlg@users.noreply.github.com> Date: Sun, 24 Dec 2023 01:10:44 +0100 Subject: [PATCH] fix(bw): Progressive checklist `=` behaviour was reversed (#4458) Co-authored-by: Peter Feerick --- radio/src/gui/common/stdlcd/view_text.cpp | 32 +++++++++++++++++------ 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/radio/src/gui/common/stdlcd/view_text.cpp b/radio/src/gui/common/stdlcd/view_text.cpp index cc2475f4d..80c2a82d2 100644 --- a/radio/src/gui/common/stdlcd/view_text.cpp +++ b/radio/src/gui/common/stdlcd/view_text.cpp @@ -22,7 +22,7 @@ #include "opentx.h" constexpr uint32_t TEXT_FILE_MAXSIZE = 2048; -constexpr char NON_CHECKABLE_PREFIX = '='; +constexpr char CHECKABLE_PREFIX = '='; int checklistPosition; static void sdReadTextFile(const char * filename, char lines[TEXT_VIEWER_LINES][LCD_COLS + 1], int & lines_count) @@ -99,9 +99,25 @@ void readModelNotes() LED_ERROR_BEGIN(); strcpy(reusableBuffer.viewText.filename, MODELS_PATH "/"); - char *buf = strcat_currentmodelname(&reusableBuffer.viewText.filename[sizeof(MODELS_PATH)], 0); + char *buf = strcat_currentmodelname( + &reusableBuffer.viewText.filename[sizeof(MODELS_PATH)], 0); strcpy(buf, TEXT_EXT); + if (!isFileAvailable(reusableBuffer.viewText.filename)) { + buf = strcat_currentmodelname( + &reusableBuffer.viewText.filename[sizeof(MODELS_PATH)], ' '); + strcpy(buf, TEXT_EXT); + +#if defined(STORAGE_MODELSLIST) + if (!isFileAvailable(reusableBuffer.viewText.filename)) { + buf = strAppendFilename( + &reusableBuffer.viewText.filenam[sizeof(MODELS_PATH)], + g_eeGeneral.currModelFilename, LEN_MODEL_FILENAME); + strcpy(buf, TEXT_EXT); + } +#endif + } + waitKeysReleased(); event_t event = EVT_ENTRY; reusableBuffer.viewText.pushMenu = false; @@ -169,8 +185,13 @@ void menuTextView(event_t event) for (int i=0; i