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

Remove code duplication

Browse Source
This commit is contained in:
Knutwurst
2020-07-24 09:12:21 +02:00
parent 168e2f8305
commit 77f77a58e8
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,7 @@ unsigned char ResumingFlag = 0;
void setup_OutageTestPin() void setup_OutageTestPin()
{ {
#if defined(POWER_OUTAGE_TEST) #ifdef POWER_OUTAGE_TEST
pinMode(OUTAGETEST_PIN, INPUT); pinMode(OUTAGETEST_PIN, INPUT);
pinMode(OUTAGECON_PIN, OUTPUT); pinMode(OUTAGECON_PIN, OUTPUT);
WRITE(OUTAGECON_PIN, LOW); WRITE(OUTAGECON_PIN, LOW);
@@ -474,7 +474,8 @@ void AnycubicTouchscreenClass::HandleSpecialMenu()
SERIAL_ECHOLNPGM("Special Menu: Preheat Ultrabase"); SERIAL_ECHOLNPGM("Special Menu: Preheat Ultrabase");
queue.inject_P(PSTR("M140 S60")); queue.inject_P(PSTR("M140 S60"));
} }
#if DISABLED(KNUTWURST_BLTOUCH)
#if DISABLED(KNUTWURST_BLTOUCH)
else if (strcasestr(currentTouchscreenSelection, "<Start Mesh Leveling>") != NULL) else if (strcasestr(currentTouchscreenSelection, "<Start Mesh Leveling>") != NULL)
{ {
SERIAL_ECHOLNPGM("Special Menu: Start Mesh Leveling"); SERIAL_ECHOLNPGM("Special Menu: Start Mesh Leveling");
@@ -517,21 +518,16 @@ void AnycubicTouchscreenClass::HandleSpecialMenu()
queue.enqueue_now_P(PSTR("G91\nG1 Z+0.02\nG90")); queue.enqueue_now_P(PSTR("G91\nG1 Z+0.02\nG90"));
queue.enqueue_now_P(PSTR("G91\nG1 Z-0.03\nG90")); queue.enqueue_now_P(PSTR("G91\nG1 Z-0.03\nG90"));
} }
#endif #endif
#if ENABLED(KNUTWURST_BLTOUCH)
#if ENABLED(KNUTWURST_BLTOUCH)
else if (strcasestr(currentTouchscreenSelection, "<BLTouch Leveling>") != NULL) else if (strcasestr(currentTouchscreenSelection, "<BLTouch Leveling>") != NULL)
{ {
SERIAL_ECHOLNPGM("Special Menu: BLTouch Leveling"); SERIAL_ECHOLNPGM("Special Menu: BLTouch Leveling");
queue.inject_P(PSTR("G28\nG29")); queue.inject_P(PSTR("G28\nG29"));
} }
#endif #endif
#if ENABLED(KNUTWURST_BLTOUCH)
else if (strcasestr(currentTouchscreenSelection, "<BLTouch Leveling>") != NULL)
{
SERIAL_ECHOLNPGM("Special Menu: BLTouch Leveling");
queue.inject_P(PSTR("G28\nG29"));
}
#endif
else if (strcasestr(currentTouchscreenSelection, "<Fil. Change Pause>") != NULL) else if (strcasestr(currentTouchscreenSelection, "<Fil. Change Pause>") != NULL)
{ {
SERIAL_ECHOLNPGM("Special Menu: Fil. Change Pause"); SERIAL_ECHOLNPGM("Special Menu: Fil. Change Pause");
@@ -747,7 +743,7 @@ 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(buffer); HARDWARE_SERIAL_PROTOCOLLN(outputString);
SERIAL_ECHO(count); SERIAL_ECHO(count);
SERIAL_ECHOPGM(": /"); SERIAL_ECHOPGM(": /");
SERIAL_ECHOLN(outputString); SERIAL_ECHOLN(outputString);