diff --git a/radio/src/sdcard.h b/radio/src/sdcard.h index 825f57976..5e3c1689f 100644 --- a/radio/src/sdcard.h +++ b/radio/src/sdcard.h @@ -61,7 +61,7 @@ extern FIL g_oLogFile; const char RADIO_MODELSLIST_PATH[] = RADIO_PATH PATH_SEPARATOR "models.txt"; const char RADIO_SETTINGS_PATH[] = RADIO_PATH PATH_SEPARATOR RADIO_FILENAME; #if defined(SDCARD_YAML) -const char RADIO_MODELSLIST_YAML_PATH[] = RADIO_PATH PATH_SEPARATOR "models.yml"; +const char MODELSLIST_YAML_PATH[] = MODELS_PATH PATH_SEPARATOR "models.yml"; const char RADIO_SETTINGS_YAML_PATH[] = RADIO_PATH PATH_SEPARATOR "radio.yml"; #endif #define SPLASH_FILE "splash.png" diff --git a/radio/src/storage/modelslist.cpp b/radio/src/storage/modelslist.cpp index ad0b91ee6..90e16820a 100644 --- a/radio/src/storage/modelslist.cpp +++ b/radio/src/storage/modelslist.cpp @@ -351,7 +351,7 @@ bool ModelsList::loadTxt() bool ModelsList::loadYaml() { char line[LEN_MODELS_IDX_LINE+1]; - FRESULT result = f_open(&file, RADIO_MODELSLIST_YAML_PATH, FA_OPEN_EXISTING | FA_READ); + FRESULT result = f_open(&file, MODELSLIST_YAML_PATH, FA_OPEN_EXISTING | FA_READ); if (result == FR_OK) { // YAML reader TRACE("YAML modelslist reader"); @@ -395,7 +395,7 @@ bool ModelsList::load(Format fmt) FILINFO fno; if (fmt == Format::txt || (fmt == Format::yaml_txt && - f_stat(RADIO_MODELSLIST_YAML_PATH, &fno) != FR_OK)) { + f_stat(MODELSLIST_YAML_PATH, &fno) != FR_OK)) { res = loadTxt(); } else { res = loadYaml(); @@ -423,7 +423,7 @@ void ModelsList::save() #if !defined(SDCARD_YAML) FRESULT result = f_open(&file, RADIO_MODELSLIST_PATH, FA_CREATE_ALWAYS | FA_WRITE); #else - FRESULT result = f_open(&file, RADIO_MODELSLIST_YAML_PATH, FA_CREATE_ALWAYS | FA_WRITE); + FRESULT result = f_open(&file, MODELSLIST_YAML_PATH, FA_CREATE_ALWAYS | FA_WRITE); #endif if (result != FR_OK) return; diff --git a/radio/src/targets/simu/simufatfs.cpp b/radio/src/targets/simu/simufatfs.cpp index 2a176823b..92d2ac27e 100644 --- a/radio/src/targets/simu/simufatfs.cpp +++ b/radio/src/targets/simu/simufatfs.cpp @@ -127,7 +127,7 @@ bool redirectToSettingsDirectory(const std::string & path) #if defined(COLORLCD) if (path == RADIO_MODELSLIST_PATH || path == RADIO_SETTINGS_PATH #if defined(SDCARD_YAML) - || path == RADIO_MODELSLIST_YAML_PATH || path == RADIO_SETTINGS_YAML_PATH + || path == MODELSLIST_YAML_PATH || path == RADIO_SETTINGS_YAML_PATH #endif ) { return true;