From 0cedfaf9a64edee2621c21acb3c38e27a0fb40d3 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Sat, 24 Jun 2023 14:03:21 +0200 Subject: [PATCH 1/4] remove unused declarations from anycubic_touchscreen.h --- Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h b/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h index 05e92893..a6c47eac 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,7 +219,6 @@ 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; @@ -257,7 +249,6 @@ class AnycubicTouchscreenClass { void StopPrint(); void GetCommandFromTFT(); void CheckHeaterError(); - void FilamentChangePause(); void HandleSpecialMenu(); void RenderCurrentFileList(); void RenderSpecialMenu(uint16_t); From 1822172d444031840440ba7e2bd56ebf94b41ead Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Sat, 24 Jun 2023 14:04:11 +0200 Subject: [PATCH 2/4] use boolean literals instead of implicit int conversion --- Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp | 8 ++++---- Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp b/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp index dd5e71a1..74f11ea9 100755 --- a/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp +++ b/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp @@ -1074,7 +1074,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 +1236,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 +2062,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 +2082,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 diff --git a/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h b/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h index a6c47eac..09100e7d 100755 --- a/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h +++ b/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h @@ -222,7 +222,7 @@ class AnycubicTouchscreenClass { uint16_t HeaterCheckCount = 0; int currentFlowRate = 0; bool PrintdoneAndPowerOFF = true; - bool powerOFFflag = 0; + bool powerOFFflag = false; xy_uint8_t selectedmeshpoint; float live_Zoffset; From 33c91b345e488c500dc0d00472baf4ebf2972fdb Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Sat, 24 Jun 2023 14:09:27 +0200 Subject: [PATCH 3/4] remove unused PowerKill() --- .../lcd/extui/knutwurst/anycubic_touchscreen.cpp | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp b/Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.cpp index 74f11ea9..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 @@ -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"); From b93faf009c4f0fd0db874ced55451cbac210a65c Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Sat, 24 Jun 2023 14:13:13 +0200 Subject: [PATCH 4/4] github: remove duplicate "Configurations" section from PR template --- .github/pull_request_template.md | 3 --- 1 file changed, 3 deletions(-) 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