Bump Builddate.

fix manual leveling from Mega P TFT

.clang-format

@@ -6,25 +6,25 @@ AlignAfterOpenBracket: Align
 AlignArrayOfStructures: None
 AlignConsecutiveAssignments:
   Enabled:         true
-  AcrossEmptyLines: true
+  AcrossEmptyLines: false
   AcrossComments:  true
   AlignCompound:   true
   PadOperators:    true
 AlignConsecutiveBitFields:
   Enabled:         true
-  AcrossEmptyLines: true
+  AcrossEmptyLines: false
   AcrossComments:  true
   AlignCompound:   false
   PadOperators:    false
 AlignConsecutiveDeclarations:
   Enabled:         true
-  AcrossEmptyLines: true
+  AcrossEmptyLines: false
   AcrossComments:  true
   AlignCompound:   false
   PadOperators:    false
 AlignConsecutiveMacros:
   Enabled:         true
-  AcrossEmptyLines: true
+  AcrossEmptyLines: false
   AcrossComments:  true
   AlignCompound:   false
   PadOperators:    false
@@ -62,16 +62,15 @@ BraceWrapping:
   AfterObjCDeclaration: false
   AfterStruct:     false
   AfterUnion:      false
-  BeforeCatch:     false
+  BeforeCatch:     true
-  BeforeElse:      false
+  BeforeElse:      true
   BeforeLambdaBody: false
   BeforeWhile:     false
-  IndentBraces:    false
+  IndentBraces:    true
   SplitEmptyFunction: true
   SplitEmptyRecord: true
   SplitEmptyNamespace: true
 BreakAfterAttributes: Never
-BreakAfterJavaFieldAnnotations: false
 BreakArrays:     true
 BreakBeforeBinaryOperators: None
 BreakBeforeConceptDeclarations: Always
@@ -115,17 +114,17 @@ IncludeCategories:
     CaseSensitive:   false
 IncludeIsMainRegex: '(Test)?$'
 IncludeIsMainSourceRegex: ''
-IndentAccessModifiers: false
+IndentAccessModifiers: true
-IndentCaseBlocks: false
+IndentCaseBlocks: true
-IndentCaseLabels: false
+IndentCaseLabels: true
 IndentExternBlock: AfterExternBlock
 IndentGotoLabels: true
-IndentPPDirectives: None
+IndentPPDirectives: BeforeHash
 IndentRequiresClause: true
-IndentWidth:     4
+IndentWidth:     2
-IndentWrappedFunctionNames: false
+IndentWrappedFunctionNames: true
-InsertBraces:    false
+InsertBraces:    true
-InsertNewlineAtEOF: false
+InsertNewlineAtEOF: true
 InsertTrailingCommas: None
 IntegerLiteralSeparator:
   Binary:          0
@@ -134,15 +133,13 @@ IntegerLiteralSeparator:
   DecimalMinDigits: 0
   Hex:             0
   HexMinDigits:    0
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: true
 LambdaBodyIndentation: Signature
 LineEnding:      DeriveLF
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
-MaxEmptyLinesToKeep: 1
+MaxEmptyLinesToKeep: 2
-NamespaceIndentation: None
+NamespaceIndentation: All
 ObjCBinPackProtocolList: Auto
 ObjCBlockIndentWidth: 2
 ObjCBreakBeforeNestedBlockParam: true

.github/pull_request_template.md

@@ -28,9 +28,6 @@ Clearly describe the submitted changes with lots of details. Include images wher
 
 <!-- Attach Configurations ZIP and any other files needed to test this PR. -->
 
-### Configurations
-
-<!-- Attach any Configuration.h, Configuration_adv.h, or platformio.ini files needed to compile/test your Pull Request. -->
 
 ### Related Issues
 

.github/workflows/build-all.yml

@@ -90,10 +90,10 @@ jobs:
 
     steps:
 
-    - name: Setup Python 3.7
+    - name: Setup Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v5
       with:
-        python-version: '3.7' # Version range or exact version of a Python version to use, using semvers version range syntax.
+        python-version: '3.10' # Version range or exact version of a Python version to use, using semvers version range syntax.
         architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
 
     - name: Install PlatformIO
@@ -124,7 +124,7 @@ jobs:
     #     .pio/build/${{ matrix.platform }}/${{ matrix.platform }}_v*.hex
 
     - name: Archive all artifacts into one ZIP file
-      uses: actions/upload-artifact@master
+      uses: actions/upload-artifact@v3
       with:
         name: Knuwurst-all-in-one-${{github.sha}}
         path: |

Marlin/Configuration.h

@@ -38,14 +38,11 @@
 #define CONFIGURATION_H_VERSION 02010201
 #define ANYCUBIC_TOUCHSCREEN
 #define KNUTWURST_SPECIAL_MENU
-#define KNUTWURST_SPECIAL_MENU_WO_SD
 // #define ANYCUBIC_TFT_DEBUG
 // #define POWER_OUTAGE_TEST
 
 #define LCD_SERIAL_PORT 3
 
