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

fix: B&W needs to know about spaces as well!

Browse Source 
Finishes #645 as model notes with `_` and `0x20`
(space) are tested for  model notes filename also.
This commit is contained in:
Peter Feerick
2022-08-14 11:50:40 +10:00
committed by Peter Feerick
parent c088d1d2f9
commit 7800a6de42
4 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/212x64/model_select.cpp
+2 -2
View File
@@ -65,7 +65,7 @@ void onModelSelectMenu(const char * result)
}
else if (result == STR_DELETE_MODEL) {
char * nametmp = reusableBuffer.modelsel.mainname;
strcat_modelname (nametmp, sub);
strcat_modelname (nametmp, sub, 0);
POPUP_CONFIRMATION(STR_DELETEMODEL, nullptr);
SET_WARNING_INFO(nametmp, sizeof(g_model.header.name), 0);
}
@@ -115,7 +115,7 @@ void menuModelSelect(event_t event)
case EVT_KEY_LONG(KEY_EXIT):
if (s_copyMode && s_copyTgtOfs == 0 && g_eeGeneral.currModel != sub && modelExists(sub)) {
char * nametmp = reusableBuffer.modelsel.mainname;
strcat_modelname (nametmp, sub);
strcat_modelname (nametmp, sub, 0);
POPUP_CONFIRMATION(STR_DELETEMODEL, nullptr);
SET_WARNING_INFO(nametmp, sizeof(g_model.header.name), 0);
killEvents(event);
radio/src/gui/common/stdlcd/model_notes.cpp
+7 -1
View File
@@ -25,8 +25,14 @@ void menuModelNotes(event_t event)
{
if (event == EVT_ENTRY) {
strcpy(reusableBuffer.viewText.filename, MODELS_PATH "/");
char *buf = strcat_currentmodelname(&reusableBuffer.viewText.filename[sizeof(MODELS_PATH)], 0);
char *buf = strcat_currentmodelname(
&reusableBuffer.viewText.filename[sizeof(MODELS_PATH)], ' ');
strcpy(buf, TEXT_EXT);
if (!isFileAvailable(reusableBuffer.viewText.filename)) {
buf = strcat_currentmodelname(
&reusableBuffer.viewText.filename[sizeof(MODELS_PATH)], 0);
strcpy(buf, TEXT_EXT);
}
}
menuTextView(event);