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

Fix for loading files from SD.

Browse Source
This commit is contained in:
Knutwurst
2020-06-03 11:06:14 +02:00
parent 80d7cf66c6
commit 0b1d80d3d0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/lcd/anycubic_touchscreen.cpp
View File

@@ -599,6 +599,7 @@ void AnycubicTouchscreenClass::Ls()
card.selectFileByIndex(cnt - 1); card.selectFileByIndex(cnt - 1);
bool hasInvalidCharacter = false; bool hasInvalidCharacter = false;
for (unsigned char currentChar = 0; currentChar < strlen(card.longFilename); currentChar++) for (unsigned char currentChar = 0; currentChar < strlen(card.longFilename); currentChar++)
if (!isPrintable(card.longFilename[currentChar])) if (!isPrintable(card.longFilename[currentChar]))
{ {
@@ -606,6 +607,7 @@ void AnycubicTouchscreenClass::Ls()
break; break;
} }
if (card.flag.filenameIsDir) if (card.flag.filenameIsDir)
{ {
if(hasInvalidCharacter) if(hasInvalidCharacter)
@@ -621,7 +623,7 @@ void AnycubicTouchscreenClass::Ls()
else else
{ {
ANYCUBIC_SERIAL_PROTOCOLPGM("/"); ANYCUBIC_SERIAL_PROTOCOLPGM("/");
ANYCUBIC_SERIAL_PROTOCOLLN(card.longFilename); ANYCUBIC_SERIAL_PROTOCOLLN(card.filename);
ANYCUBIC_SERIAL_PROTOCOLPGM("/"); ANYCUBIC_SERIAL_PROTOCOLPGM("/");
ANYCUBIC_SERIAL_PROTOCOLLN(card.longFilename); ANYCUBIC_SERIAL_PROTOCOLLN(card.longFilename);
SERIAL_ECHO(cnt); SERIAL_ECHO(cnt);
@@ -640,7 +642,7 @@ void AnycubicTouchscreenClass::Ls()
} }
else else
{ {
ANYCUBIC_SERIAL_PROTOCOLLN(card.longFilename); ANYCUBIC_SERIAL_PROTOCOLLN(card.filename);
ANYCUBIC_SERIAL_PROTOCOLLN(card.longFilename); ANYCUBIC_SERIAL_PROTOCOLLN(card.longFilename);
SERIAL_ECHO(cnt); SERIAL_ECHO(cnt);
SERIAL_ECHOLN(card.longFilename); SERIAL_ECHOLN(card.longFilename);