From 031c095019e8c46af92ad90344cb913f90692022 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Sat, 3 Sep 2022 09:26:05 +0200 Subject: [PATCH] remove explicit ABL inclusion from Anycubit Touchscreen code --- Marlin/src/lcd/anycubic_touchscreen.cpp | 29 ++++++++++++------------- Marlin/src/lcd/anycubic_touchscreen.h | 1 - 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Marlin/src/lcd/anycubic_touchscreen.cpp b/Marlin/src/lcd/anycubic_touchscreen.cpp index 48366c0b..3d150c63 100755 --- a/Marlin/src/lcd/anycubic_touchscreen.cpp +++ b/Marlin/src/lcd/anycubic_touchscreen.cpp @@ -29,7 +29,6 @@ #include "../feature/e_parser.h" #include "../feature/pause.h" #include "../feature/bedlevel/bedlevel.h" -#include "../feature/bedlevel/abl/abl.h" #include "../libs/buzzer.h" #include "../module/planner.h" #include "../module/printcounter.h" @@ -260,7 +259,7 @@ void AnycubicTouchscreenClass::Setup() { buzzer.tone(100, 554); buzzer.tone(100, 740); buzzer.tone(100, 831); - #endif + #endif } #if ENABLED(KNUTWURST_MEGA_P_LASER) @@ -502,7 +501,7 @@ inline void AnycubicTouchscreenClass::StopPrint() print_job_timer.stop(); thermalManager.disable_all_heaters(); thermalManager.zero_fan_speeds(); - + #ifdef ANYCUBIC_TFT_DEBUG SERIAL_ECHOLNPGM("DEBUG: Stopped and cleared"); #endif @@ -520,7 +519,7 @@ void AnycubicTouchscreenClass::FilamentChangeResume() { #ifdef ANYCUBIC_TFT_DEBUG SERIAL_ECHOLNPGM("DEBUG: M108 Resume called"); #endif - + //IsParked = false; // remove parked flag starttime = millis(); card.startOrResumeFilePrinting(); // resume regularly @@ -1174,7 +1173,7 @@ void AnycubicTouchscreenClass::PrintList() { if (fileNameLen >= MAX_PRINTABLE_FILENAME_LEN) { fileNameWasCut = true; fileNameLen = MAX_PRINTABLE_FILENAME_LEN; - } + } #endif char outputString[fileNameLen]; @@ -1398,7 +1397,7 @@ void AnycubicTouchscreenClass::StateHandler() { /* * TODO: Refactoring of the filamentsensor-Stuff. - * + * * Every cycle a timer should be reset if the sensor reads "filament is present" * If the timer is not reset within a period of time, the filament runout state * should be triggered. @@ -1682,7 +1681,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() { #endif break; case 12: // A12 kill - kill(PSTR(STR_ERR_KILLED)); + kill(F(STR_ERR_KILLED)); break; case 13: // A13 SELECTION FILE #ifdef SDSUPPORT @@ -2158,13 +2157,13 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() { PrintdoneAndPowerOFF = false; break; } - if(CodeSeen('S')) { + if(CodeSeen('S')) { if(PrintdoneAndPowerOFF) { - HARDWARE_SERIAL_PROTOCOLPGM("J35 "); - HARDWARE_SERIAL_ENTER(); + HARDWARE_SERIAL_PROTOCOLPGM("J35 "); + HARDWARE_SERIAL_ENTER(); } else { - HARDWARE_SERIAL_PROTOCOLPGM("J34 "); - HARDWARE_SERIAL_ENTER(); + HARDWARE_SERIAL_PROTOCOLPGM("J34 "); + HARDWARE_SERIAL_ENTER(); } } case 42: @@ -2280,7 +2279,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() { } break; #endif - + #if ENABLED(KNUTWURST_MEGA_P) case 51: if (CodeSeen('H')) { @@ -2308,7 +2307,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() { } break; #endif - + default: break; } @@ -2366,7 +2365,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() { delay(10); WRITE(POWER_OFF_PIN,HIGH); delay(10); - } + } } #endif diff --git a/Marlin/src/lcd/anycubic_touchscreen.h b/Marlin/src/lcd/anycubic_touchscreen.h index acb9ad0c..6bd4fedd 100755 --- a/Marlin/src/lcd/anycubic_touchscreen.h +++ b/Marlin/src/lcd/anycubic_touchscreen.h @@ -27,7 +27,6 @@ #include "./src/inc/MarlinConfigPre.h" #include "./src/feature/bedlevel/bedlevel.h" -#include "./src/feature/bedlevel/abl/abl.h" #include "src/module/probe.h"