wp/Marlin-2-0-x-Anycubic-i3-MEGA-S
1
0
Fork 0
Code Issues 28 Pull Requests 2 Actions Packages Projects Releases 30 Wiki Activity

Revert File list refactoring a253776.

Browse Source
This commit is contained in:
Knutwurst
2023-06-09 22:07:34 +02:00
parent d528646009
commit 3225d0dad3
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp
View File

@@ -646,28 +646,35 @@
void AnycubicTouchscreenClass::RenderCurrentFileList() { void AnycubicTouchscreenClass::RenderCurrentFileList() {
currentFileOrDirectory[0] = 0; currentFileOrDirectory[0] = 0;
uint16_t selectedNumber = 0;
FileList currentFileList; if (SpecialMenu == false) {
currentTouchscreenSelection[0] = 0;
if (CodeSeen('S')) selectedNumber = CodeValue(); }
// Filelist start // Filelist start
SEND_PGM("FN "); SEND_PGM("FN ");
SENDLINE_PGM(""); SENDLINE_PGM("");
if (SpecialMenu) { if (!isMediaInserted() && !SpecialMenu) {
RenderSpecialMenu(selectedNumber);
} else if (isMediaInserted() && (selectedNumber <= currentFileList.count())) {
currentTouchscreenSelection[0] = 0;
RenderCurrentFolder(selectedNumber);
} else {
SENDLINE_PGM(SM_SPECIAL_MENU_S); SENDLINE_PGM(SM_SPECIAL_MENU_S);
SENDLINE_PGM(SM_SPECIAL_MENU_L); SENDLINE_PGM(SM_SPECIAL_MENU_L);
} } else {
uint16_t selectedNumber = 0;
FileList currentFileList;
SEND_PGM("END"); if (CodeSeen('S')) {
SENDLINE_PGM(""); selectedNumber = CodeValue();
}
if (SpecialMenu) {
RenderSpecialMenu(selectedNumber);
} else if (selectedNumber <= currentFileList.count()) {
RenderCurrentFolder(selectedNumber);
}
}
// Filelist stop // Filelist stop
SEND_PGM("END");
SENDLINE_PGM("");
} }
void AnycubicTouchscreenClass::RenderSpecialMenu(uint16_t selectedNumber) { void AnycubicTouchscreenClass::RenderSpecialMenu(uint16_t selectedNumber) {