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

Move YaML models list to /MODELS

Browse Source 
Resolves #1073
This commit is contained in:
Raphael Coeffic
2021-11-22 12:52:53 +01:00
committed by Raphael Coeffic
parent 6e51c70aa7
commit 5290820ada
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/sdcard.h
+1 -1
View File
@@ -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"
radio/src/storage/modelslist.cpp
+3 -3
View File
@@ -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;
radio/src/targets/simu/simufatfs.cpp
+1 -1
View File
@@ -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;