Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(color): personal templates saved to wrong folder #4886

Merged
merged 2 commits into from
Apr 24, 2024
Merged

fix(color): personal templates saved to wrong folder #4886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99862b3
Change personal template folder name to match SD card layout.
Apr 16, 2024
9e9a159
Check which folder to save personal templates into.
Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions radio/src/gui/colorlcd/model_select.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,18 +420,26 @@ class ModelsPageBody : public Window
char modelName[size];
snprintf(modelName, size, "%s%s", model->modelName, YAML_EXT);
char templatePath[FF_MAX_LFN];
snprintf(templatePath, FF_MAX_LFN, "%s%c%s", PERS_TEMPL_PATH, '/',
modelName);
sdCheckAndCreateDirectory(TEMPLATES_PATH);
sdCheckAndCreateDirectory(PERS_TEMPL_PATH);
const char* persFolder = nullptr;
if (isFileAvailable(PERS_TEMPL_PATH)) {
persFolder = PERS_TEMPL_PATH;
} else if (isFileAvailable(PERS_TEMPL_PATH_OLD)) {
persFolder = PERS_TEMPL_PATH_OLD;
} else {
persFolder = PERS_TEMPL_PATH;
sdCheckAndCreateDirectory(PERS_TEMPL_PATH);
}
snprintf(templatePath, FF_MAX_LFN, "%s%c%s", persFolder, '/',
modelName);
if (isFileAvailable(templatePath)) {
new ConfirmDialog(parent, STR_FILE_EXISTS, STR_ASK_OVERWRITE, [=] {
sdCopyFile(model->modelFilename, MODELS_PATH, modelName,
PERS_TEMPL_PATH);
persFolder);
});
} else {
sdCopyFile(model->modelFilename, MODELS_PATH, modelName,
PERS_TEMPL_PATH);
persFolder);
}
});
}
Expand Down
3 changes: 2 additions & 1 deletion radio/src/sdcard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ extern FIL g_oLogFile;
#define UNUSED_MODELS_PATH MODELS_PATH PATH_SEPARATOR "UNUSED"
#define RADIO_PATH ROOT_PATH "RADIO" // no trailing slash = important
#define TEMPLATES_PATH ROOT_PATH "TEMPLATES"
#define PERS_TEMPL_PATH TEMPLATES_PATH "/PERSONAL"
#define PERS_TEMPL_PATH TEMPLATES_PATH "/2.Personal"
#define PERS_TEMPL_PATH_OLD TEMPLATES_PATH "/PERSONAL"
#define LOGS_PATH ROOT_PATH "LOGS"
#define SCREENSHOTS_PATH ROOT_PATH "SCREENSHOTS"
#define SOUNDS_PATH ROOT_PATH "SOUNDS/en"
Expand Down