diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 1ab1807b..9f7cd566 100755 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -28,9 +28,6 @@ Clearly describe the submitted changes with lots of details. Include images wher -### Configurations - - ### Related Issues diff --git a/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp b/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp index dd5e71a1..6f7c1bdd 100755 --- a/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp +++ b/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp @@ -19,7 +19,6 @@ */ #include "Arduino.h" -#include #include #include #include @@ -1074,7 +1073,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() { char* starpos = NULL; while (LCD_SERIAL.available() > 0 && TFTbuflen < TFTBUFSIZE) { serial3_char = LCD_SERIAL.read(); - if (serial3_char == '\n' || serial3_char == '\r' || (serial3_char == ':' && TFTcomment_mode == false) || + if (serial3_char == '\n' || serial3_char == '\r' || (serial3_char == ':' && !TFTcomment_mode) || serial3_count >= (TFT_MAX_CMD_SIZE - 1)) { if (!serial3_count) { // if empty line TFTcomment_mode = false; // for new command @@ -1236,7 +1235,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() { tempvalue = constrain(CodeValue(), 0, 260); if (getTargetTemp_celsius((extruder_t)E0) <= 260) { setTargetTemp_celsius(tempvalue, (extruder_t)E0); - }; // do not set Temp from TFT if it is set via gcode + } // do not set Temp from TFT if it is set via gcode } else if ((CodeSeen('C')) && (!isPrinting())) { if ((getAxisPosition_mm(Z) < 10)) { injectCommands(F("G1 Z10")); // RASE Z AXIS @@ -2062,7 +2061,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() { "TFT Serial Debug: Starting SD Print... soft endstops disabled J04"); // J04 Starting Print setSoftEndstopState(false); live_Zoffset = 0.0; - powerOFFflag = 0; + powerOFFflag = false; } #endif } @@ -2082,7 +2081,7 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() { mediaPrintingState = AMPRINTSTATE_NOT_PRINTING; mediaPauseState = AMPAUSESTATE_NOT_PAUSED; setSoftEndstopState(true); - powerOFFflag = 1; + powerOFFflag = true; SENDLINE_DBG_PGM("J14", "TFT Serial Debug: SD Print Completed... soft endstops enabled J14"); } // otherwise it was stopped by the printer so don't send print completed @@ -2102,20 +2101,6 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() { } #endif - void PowerKill() { - #ifdef POWER_OUTAGE_TEST - Temp_Buf_Extuder_Temperature = thermalManager.degTargetHotend(0); - Temp_Buf_Bed_Temperature = thermalManager.degTargetBed(); - if (PowerTestFlag == true) { - thermalManager.disable_all_heaters(); - OutageSave(); - PowerTestFlag = false; - thermalManager.setTargetHotend(Temp_Buf_Extuder_Temperature, 0); - thermalManager.setTargetBed(Temp_Buf_Bed_Temperature); - } - #endif - } - #if ENABLED(KNUTWURST_CHIRON) void AnycubicTouchscreenClass::LevelingDone() { SENDLINE_DBG_PGM("J25", "TFT Serial Debug: Auto leveling done... J25"); diff --git a/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h b/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h index 05e92893..09100e7d 100755 --- a/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h +++ b/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h @@ -24,13 +24,6 @@ #include "../../../inc/MarlinConfigPre.h" #include "../../../module/probe.h" -char* itostr2(const uint8_t& x); - -#ifndef ULTRA_LCD -char* itostr3(const int); -char* ftostr32(const float&); -#endif - #define TFTBUFSIZE 4 #define TFT_MAX_CMD_SIZE 96 #define MSG_MY_VERSION CUSTOM_BUILD_VERSION @@ -226,11 +219,10 @@ class AnycubicTouchscreenClass { int serial3_count = 0; char* TFTstrchr_pointer; char FlagResumFromOutage = 0; - uint8_t tmp_extruder = 0; uint16_t HeaterCheckCount = 0; int currentFlowRate = 0; bool PrintdoneAndPowerOFF = true; - bool powerOFFflag = 0; + bool powerOFFflag = false; xy_uint8_t selectedmeshpoint; float live_Zoffset; @@ -257,7 +249,6 @@ class AnycubicTouchscreenClass { void StopPrint(); void GetCommandFromTFT(); void CheckHeaterError(); - void FilamentChangePause(); void HandleSpecialMenu(); void RenderCurrentFileList(); void RenderSpecialMenu(uint16_t);