-#define EXT_LEVEL_HIGH 0.1
-
 /*
  * This feature is for debugging purpose only.
  * It enabled more console output and should be
@@ -76,18 +73,6 @@
 // #define KNUTWURST_MEGA_P_LASER
 #endif
 
-
-/*
- * This enables the integrated leveling features
- * in the anycubic touchscreen. It's currently only
- * supported by the Anycubic Chiron and therefore it
- * is automatically set if the chiron is enabled.
- *
- */
-#if ENABLED(KNUTWURST_CHIRON)
-  #define KNUTWURST_TFT_LEVELING
-#endif
-
 /*
  * To ensure the correct endstop configuration,
  * this has to be enabled to alter the motherboard
@@ -1652,7 +1637,7 @@
  * Use G29 repeatedly, adjusting the Z height at each point with movement commands
  * or (with LCD_BED_LEVELING) the LCD controller.
  */
-#if NONE(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
+#if NONE(KNUTWURST_BLTOUCH, KNUTWURST_CHIRON)
   #define PROBE_MANUALLY
 #endif
 
@@ -1671,7 +1656,7 @@
 /**
  * Z Servo Probe, such as an endstop switch on a rotating arm.
  */
-#if ENABLED(KNUTWURST_TFT_LEVELING)
+#if ENABLED(KNUTWURST_CHIRON)
   #define Z_PROBE_SERVO_NR 0       // Defaults to SERVO 0 connector.
   #define Z_SERVO_ANGLES { 70, 0 } // Z Servo Deploy and Stow angles
 #endif
@@ -1838,11 +1823,11 @@
   // #define NOZZLE_TO_PROBE_OFFSET { 29, -15, 0 } //X-Carriage
 #endif
 
-#if ENABLED(KNUTWURST_TFT_LEVELING)
+#if ENABLED(KNUTWURST_CHIRON)
   #define NOZZLE_TO_PROBE_OFFSET { 0, 0, -16.8 }
 #endif
 
-#if NONE(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
+#if NONE(KNUTWURST_BLTOUCH, KNUTWURST_CHIRON)
   #define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 }
 #endif
 
@@ -2419,6 +2404,9 @@
   // NOTE: After 'M412 H1' the host handles filament runout and this script does not apply.
   #define FILAMENT_RUNOUT_SCRIPT "M600"
 
+  // More relaxed threshold to prevent false-positive triggers (default: 5)
+  #define FILAMENT_RUNOUT_THRESHOLD 20
+
   // After a runout is detected, continue printing this length of filament
   // before executing the runout script. Useful for a sensor at the end of
   // a feed tube. Requires 4 bytes SRAM per sensor, plus 4 bytes overhead.
@@ -2470,7 +2458,7 @@
  *   leveling in steps so you can manually adjust the Z height at each grid-point.
  *   With an LCD controller the process is guided step-by-step.
  */
-#if EITHER(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
+#if EITHER(KNUTWURST_BLTOUCH, KNUTWURST_CHIRON)
   // #define AUTO_BED_LEVELING_3POINT
   // #define AUTO_BED_LEVELING_LINEAR
   #define AUTO_BED_LEVELING_BILINEAR
@@ -2478,7 +2466,7 @@
   // #define MESH_BED_LEVELING
 #endif
 
-#if NONE(KNUTWURST_BLTOUCH, KNUTWURST_TFT_LEVELING)
+#if NONE(KNUTWURST_BLTOUCH, KNUTWURST_CHIRON)
   // #define AUTO_BED_LEVELING_3POINT
   // #define AUTO_BED_LEVELING_LINEAR
   // #define AUTO_BED_LEVELING_BILINEAR
@@ -3985,7 +3973,7 @@
  * Set this manually if there are extra servos needing manual control.
  * Set to 0 to turn off servo support.
  */
-#if ENABLED(KNUTWURST_TFT_LEVELING)
+#if ENABLED(KNUTWURST_CHIRON)
   #define NUM_SERVOS 1 // Note: Servo index starts with 0 for M280-M282 commands
 #endif
 

Marlin/Configuration_adv.h

@@ -304,13 +304,13 @@
  */
 #if ENABLED(THERMAL_PROTECTION_HOTENDS)
   #if ENABLED(KNUTWURST_CHIRON)
-    #define THERMAL_PROTECTION_PERIOD     60     // Seconds
+    #define THERMAL_PROTECTION_PERIOD     30     // Seconds
     #define THERMAL_PROTECTION_HYSTERESIS 20     // Degrees Celsius
 
     #define WATCH_TEMP_PERIOD   60               // Seconds
-    #define WATCH_TEMP_INCREASE 10               // Degrees Celsius
+    #define WATCH_TEMP_INCREASE 5               // Degrees Celsius
   #else
