From 1642732e8f61c12c5c0de39268486960aba380f6 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sun, 8 Jan 2017 19:00:45 +0100 Subject: [PATCH] 3djc/horus checklist improvement (#4195) * Add the possibility of modelfilename.txt to Horus checklist * Typo * Cosmetics --- radio/src/gui/480x272/menus.cpp | 5 ++++- radio/src/gui/gui_common_arm.cpp | 18 +++++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/480x272/menus.cpp b/radio/src/gui/480x272/menus.cpp index 8ecc49597..206a45559 100644 --- a/radio/src/gui/480x272/menus.cpp +++ b/radio/src/gui/480x272/menus.cpp @@ -72,8 +72,11 @@ bool menuModelNotes(event_t event) strcpy(s_text_file, MODELS_PATH "/"); char *buf = strcat_currentmodelname(&s_text_file[sizeof(MODELS_PATH)]); strcpy(buf, TEXT_EXT); + if (!isFileAvailable(s_text_file)) { + char *buf = strAppendFilename(&s_text_file[sizeof(MODELS_PATH)], g_eeGeneral.currModelFilename, LEN_MODEL_FILENAME); + strcpy(buf, TEXT_EXT); + } } - return menuTextView(event); } diff --git a/radio/src/gui/gui_common_arm.cpp b/radio/src/gui/gui_common_arm.cpp index fc5da2d99..eac9d896c 100644 --- a/radio/src/gui/gui_common_arm.cpp +++ b/radio/src/gui/gui_common_arm.cpp @@ -527,7 +527,7 @@ bool isTelemetryProtocolAvailable(int protocol) return false; } #endif - + if (protocol== PROTOCOL_PULSES_CROSSFIRE) { return false; } @@ -537,7 +537,7 @@ bool isTelemetryProtocolAvailable(int protocol) return false; } #endif - + #if defined(PCBHORUS) if (protocol == PROTOCOL_FRSKY_D_SECONDARY) { return false; @@ -568,7 +568,19 @@ bool modelHasNotes() char filename[sizeof(MODELS_PATH)+1+sizeof(g_model.header.name)+sizeof(TEXT_EXT)] = MODELS_PATH "/"; char *buf = strcat_currentmodelname(&filename[sizeof(MODELS_PATH)]); strcpy(buf, TEXT_EXT); - return isFileAvailable(filename); + if (isFileAvailable(filename)) { + return true; + } + +#if !defined(EEPROM) + buf = strAppendFilename(&filename[sizeof(MODELS_PATH)], g_eeGeneral.currModelFilename, LEN_MODEL_FILENAME); + strcpy(buf, TEXT_EXT); + if (isFileAvailable(filename)) { + return true; + } +#endif + + return false; } int getFirstAvailable(int min, int max, IsValueAvailable isValueAvailable)