piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fall back to /RADIO/models.yml in case /MODELS/models.yml is not present

Browse Source 
and do not load models.txt unless we are explicitly converting.
This commit is contained in:
Raphael Coeffic
2021-11-22 12:52:53 +01:00
committed by Raphael Coeffic
parent 5290820ada
commit 959f6c18e7
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/storage/modelslist.cpp
+6 -1
View File
@@ -352,6 +352,10 @@ bool ModelsList::loadYaml()
{
char line[LEN_MODELS_IDX_LINE+1];
FRESULT result = f_open(&file, MODELSLIST_YAML_PATH, FA_OPEN_EXISTING | FA_READ);
if (result != FR_OK) {
result = f_open(&file, FALLBACK_MODELSLIST_YAML_PATH, FA_OPEN_EXISTING | FA_READ);
}
if (result == FR_OK) {
// YAML reader
TRACE("YAML modelslist reader");
@@ -395,7 +399,8 @@ bool ModelsList::load(Format fmt)
FILINFO fno;
if (fmt == Format::txt ||
(fmt == Format::yaml_txt &&
f_stat(MODELSLIST_YAML_PATH, &fno) != FR_OK)) {
f_stat(MODELSLIST_YAML_PATH, &fno) != FR_OK &&
f_stat(FALLBACK_MODELSLIST_YAML_PATH, &fno) != FR_OK)) {
res = loadTxt();
} else {
res = loadYaml();