-    #define THERMAL_PROTECTION_PERIOD 10        // Seconds
+    #define THERMAL_PROTECTION_PERIOD 20        // Seconds
     #define THERMAL_PROTECTION_HYSTERESIS 15     // Degrees Celsius
 
     // #define ADAPTIVE_FAN_SLOWING              // Slow part cooling fan if temperature drops
@@ -340,22 +340,22 @@
  */
 #if ENABLED(THERMAL_PROTECTION_BED)
   #if ENABLED(KNUTWURST_CHIRON)
-    #define THERMAL_PROTECTION_BED_PERIOD         40 // Seconds
+    #define THERMAL_PROTECTION_BED_PERIOD         120 // Seconds
-    #define THERMAL_PROTECTION_BED_HYSTERESIS     10 // Degrees Celsius
+    #define THERMAL_PROTECTION_BED_HYSTERESIS     15 // Degrees Celsius
 
     /**
      * As described above, except for the bed (M140/M190/M303).
      */
-    #define WATCH_BED_TEMP_PERIOD                120 // Seconds
+    #define WATCH_BED_TEMP_PERIOD                300 // Seconds
-    #define WATCH_BED_TEMP_INCREASE               10 // Degrees Celsius
+    #define WATCH_BED_TEMP_INCREASE                2 // Degrees Celsius
   #else
-    #define THERMAL_PROTECTION_BED_PERIOD        20 // Seconds
+    #define THERMAL_PROTECTION_BED_PERIOD        30 // Seconds
     #define THERMAL_PROTECTION_BED_HYSTERESIS     2 // Degrees Celsius
 
     /**
      * As described above, except for the bed (M140/M190/M303).
      */
-    #define WATCH_BED_TEMP_PERIOD                60 // Seconds
+    #define WATCH_BED_TEMP_PERIOD               120 // Seconds
     #define WATCH_BED_TEMP_INCREASE               2 // Degrees Celsius
   #endif
 #endif
@@ -1479,12 +1479,12 @@
 #endif // HAS_DISPLAY || DWIN_LCD_PROUI
 
 // Add 'M73' to set print job progress, overrides Marlin's built-in estimate
-// #define SET_PROGRESS_MANUALLY
+#define SET_PROGRESS_MANUALLY
 #if ENABLED(SET_PROGRESS_MANUALLY)
   #define SET_PROGRESS_PERCENT            // Add 'P' parameter to set percentage done
   #define SET_REMAINING_TIME              // Add 'R' parameter to set remaining time
-  // #define SET_INTERACTION_TIME          // Add 'C' parameter to set time until next filament change or other user interaction
+  #define SET_INTERACTION_TIME          // Add 'C' parameter to set time until next filament change or other user interaction
-  // #define M73_REPORT                    // Report M73 values to host
+  #define M73_REPORT                    // Report M73 values to host
   #if BOTH(M73_REPORT, SDSUPPORT)
     #define M73_REPORT_SD_ONLY            // Report only when printing from SD
   #endif

Marlin/src/inc/Version.h

@@ -41,10 +41,10 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
- #define CUSTOM_BUILD_VERSION "1.5.1"
+ #define CUSTOM_BUILD_VERSION "1.5.3"
 
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2023-06-13"
+  #define STRING_DISTRIBUTION_DATE "2024-03-22"
 #endif
 
 /**

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
@@ -213,7 +206,7 @@ void OnPrintTimerStopped();
     void Command(const char* const command);
 #endif
 
-#if ENABLED(KNUTWURST_TFT_LEVELING)
+#if ENABLED(KNUTWURST_CHIRON)
     void LevelingDone();
 #endif
 
@@ -226,11 +219,10 @@ char serial3_char;
     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;
 
@@ -245,8 +237,7 @@ static AnycubicMediaPauseState mediaPauseState;
         float last_bed_temp;
         float last_hotend_temp;
         long  lastSDposition;
-  }
+    } OutageData;
-  OutageData;
 #endif
 
     int   CodeValueInt();
@@ -258,7 +249,6 @@ void ResumePrint();
     void  StopPrint();
     void  GetCommandFromTFT();
     void  CheckHeaterError();
-void FilamentChangePause();
     void  HandleSpecialMenu();
     void  RenderCurrentFileList();
     void  RenderSpecialMenu(uint16_t);

Marlin/src/lcd/extui/knutwurst/knutwurst_extui.cpp

@@ -94,7 +94,7 @@ namespace ExtUI {
     void onLevelingStart() {}
 
     void onLevelingDone() {
-      #if ENABLED(KNUTWURST_TFT_LEVELING)
+      #if ENABLED(KNUTWURST_CHIRON)
         AnycubicTouchscreen.LevelingDone();
       #endif
     }

Marlin/src/pins/ramps/pins_RAMPS.h

@@ -132,13 +132,6 @@
   #endif
 #endif
 
-//
-// Z Probe (when not Z_MIN_PIN)
-//
-#ifndef Z_MIN_PROBE_PIN
-  #define Z_MIN_PROBE_PIN                      2    // PATCH: Knutwurst
-#endif
-
 //
 // Steppers
 //