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 explicit ABL inclusion from Anycubit Touchscreen code

Browse Source
This commit is contained in:
Stefan Kalscheuer
2022-09-03 09:26:05 +02:00
parent bf2795c51e
commit 031c095019
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,6 @@
#include "../feature/e_parser.h" #include "../feature/e_parser.h"
#include "../feature/pause.h" #include "../feature/pause.h"
#include "../feature/bedlevel/bedlevel.h" #include "../feature/bedlevel/bedlevel.h"
#include "../feature/bedlevel/abl/abl.h"
#include "../libs/buzzer.h" #include "../libs/buzzer.h"
#include "../module/planner.h" #include "../module/planner.h"
#include "../module/printcounter.h" #include "../module/printcounter.h"
@@ -260,7 +259,7 @@ void AnycubicTouchscreenClass::Setup() {
buzzer.tone(100, 554); buzzer.tone(100, 554);
buzzer.tone(100, 740); buzzer.tone(100, 740);
buzzer.tone(100, 831); buzzer.tone(100, 831);
#endif #endif
} }
#if ENABLED(KNUTWURST_MEGA_P_LASER) #if ENABLED(KNUTWURST_MEGA_P_LASER)
@@ -502,7 +501,7 @@ inline void AnycubicTouchscreenClass::StopPrint()
print_job_timer.stop(); print_job_timer.stop();
thermalManager.disable_all_heaters(); thermalManager.disable_all_heaters();
thermalManager.zero_fan_speeds(); thermalManager.zero_fan_speeds();
#ifdef ANYCUBIC_TFT_DEBUG #ifdef ANYCUBIC_TFT_DEBUG
SERIAL_ECHOLNPGM("DEBUG: Stopped and cleared"); SERIAL_ECHOLNPGM("DEBUG: Stopped and cleared");
#endif #endif
@@ -520,7 +519,7 @@ void AnycubicTouchscreenClass::FilamentChangeResume() {
#ifdef ANYCUBIC_TFT_DEBUG #ifdef ANYCUBIC_TFT_DEBUG
SERIAL_ECHOLNPGM("DEBUG: M108 Resume called"); SERIAL_ECHOLNPGM("DEBUG: M108 Resume called");
#endif #endif
//IsParked = false; // remove parked flag //IsParked = false; // remove parked flag
starttime = millis(); starttime = millis();
card.startOrResumeFilePrinting(); // resume regularly card.startOrResumeFilePrinting(); // resume regularly
@@ -1174,7 +1173,7 @@ void AnycubicTouchscreenClass::PrintList() {
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;
} }
#endif #endif
char outputString[fileNameLen]; char outputString[fileNameLen];
@@ -1398,7 +1397,7 @@ void AnycubicTouchscreenClass::StateHandler() {
/* /*
* TODO: Refactoring of the filamentsensor-Stuff. * TODO: Refactoring of the filamentsensor-Stuff.
* *
* Every cycle a timer should be reset if the sensor reads "filament is present" * 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 * If the timer is not reset within a period of time, the filament runout state
* should be triggered. * should be triggered.
@@ -1682,7 +1681,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() {
#endif #endif
break; break;
case 12: // A12 kill case 12: // A12 kill
kill(PSTR(STR_ERR_KILLED)); kill(F(STR_ERR_KILLED));
break; break;
case 13: // A13 SELECTION FILE case 13: // A13 SELECTION FILE
#ifdef SDSUPPORT #ifdef SDSUPPORT
@@ -2158,13 +2157,13 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() {
PrintdoneAndPowerOFF = false; PrintdoneAndPowerOFF = false;
break; break;
} }
if(CodeSeen('S')) { if(CodeSeen('S')) {
if(PrintdoneAndPowerOFF) { if(PrintdoneAndPowerOFF) {
HARDWARE_SERIAL_PROTOCOLPGM("J35 "); HARDWARE_SERIAL_PROTOCOLPGM("J35 ");
HARDWARE_SERIAL_ENTER(); HARDWARE_SERIAL_ENTER();
} else { } else {
HARDWARE_SERIAL_PROTOCOLPGM("J34 "); HARDWARE_SERIAL_PROTOCOLPGM("J34 ");
HARDWARE_SERIAL_ENTER(); HARDWARE_SERIAL_ENTER();
} }
} }
case 42: case 42:
@@ -2280,7 +2279,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() {
} }
break; break;
#endif #endif
#if ENABLED(KNUTWURST_MEGA_P) #if ENABLED(KNUTWURST_MEGA_P)
case 51: case 51:
if (CodeSeen('H')) { if (CodeSeen('H')) {
@@ -2308,7 +2307,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() {
} }
break; break;
#endif #endif
default: default:
break; break;
} }
@@ -2366,7 +2365,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() {
delay(10); delay(10);
WRITE(POWER_OFF_PIN,HIGH); WRITE(POWER_OFF_PIN,HIGH);
delay(10); delay(10);
} }
} }
#endif #endif

1
Marlin/src/lcd/anycubic_touchscreen.h
View File

@@ -27,7 +27,6 @@
#include "./src/inc/MarlinConfigPre.h" #include "./src/inc/MarlinConfigPre.h"
#include "./src/feature/bedlevel/bedlevel.h" #include "./src/feature/bedlevel/bedlevel.h"
#include "./src/feature/bedlevel/abl/abl.h"
#include "src/module/probe.h" #include "src/module/probe.h"