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

Some refactoring and cleanup. No breaking changes.

Browse Source
This commit is contained in:
Knutwurst
2023-06-01 09:14:14 +02:00
parent 067fe2f074
commit 0c25c876d3
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -973,11 +973,11 @@ void AnycubicTouchscreenClass::RenderCurrentFolder(uint16_t selectedNumber) {
// The longname may not be filed, so we use the built-in fallback here. // The longname may not be filed, so we use the built-in fallback here.
const char* fileName = currentFileList.filename(); const char* fileName = currentFileList.filename();
int fileNameLen = strlen(fileName); int fileNameLen = strlen(fileName);
bool fileNameWasCut = false;
// Cut off too long filenames. // Cut off too long filenames.
// They don't fit on the screen anyway. // They don't fit on the screen anyway.
#if ENABLED(KNUTWURST_DGUS2_TFT) #if ENABLED(KNUTWURST_DGUS2_TFT)
bool fileNameWasCut = false;
if (fileNameLen >= MAX_PRINTABLE_FILENAME_LEN) { if (fileNameLen >= MAX_PRINTABLE_FILENAME_LEN) {
fileNameWasCut = true; fileNameWasCut = true;
fileNameLen = MAX_PRINTABLE_FILENAME_LEN; fileNameLen = MAX_PRINTABLE_FILENAME_LEN;
@@ -1366,12 +1366,11 @@ void AnycubicTouchscreenClass::RenderCurrentFolder(uint16_t selectedNumber) {
case 15: // A15 RESUMING FROM OUTAGE case 15: // A15 RESUMING FROM OUTAGE
#if defined(POWER_OUTAGE_TEST) #if defined(POWER_OUTAGE_TEST)
if ((!planner.movesplanned()) && (TFTstate != ANYCUBIC_TFT_STATE_SDPAUSE)) { if (!isPrinting()) {
if (card.isFileOpen()) FlagResumFromOutage = true; if (card.isFileOpen()) FlagResumFromOutage = true;
ResumingFlag = 1; ResumingFlag = 1;
card.startOrResumeFilePrinting(); resumePrint();
starttime = millis();
SENDLINE_PGM("OK"); SENDLINE_PGM("OK");
} }
#endif #endif
@@ -1758,7 +1757,8 @@ void AnycubicTouchscreenClass::RenderCurrentFolder(uint16_t selectedNumber) {
else else
SENDLINE_PGM("J34 "); SENDLINE_PGM("J34 ");
} }
// break; <-- TODO: do we need it? break;
case 42: case 42:
if (CaseLight == true) { if (CaseLight == true) {
SERIAL_ECHOLNPGM("Case Light OFF"); SERIAL_ECHOLNPGM("Case Light OFF");
@@ -1770,7 +1770,8 @@ void AnycubicTouchscreenClass::RenderCurrentFolder(uint16_t selectedNumber) {
injectCommands(F("M355 S1 P255")); injectCommands(F("M355 S1 P255"));
CaseLight = true; CaseLight = true;
} }
// break; <-- TODO: do we need it? break;
#endif #endif
#if ENABLED(KNUTWURST_DGUS2_TFT) #if ENABLED(KNUTWURST_DGUS2_TFT)
case 50: case 50: