From 8da84ad59b9d4fa6e0d112167506d1a29358ec83 Mon Sep 17 00:00:00 2001 From: eshifri Date: Wed, 1 Dec 2021 16:38:46 -0800 Subject: [PATCH 1/2] use yml instead of bin to construct notes file name from model file name. #1198 --- radio/src/gui/colorlcd/view_text.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/gui/colorlcd/view_text.cpp b/radio/src/gui/colorlcd/view_text.cpp index 7fab655fe..7a8511cdd 100644 --- a/radio/src/gui/colorlcd/view_text.cpp +++ b/radio/src/gui/colorlcd/view_text.cpp @@ -466,7 +466,7 @@ void readModelNotes() #if !defined(EEPROM) if(!notesFound) { modelNotesName.assign(g_eeGeneral.currModelFilename); - size_t index = modelNotesName.find(".bin"); + size_t index = modelNotesName.find(".yml"); if(index != std::string::npos) { modelNotesName.erase(index); From 3ab7489d6c5a69e90758673909789518b0544e42 Mon Sep 17 00:00:00 2001 From: eshifri Date: Wed, 1 Dec 2021 17:11:09 -0800 Subject: [PATCH 2/2] use definitions rather than hard-coded lines --- radio/src/gui/colorlcd/view_text.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/colorlcd/view_text.cpp b/radio/src/gui/colorlcd/view_text.cpp index 7a8511cdd..de7f2cc6f 100644 --- a/radio/src/gui/colorlcd/view_text.cpp +++ b/radio/src/gui/colorlcd/view_text.cpp @@ -438,6 +438,12 @@ static void replaceSpaceWithUnderscore(std::string& name) } while (index != std::string::npos); } +#if defined(SDCARD_YAML) +#define MODEL_FILE_EXT YAML_EXT +#else +#define MODEL_FILE_EXT MODELS_EXT +#endif + bool openNotes(const char buf[], std::string modelNotesName) { if(isFileAvailable(modelNotesName.c_str())) { @@ -466,7 +472,7 @@ void readModelNotes() #if !defined(EEPROM) if(!notesFound) { modelNotesName.assign(g_eeGeneral.currModelFilename); - size_t index = modelNotesName.find(".yml"); + size_t index = modelNotesName.find(MODEL_FILE_EXT); if(index != std::string::npos) { modelNotesName.erase(index);