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 Special Menu and loger filenames

Browse Source
This commit is contained in:
Knutwurst
2020-07-24 23:47:55 +02:00
parent 4acb60ed54
commit 710ab1b2d3
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,7 @@ unsigned char ResumingFlag = 0;
#endif #endif
//#define MAX_PRINTABLE_FILENAME_LEN 21 //#define MAX_PRINTABLE_FILENAME_LEN 21
#define MAX_PRINTABLE_FILENAME_LEN 23 #define MAX_PRINTABLE_FILENAME_LEN 30
void setup_OutageTestPin() void setup_OutageTestPin()
{ {
@@ -542,17 +542,20 @@ void AnycubicTouchscreenClass::HandleSpecialMenu()
} }
#endif #endif
else if (strcasestr(currentTouchscreenSelection, "Fil. Change Pause") != NULL) else if ((strcasestr(currentTouchscreenSelection, "Fil. Change Pause") != NULL)
|| (strcasestr(currentTouchscreenSelection, "_FILCH~2.GCO") != NULL))
{ {
SERIAL_ECHOLNPGM("Special Menu: Fil. Change Pause"); SERIAL_ECHOLNPGM("Special Menu: Fil. Change Pause");
FilamentChangePause(); FilamentChangePause();
} }
else if (strcasestr(currentTouchscreenSelection, "Fil. Change Resume") != NULL) else if ((strcasestr(currentTouchscreenSelection, "Fil. Change Resume") != NULL)
|| (strcasestr(currentTouchscreenSelection, "_FILCH~1.GCO") != NULL))
{ {
SERIAL_ECHOLNPGM("Special Menu: Fil. Change Resume"); SERIAL_ECHOLNPGM("Special Menu: Fil. Change Resume");
FilamentChangeResume(); FilamentChangeResume();
} }
else if (strcasestr(currentTouchscreenSelection, "Disable Fil. Sensor") != NULL) else if ((strcasestr(currentTouchscreenSelection, "Disable Fil. Sensor") != NULL)
|| (strcasestr(currentTouchscreenSelection, "_DISAB~1") != NULL))
{ {
SERIAL_ECHOLNPGM("Special Menu: Disable Filament Sensor"); SERIAL_ECHOLNPGM("Special Menu: Disable Filament Sensor");
FilamentSensorEnabled = false; FilamentSensorEnabled = false;
@@ -560,14 +563,16 @@ void AnycubicTouchscreenClass::HandleSpecialMenu()
buzzer.tone(105, 1108); buzzer.tone(105, 1108);
buzzer.tone(105, 1108); buzzer.tone(105, 1108);
} }
else if (strcasestr(currentTouchscreenSelection, "Enable Fil. Sensor") != NULL) else if ((strcasestr(currentTouchscreenSelection, "Enable Fil. Sensor") != NULL)
|| (strcasestr(currentTouchscreenSelection, "_ENABL~1.GCO") != NULL))
{ {
SERIAL_ECHOLNPGM("Special Menu: Enable Filament Sensor"); SERIAL_ECHOLNPGM("Special Menu: Enable Filament Sensor");
FilamentSensorEnabled = true; FilamentSensorEnabled = true;
buzzer.tone(105, 1108); buzzer.tone(105, 1108);
buzzer.tone(105, 1108); buzzer.tone(105, 1108);
} }
else if (strcasestr(currentTouchscreenSelection, "Exit") != NULL) else if ((strcasestr(currentTouchscreenSelection, "Exit") != NULL)
|| (strcasestr(currentTouchscreenSelection, "_EXIT_~1.GCO") != NULL))
{ {
SpecialMenu = false; SpecialMenu = false;
} }
@@ -757,15 +762,15 @@ void AnycubicTouchscreenClass::PrintList()
HARDWARE_SERIAL_PROTOCOL("/"); HARDWARE_SERIAL_PROTOCOL("/");
HARDWARE_SERIAL_PROTOCOLLN(card.filename); HARDWARE_SERIAL_PROTOCOLLN(card.filename);
HARDWARE_SERIAL_PROTOCOL("/"); HARDWARE_SERIAL_PROTOCOL("/");
HARDWARE_SERIAL_PROTOCOLLN(outputString); HARDWARE_SERIAL_PROTOCOLLN(card.longFilename);
SERIAL_ECHO(count); SERIAL_ECHO(count);
SERIAL_ECHOPGM(": /"); SERIAL_ECHOPGM(": /");
SERIAL_ECHOLN(outputString); SERIAL_ECHOLN(card.longFilename);
} }
else else
{ {
HARDWARE_SERIAL_PROTOCOLLN(card.filename); HARDWARE_SERIAL_PROTOCOLLN(card.filename);
HARDWARE_SERIAL_PROTOCOLLN(outputString); HARDWARE_SERIAL_PROTOCOLLN(card.longFilename);
SERIAL_ECHO(count); SERIAL_ECHO(count);
SERIAL_ECHOPGM(": "); SERIAL_ECHOPGM(": ");
SERIAL_ECHOLN(card.longFilename); SERIAL_ECHOLN(card.longFilename);