Set build version for next release

This reverts commit fb7a29ce8e.

Marlin/Configuration.h

@@ -59,6 +59,7 @@
  */
 #if ENABLED(KNUTWURST_CHIRON)
   #define TRIGORILLA_MAPPING_CHIRON
+  #define NO_AUTO_ASSIGN_WARNING
 #else
   #define TRIGORILLA_MAPPING_I3MEGA
   #define SWAP_Z_MOTORS
@@ -94,6 +95,7 @@
  */
 #if ENABLED(KNUTWURST_4MAXP2)
   #define ANYCUBIC_4_MAX_PRO_ENDSTOPS
+  #define NO_AUTO_ASSIGN_WARNING
 #endif
 
 
@@ -1939,7 +1941,7 @@
 #define Z_CLEARANCE_MULTI_PROBE     5 // Z Clearance between multiple probes
 // #define Z_AFTER_PROBING           5 // Z position after probing is done
 
-#define Z_PROBE_LOW_POINT          -2 // Farthest distance below the trigger-point to go before stopping
+#define Z_PROBE_LOW_POINT          -10 // Farthest distance below the trigger-point to go before stopping
 
 // For M851 give a range for adjusting the Z probe offset
 #define Z_PROBE_OFFSET_RANGE_MIN -50
@@ -2851,14 +2853,14 @@
 // Preheat Constants - Up to 10 are supported without changes
 //
 #define PREHEAT_1_LABEL       "PLA"
-#define PREHEAT_1_TEMP_HOTEND 180
-#define PREHEAT_1_TEMP_BED     70
+#define PREHEAT_1_TEMP_HOTEND 200
+#define PREHEAT_1_TEMP_BED     60
 // #define PREHEAT_1_TEMP_CHAMBER 35
 #define PREHEAT_1_FAN_SPEED     0 // Value from 0 to 255
 
 #define PREHEAT_2_LABEL       "ABS"
 #define PREHEAT_2_TEMP_HOTEND 240
-#define PREHEAT_2_TEMP_BED    110
+#define PREHEAT_2_TEMP_BED     90
 // #define PREHEAT_2_TEMP_CHAMBER 35
 #define PREHEAT_2_FAN_SPEED     0 // Value from 0 to 255
 

Marlin/Configuration_adv.h

@@ -1611,7 +1611,7 @@
    *  - SDSORT_CACHE_NAMES will retain the sorted file listing in RAM. (Expensive!)
    *  - SDSORT_DYNAMIC_RAM only uses RAM when the SD menu is visible. (Use with caution!)
    */
-  // #define SDCARD_SORT_ALPHA
+  #define SDCARD_SORT_ALPHA
 
   // SD Card Sorting options
   #if ENABLED(SDCARD_SORT_ALPHA)
@@ -2658,29 +2658,73 @@
  */
 #define ADVANCED_PAUSE_FEATURE
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
-  #define PAUSE_PARK_RETRACT_FEEDRATE         40  // (mm/s) Initial retract feedrate.
-  #define PAUSE_PARK_RETRACT_LENGTH            4  // (mm) Initial retract.
-                                                  // This short retract is done immediately, before parking the nozzle.
-  #define FILAMENT_CHANGE_UNLOAD_FEEDRATE     30  // (mm/s) Unload filament feedrate. This can be pretty fast.
-  #define FILAMENT_CHANGE_UNLOAD_ACCEL        25  // (mm/s^2) Lower acceleration may allow a faster feedrate.
-  #define FILAMENT_CHANGE_UNLOAD_LENGTH      555  // (mm) The length of filament for a complete unload.
-                                                  //   For Bowden, the full length of the tube and nozzle.
-                                                  //   For direct drive, the full length of the nozzle.
-                                                  //   Set to 0 for manual unloading.
-  #define FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE   6  // (mm/s) Slow move when starting load.
-  #define FILAMENT_CHANGE_SLOW_LOAD_LENGTH     0  // (mm) Slow length, to allow time to insert material.
-                                                  // 0 to disable start loading and skip to fast load only
-  #define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE  30  // (mm/s) Load filament feedrate. This can be pretty fast.
-  #define FILAMENT_CHANGE_FAST_LOAD_ACCEL     25  // (mm/s^2) Lower acceleration may allow a faster feedrate.
-  #define FILAMENT_CHANGE_FAST_LOAD_LENGTH   538  // (mm) Load length of filament, from extruder gear to nozzle.
-                                                  //   For Bowden, the full length of the tube and nozzle.
-                                                  //   For direct drive, the full length of the nozzle.
+    #if ENABLED(KNUTWURST_4MAXP2)
+      #define PAUSE_PARK_RETRACT_FEEDRATE         40  // (mm/s) Initial retract feedrate.
+      #define PAUSE_PARK_RETRACT_LENGTH            4  // (mm) Initial retract.
+                                                      // This short retract is done immediately, before parking the nozzle.
+      #define FILAMENT_CHANGE_UNLOAD_FEEDRATE     30  // (mm/s) Unload filament feedrate. This can be pretty fast.
+      #define FILAMENT_CHANGE_UNLOAD_ACCEL        25  // (mm/s^2) Lower acceleration may allow a faster feedrate.
+      #define FILAMENT_CHANGE_UNLOAD_LENGTH        5  // (mm) The length of filament for a complete unload.
+                                                      //   For Bowden, the full length of the tube and nozzle.
+                                                      //   For direct drive, the full length of the nozzle.
+                                                      //   Set to 0 for manual unloading.
+      #define FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE   6  // (mm/s) Slow move when starting load.
+      #define FILAMENT_CHANGE_SLOW_LOAD_LENGTH     0  // (mm) Slow length, to allow time to insert material.
+                                                      // 0 to disable start loading and skip to fast load only
+      #define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE  30  // (mm/s) Load filament feedrate. This can be pretty fast.
+      #define FILAMENT_CHANGE_FAST_LOAD_ACCEL     25  // (mm/s^2) Lower acceleration may allow a faster feedrate.
+      #define FILAMENT_CHANGE_FAST_LOAD_LENGTH    10  // (mm) Load length of filament, from extruder gear to nozzle.
+                                                      //   For Bowden, the full length of the tube and nozzle.
+                                                      //   For direct drive, the full length of the nozzle.
+    #endif
+
+    #if ENABLED(KNUTWURST_CHIRON)
+      #define PAUSE_PARK_RETRACT_FEEDRATE         40  // (mm/s) Initial retract feedrate.
+      #define PAUSE_PARK_RETRACT_LENGTH            4  // (mm) Initial retract.
+                                                      // This short retract is done immediately, before parking the nozzle.
+      #define FILAMENT_CHANGE_UNLOAD_FEEDRATE     30  // (mm/s) Unload filament feedrate. This can be pretty fast.
+      #define FILAMENT_CHANGE_UNLOAD_ACCEL        25  // (mm/s^2) Lower acceleration may allow a faster feedrate.
+      #define FILAMENT_CHANGE_UNLOAD_LENGTH        5  // (mm) The length of filament for a complete unload.
+                                                      //   For Bowden, the full length of the tube and nozzle.
+                                                      //   For direct drive, the full length of the nozzle.
+                                                      //   Set to 0 for manual unloading.
+      #define FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE   6  // (mm/s) Slow move when starting load.
+      #define FILAMENT_CHANGE_SLOW_LOAD_LENGTH     0  // (mm) Slow length, to allow time to insert material.
+                                                      // 0 to disable start loading and skip to fast load only
+      #define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE  30  // (mm/s) Load filament feedrate. This can be pretty fast.
+      #define FILAMENT_CHANGE_FAST_LOAD_ACCEL     25  // (mm/s^2) Lower acceleration may allow a faster feedrate.
+      #define FILAMENT_CHANGE_FAST_LOAD_LENGTH   550  // (mm) Load length of filament, from extruder gear to nozzle.
+                                                      //   For Bowden, the full length of the tube and nozzle.
+                                                      //   For direct drive, the full length of the nozzle.
+    #endif
+
+    #if NONE(KNUTWURST_CHIRON, KNUTWURST_4MAXP2)
+      #define PAUSE_PARK_RETRACT_FEEDRATE         40  // (mm/s) Initial retract feedrate.
+      #define PAUSE_PARK_RETRACT_LENGTH            4  // (mm) Initial retract.
+                                                      // This short retract is done immediately, before parking the nozzle.
+      #define FILAMENT_CHANGE_UNLOAD_FEEDRATE     30  // (mm/s) Unload filament feedrate. This can be pretty fast.
+      #define FILAMENT_CHANGE_UNLOAD_ACCEL        25  // (mm/s^2) Lower acceleration may allow a faster feedrate.
+      #define FILAMENT_CHANGE_UNLOAD_LENGTH      555  // (mm) The length of filament for a complete unload.
+                                                      //   For Bowden, the full length of the tube and nozzle.
+                                                      //   For direct drive, the full length of the nozzle.
+                                                      //   Set to 0 for manual unloading.
+      #define FILAMENT_CHANGE_SLOW_LOAD_FEEDRATE   6  // (mm/s) Slow move when starting load.
+      #define FILAMENT_CHANGE_SLOW_LOAD_LENGTH     0  // (mm) Slow length, to allow time to insert material.
+                                                      // 0 to disable start loading and skip to fast load only
+      #define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE  30  // (mm/s) Load filament feedrate. This can be pretty fast.
+      #define FILAMENT_CHANGE_FAST_LOAD_ACCEL     25  // (mm/s^2) Lower acceleration may allow a faster feedrate.
+      #define FILAMENT_CHANGE_FAST_LOAD_LENGTH   538  // (mm) Load length of filament, from extruder gear to nozzle.
+                                                      //   For Bowden, the full length of the tube and nozzle.
+                                                      //   For direct drive, the full length of the nozzle.
+  #endif
+
   #define ADVANCED_PAUSE_CONTINUOUS_PURGE       // Purge continuously up to the purge length until interrupted.
   #define ADVANCED_PAUSE_PURGE_FEEDRATE        2  // (mm/s) Extrude feedrate (after loading). Should be slower than load feedrate.
   #define ADVANCED_PAUSE_PURGE_LENGTH          2  // (mm) Length to extrude after loading.
                                                   //   Set to 0 for manual extrusion.
                                                   //   Filament can be extruded repeatedly from the Filament Change menu
                                                   //   until extrusion is consistent, and to purge old filament.
+
   // #define ADVANCED_PAUSE_RESUME_PRIME        0  // (mm) Extra distance to prime nozzle after returning from park.
   #define ADVANCED_PAUSE_FANS_PAUSE             // Turn off print-cooling fans while the machine is paused.
 

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.0-b5"
+ #define CUSTOM_BUILD_VERSION "1.5.0"
 
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2023-05-28"
+  #define STRING_DISTRIBUTION_DATE "2023-06-07"
 #endif
 
 /**

Marlin/src/lcd/extui/knutwurst/anycubic_touchscreen.h

@@ -21,15 +21,9 @@
 #ifndef anycubic_touchscreen_h
 #define anycubic_touchscreen_h
 
-// #include <stdio.h>
-// #include "../inc/MarlinConfig.h"
-// #include "../module/configuration_store.h"
-
 #include "../../../inc/MarlinConfigPre.h"
 #include "../../../module/probe.h"
 
-void initializeGrid();
-
 char *itostr2(const uint8_t &x);
 
 #ifndef ULTRA_LCD
@@ -42,26 +36,13 @@ char *itostr2(const uint8_t &x);
 #define MSG_MY_VERSION CUSTOM_BUILD_VERSION
 #define MAX_PRINTABLE_FILENAME_LEN 26
 
-#if ENABLED(KNUTWURST_CHIRON)
-  #define FIL_RUNOUT_PIN 33
-#else
-  #define FIL_RUNOUT_PIN 19
-#endif
-
-#define ANYCUBIC_TFT_STATE_IDLE 0
-#define ANYCUBIC_TFT_STATE_SDPRINT 1
-#define ANYCUBIC_TFT_STATE_SDPAUSE 2
-#define ANYCUBIC_TFT_STATE_SDPAUSE_REQ 3
-#define ANYCUBIC_TFT_STATE_SDPAUSE_OOF 4
-#define ANYCUBIC_TFT_STATE_SDSTOP_REQ 5
-#define ANYCUBIC_TFT_STATE_SDOUTAGE 99
-
 enum AnycubicMediaPrintState {
   AMPRINTSTATE_NOT_PRINTING,
   AMPRINTSTATE_PRINTING,
   AMPRINTSTATE_PAUSE_REQUESTED,
   AMPRINTSTATE_PAUSED,
-  AMPRINTSTATE_STOP_REQUESTED
+  AMPRINTSTATE_STOP_REQUESTED,
+  AMPRINTSTATE_PROBING
 };
 
 enum AnycubicMediaPauseState {
@@ -76,189 +57,143 @@ enum AnycubicMediaPauseState {
   AMPAUSESTATE_PAUSED
 };
 
+  
+#define SM_DIR_UP_S           "DIR_UP~1.GCO"
+#define SM_SPECIAL_MENU_S     "<SPECI~1.GCO"
+#define SM_PID_HOTEND_S       "<PIDTU~1.GCO"
+#define SM_PID_BED_S          "<PIDTU~2.GCO"
+#define SM_SAVE_EEPROM_S      "<SAVEE~1.GCO"
+#define SM_LOAD_DEFAULTS_S    "<LOADF~1.GCO"
+#define SM_PREHEAT_BED_S      "<PREHE~1.GCO"
+#define SM_MESH_MENU_S        "<MESHL~1.GCO"
+#define SM_MESH_START_S       "<START~1.GCO"
+#define SM_MESH_NEXT_S        "<NEXTM~1.GCO"
+#define SM_Z_UP_01_S          "<ZUP01~1.GCO"
+#define SM_Z_DN_01_S          "<ZDOWN~1.GCO"
+#define SM_Z_UP_002_S         "<ZUP00~1.GCO"
+#define SM_Z_DN_002_S         "<ZDOWN~2.GCO"
+#define SM_Z_UP_001_S         "<ZUP00~2.GCO"
+#define SM_Z_DN_001_S         "<ZDOWN~3.GCO"
+#define SM_BLTOUCH_S          "<BLTOU~1.GCO"
+#define SM_RESETLV_S          "<RSTLV~1.GCO"
+#define SM_PAUSE_S            "<FILCH~2.GCO"
+#define SM_RESUME_S           "<FILCH~1.GCO"
+#define SM_DIS_FILSENS_S      "<DISAB~1.GCO"
+#define SM_EN_FILSENS_S       "<ENABL~1.GCO"
+#define SM_EXIT_S             "<EXIT_~1.GCO"
+#define SM_BACK_S             "<BACK_~1.GCO"
+#define SM_FLOWMENU_S         "<SETFLO1.GCO"
+#define SM_FLOW_DISP_S        "<FLDISPL.GCO"
+#define SM_FLOW_UP_S          "<UPFLOW1.GCO"
+#define SM_FLOW_DN_S          "<DWNFLOW.GCO"
+#define SM_FLOW_EXIT_S        "<EXTFLW1.GCO"
+#define SM_EZLVL_MENU_S       "<EZLVLM1.GCO"
+#define SM_EZLVL_P1_S         "<EZLPA01.GCO"
+#define SM_EZLVL_P2_S         "<EZLPB01.GCO"
+#define SM_EZLVL_P3_S         "<EZLPC01.GCO"
+#define SM_EZLVL_P4_S         "<EZLPD01.GCO"
+#define SM_EZLVL_EXIT_S       "<EZLEXT1.GCO"
+#define SM_BLTZMENU_S         "<SETOFZ0.GCO"
+#define SM_BLTZ_DISP_S        "<OFZDSP0.GCO"
+#define SM_BLTZ_UP_S          "<UPOFFZ0.GCO"
+#define SM_BLTZ_DN_S          "<DOWNOFZ.GCO"
+#define SM_BLTZ_EXIT_S        "<EXTABLM.GCO"
+#define SM_HS_DISABLE_S       "<HSDISAB.GCO"
+#define SM_HS_ENABLE_S        "<HSENABL.GCO"
+
+
 #if DISABLED(KNUTWURST_DGUS2_TFT)
   #define SM_DIR_UP_L           "/.."
-  #define SM_DIR_UP_S           ".."
   #define SM_SPECIAL_MENU_L     "<Special Menu>"
-  #define SM_SPECIAL_MENU_S     "<SPECM>"
   #define SM_PID_HOTEND_L       "<PID Tune Hotend>"
-  #define SM_PID_HOTEND_S       "<PIDHE>"
   #define SM_PID_BED_L          "<PID Tune Ultrabase>"
-  #define SM_PID_BED_S          "<PIDUB>"
   #define SM_SAVE_EEPROM_L      "<Save EEPROM>"
-  #define SM_SAVE_EEPROM_S      "<SAVEE>"
   #define SM_LOAD_DEFAULTS_L    "<Load FW Defaults>"
-  #define SM_LOAD_DEFAULTS_S    "<LDDEF>"
   #define SM_PREHEAT_BED_L      "<Preheat Ultrabase>"
-  #define SM_PREHEAT_BED_S      "<PREHE>"
   #define SM_MESH_MENU_L        "<Mesh Leveling>"
-  #define SM_MESH_MENU_S        "<MESHL>"
   #define SM_MESH_START_L       "<Start Mesh Leveling>"
-  #define SM_MESH_START_S       "<SMESH>"
   #define SM_MESH_NEXT_L        "<Next Mesh Point>"
-  #define SM_MESH_NEXT_S        "<NEXTM>"
   #define SM_Z_UP_01_L          "<Z Up 0.1>"
-  #define SM_Z_UP_01_S          "<ZUP01>"
   #define SM_Z_DN_01_L          "<Z Down 0.1>"
-  #define SM_Z_DN_01_S          "<ZDN01>"
   #define SM_Z_UP_002_L         "<Z Up 0.02>"
-  #define SM_Z_UP_002_S         "<ZUP002>"
   #define SM_Z_DN_002_L         "<Z Down 0.02>"
-  #define SM_Z_DN_002_S         "<ZDN002>"
   #define SM_Z_UP_001_L         "<Z Up 0.01>"
-  #define SM_Z_UP_001_S         "<ZUP001>"
   #define SM_Z_DN_001_L         "<Z Down 0.01>"
-  #define SM_Z_DN_001_S         "<ZDN001>"
   #define SM_BLTOUCH_L          "<Start Auto Leveling>"
-  #define SM_BLTOUCH_S          "<BLTCH>"
   #define SM_RESETLV_L          "<Reset Level Grid>"
-  #define SM_RESETLV_S          "<RSTLV>"
   #define SM_PAUSE_L            "<Fil. Change Pause>"
-  #define SM_PAUSE_S            "<PAUSE>"
   #define SM_RESUME_L           "<Fil. Change Resume>"
-  #define SM_RESUME_S           "<RESUM>"
   #define SM_DIS_FILSENS_L      "<Disable Fil. Sensor>"
-  #define SM_DIS_FILSENS_S      "<DISSEN>"
   #define SM_EN_FILSENS_L       "<Enable Fil. Sensor>"
-  #define SM_EN_FILSENS_S       "<ENSEN>"
   #define SM_EXIT_L             "<Exit>"
-  #define SM_EXIT_S             "<SMEXIT>"
-
   #define SM_BACK_L             "<End Mesh Leveling>"
-  #define SM_BACK_S             "<BACK>"
-
   #define SM_FLOWMENU_L         "<Set Flowrate>"
-  #define SM_FLOWMENU_S         "<SETFLO>"
   #define SM_FLOW_DISP_L        "<Flow is XXX>"
-  #define SM_FLOW_DISP_S        "<FLDISP>"
   #define SM_FLOW_UP_L          "<Up>"
-  #define SM_FLOW_UP_S          "<FLUP>"
   #define SM_FLOW_DN_L          "<Down>"
-  #define SM_FLOW_DN_S          "<FLDN>"
   #define SM_FLOW_EXIT_L        "<Exit Flow Settings>"
-  #define SM_FLOW_EXIT_S        "<EXTFLW>"
-
   #define SM_EZLVL_MENU_L       "<Easy 4 Point Level>"
-  #define SM_EZLVL_MENU_S       "<EZLVLM>"
   #define SM_EZLVL_P1_L         "<Point A>"
-  #define SM_EZLVL_P1_S         "<EZLPA>"
   #define SM_EZLVL_P2_L         "<Point B>"
-  #define SM_EZLVL_P2_S         "<EZLPB>"
   #define SM_EZLVL_P3_L         "<Point C>"
-  #define SM_EZLVL_P3_S         "<EZLPC>"
   #define SM_EZLVL_P4_L         "<Point D>"
-  #define SM_EZLVL_P4_S         "<EZLPD>"
   #define SM_EZLVL_EXIT_L       "<Exit Easy Level>"
-  #define SM_EZLVL_EXIT_S       "<EZLEXT>"
-
   #define SM_BLTZMENU_L         "<Auto Leveling>"
-  #define SM_BLTZMENU_S         "<SETOFZ>"
   #define SM_BLTZ_DISP_L        "<Z Offset: XXXXX>"
-  #define SM_BLTZ_DISP_S        "<OFZDSP>"
   #define SM_BLTZ_UP_L          "<Up>"
-  #define SM_BLTZ_UP_S          "<UPOFFZ0>"
   #define SM_BLTZ_DN_L          "<Down>"
-  #define SM_BLTZ_DN_S          "<DNOFFZ0>"
   #define SM_BLTZ_EXIT_L        "<SAVE and EXIT>"
-  #define SM_BLTZ_EXIT_S        "<EXTABLM>"
+  #define SM_HS_DISABLE_L       "<Disable HiSpeed Mode>"
+  #define SM_HS_ENABLE_L        "<Enable HiSpeed Mode>"
 #endif // !KNUTWURST_DGUS2_TFT
 
 #if ENABLED(KNUTWURST_DGUS2_TFT)
-  #define SM_DIR_UP_L           "<<< BACK <<<        .gcode"
-  #define SM_DIR_UP_S           "DIR_UP~1.GCO"
+  #define SM_DIR_UP_L           "/..                 .gcode"
   #define SM_SPECIAL_MENU_L     "<Special Menu>      .gcode"
-  #define SM_SPECIAL_MENU_S     "<SPECI~1.GCO"
   #define SM_PID_HOTEND_L       "<PID Tune Hotend>   .gcode"
-  #define SM_PID_HOTEND_S       "<PIDTU~1.GCO"
   #define SM_PID_BED_L          "<PID Tune Ultrabase>.gcode"
-  #define SM_PID_BED_S          "<PIDTU~2.GCO"
   #define SM_SAVE_EEPROM_L      "<Save EEPROM>       .gcode"
-  #define SM_SAVE_EEPROM_S      "<SAVEE~1.GCO"
   #define SM_LOAD_DEFAULTS_L    "<Load FW Defaults>  .gcode"
-  #define SM_LOAD_DEFAULTS_S    "<LOADF~1.GCO"
   #define SM_PREHEAT_BED_L      "<Preheat Ultrabase> .gcode"
-  #define SM_PREHEAT_BED_S      "<PREHE~1.GCO"
   #define SM_MESH_MENU_L        "<Mesh Leveling>     .gcode"
-  #define SM_MESH_MENU_S        "<MESHL~1.GCO"
   #define SM_MESH_START_L       "<Start MeshLeveling>.gcode"
-  #define SM_MESH_START_S       "<START~1.GCO"
   #define SM_MESH_NEXT_L        "<Next Mesh Point>   .gcode"
-  #define SM_MESH_NEXT_S        "<NEXTM~1.GCO"
   #define SM_Z_UP_01_L          "<Z Up 0.1>          .gcode"
-  #define SM_Z_UP_01_S          "<ZUP01~1.GCO"
   #define SM_Z_DN_01_L          "<Z Down 0.1>        .gcode"
-  #define SM_Z_DN_01_S          "<ZDOWN~1.GCO"
   #define SM_Z_UP_002_L         "<Z Up 0.02>         .gcode"
-  #define SM_Z_UP_002_S         "<ZUP00~1.GCO"
   #define SM_Z_DN_002_L         "<Z Down 0.02>       .gcode"
-  #define SM_Z_DN_002_S         "<ZDOWN~2.GCO"
   #define SM_Z_UP_001_L         "<Z Up 0.01>         .gcode"
-  #define SM_Z_UP_001_S         "<ZUP00~2.GCO"
   #define SM_Z_DN_001_L         "<Z Down 0.01>       .gcode"
-  #define SM_Z_DN_001_S         "<ZDOWN~3.GCO"
   #define SM_BLTOUCH_L          "<Start AutoLeveling>.gcode"
-  #define SM_BLTOUCH_S          "<BLTOU~1.GCO"
   #define SM_RESETLV_L          "<Reset Level Grid>  .gcode"
-  #define SM_RESETLV_S          "<RSTLV~1.GCO>"
   #define SM_PAUSE_L            "<Fil. Change Pause> .gcode"
-  #define SM_PAUSE_S            "<FILCH~2.GCO"
   #define SM_RESUME_L           "<Fil. Change Resume>.gcode"
-  #define SM_RESUME_S           "<FILCH~1.GCO"
   #define SM_DIS_FILSENS_L      "<Disable Fil.Sensor>.gcode"
-  #define SM_DIS_FILSENS_S      "<DISAB~1.GCO"
   #define SM_EN_FILSENS_L       "<Enable Fil. Sensor>.gcode"
-  #define SM_EN_FILSENS_S       "<ENABL~1.GCO"
   #define SM_EXIT_L             "<Exit>              .gcode"
-  #define SM_EXIT_S             "<EXIT_~1.GCO"
-
   #define SM_BACK_L             "<End Mesh Leveling> .gcode"
-  #define SM_BACK_S             "<BACK_~1.GCO"
-
   #define SM_FLOWMENU_L         "<Set Flowrate>      .gcode"
-  #define SM_FLOWMENU_S         "<SETFLO1.GCO"
   #define SM_FLOW_DISP_L        "<Flow is XXX%>      .gcode"
-  #define SM_FLOW_DISP_S        "<FLDISPL.GCO"
   #define SM_FLOW_UP_L          "<Up>                .gcode"
-  #define SM_FLOW_UP_S          "<UPFLOW1.GCO"
   #define SM_FLOW_DN_L          "<Down>              .gcode"
-  #define SM_FLOW_DN_S          "<DWNFLOW.GCO"
   #define SM_FLOW_EXIT_L        "<Exit Flow Settings>.gcode"
-  #define SM_FLOW_EXIT_S        "<EXTFLW1.GCO"
-
   #define SM_EZLVL_MENU_L       "<Easy 4 Point Level>.gcode"
-  #define SM_EZLVL_MENU_S       "<EZLVLM1.GCO"
   #define SM_EZLVL_P1_L         "<Point A>           .gcode"
-  #define SM_EZLVL_P1_S         "<EZLPA01.GCO"
   #define SM_EZLVL_P2_L         "<Point B>           .gcode"
-  #define SM_EZLVL_P2_S         "<EZLPB01.GCO"
   #define SM_EZLVL_P3_L         "<Point C>           .gcode"
-  #define SM_EZLVL_P3_S         "<EZLPC01.GCO"
   #define SM_EZLVL_P4_L         "<Point D>           .gcode"
-  #define SM_EZLVL_P4_S         "<EZLPD01.GCO"
   #define SM_EZLVL_EXIT_L       "<Exit Easy Leveling>.gcode"
-  #define SM_EZLVL_EXIT_S       "<EZLEXT1.GCO"
-
   #define SM_BLTZMENU_L         "<Auto Leveling>     .gcode"
-  #define SM_BLTZMENU_S         "<SETOFZ0.GCO"
   #define SM_BLTZ_DISP_L        "<Z Offset: XXXXX>   .gcode"
-  #define SM_BLTZ_DISP_S        "<OFZDSP0.GCO"
   #define SM_BLTZ_UP_L          "<Up>                .gcode"
-  #define SM_BLTZ_UP_S          "<UPOFFZ0.GCO"
   #define SM_BLTZ_DN_L          "<Down>              .gcode"
-  #define SM_BLTZ_DN_S          "<DOWNOFZ.GCO"
   #define SM_BLTZ_EXIT_L        "<SAVE and EXIT>     .gcode"
-  #define SM_BLTZ_EXIT_S        "<EXTABLM.GCO"
+  #define SM_HS_DISABLE_L       "<Disable HiSpeed>   .gcode"
+  #define SM_HS_ENABLE_L        "<Enable HiSpeed>    .gcode"
 #endif // KNUTWURST_DGUS2_TFT
 
-#if ENABLED(KNUTWURST_TFT_LEVELING)
-  // eeprom_index
-  extern int z_values_index;
-  extern int z_values_size;
-  // temp value which needs to be saved
-  extern float SAVE_zprobe_zoffset;
-#endif
-
 class AnycubicTouchscreenClass {
+
 public:
 AnycubicTouchscreenClass();
 
@@ -270,12 +205,14 @@ void UserConfirmRequired(const char *);
 void SDCardStateChange(bool);
 void SDCardError();
 void KillTFT();
-static void OnPrintTimerStarted();
-static void OnPrintTimerPaused();
-static void OnPrintTimerStopped();
+void OnPrintTimerStarted();
+void OnPrintTimerPaused();
+void OnPrintTimerStopped();
+
 #if BOTH(ANYCUBIC_TFT_DEBUG, KNUTWURST_DGUS2_TFT)
   void Command(const char * const command);
 #endif
+
 #if ENABLED(KNUTWURST_TFT_LEVELING)
   void LevelingDone();
 #endif
@@ -290,15 +227,13 @@ int serial3_count = 0;
 char *TFTstrchr_pointer;
 char FlagResumFromOutage  = 0;
 int filenumber            = 0;
-unsigned long starttime   = 0;
-unsigned long stoptime    = 0;
 uint8_t tmp_extruder      = 0;
-char LastSDstatus         = 0;
 uint16_t HeaterCheckCount = 0;
-bool IsParked             = false;
 int currentFlowRate       = 0;
 bool PrintdoneAndPowerOFF = true;
 bool powerOFFflag         = 0;
+xy_uint8_t       selectedmeshpoint;
+float            live_Zoffset;
 
 static AnycubicMediaPrintState mediaPrintingState;
 static AnycubicMediaPauseState mediaPauseState;
@@ -318,26 +253,23 @@ static AnycubicMediaPauseState mediaPauseState;
 int CodeValueInt();
 float CodeValue();
 bool CodeSeen(char);
-void PrintList();
 void StartPrint();
 void PausePrint();
+void ResumePrint();
 void StopPrint();
-void StateHandler();
 void GetCommandFromTFT();
 void CheckSDCardChange();
 void CheckHeaterError();
-void HandleSpecialMenu();
 void FilamentChangePause();
-void ResumePrint();
-void ReheatNozzle();
-void ParkAfterStop();
+void HandleSpecialMenu();
+void RenderCurrentFileList();
+void RenderSpecialMenu(uint16_t);
+void RenderCurrentFolder(uint16_t);
 
-char currentTouchscreenSelection[30];
-char currentFileOrDirectory[30];
+char currentTouchscreenSelection[64];
+char currentFileOrDirectory[64];
 String flowRateBuffer;
 String zOffsetBuffer;
-uint16_t MyFileNrCnt          = 0;
-uint8_t FilamentSensorEnabled = true;
 
 uint8_t SpecialMenu = false;
 uint8_t MMLMenu     = false;

Marlin/src/pins/ramps/pins_RAMPS.h

@@ -286,9 +286,11 @@
   #endif
 #endif
 
-// RAMPS 1.4 DIO 4 on the servos connector
-#ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN                      19
+
+#if ANY(KNUTWURST_CHIRON, KNUTWURST_4MAXP2)
+  #define FIL_RUNOUT_PIN 33
+#else
+  #define FIL_RUNOUT_PIN 19
 #endif
 
 #ifndef PS_ON_PIN

Marlin/src/pins/ramps/pins_RAMPS_CHIRON.h

@@ -253,7 +253,7 @@
 
 // RAMPS 1.4 DIO 4 on the servos connector
 #ifndef FIL_RUNOUT_PIN
-  #define FIL_RUNOUT_PIN                       4
+  #define FIL_RUNOUT_PIN                      33
 #endif
 
 #ifndef PS_ON_PIN

Marlin/src/pins/ramps/pins_TRIGORILLA_14.h

@@ -86,6 +86,12 @@
     #define OUTAGECON_PIN                     58
   #endif
 
+  #if ANY(KNUTWURST_CHIRON, KNUTWURST_4MAXP2)
+    #define FIL_RUNOUT_PIN 33
+  #else
+    #define FIL_RUNOUT_PIN 19
+  #endif
+
   #if ENABLED(TRIGORILLA_MAPPING_CHIRON)
     #ifndef FIL_RUNOUT_PIN
       #define FIL_RUNOUT_PIN                  33

Marlin/src/pins/ramps/pins_TRIGORILLA_CHIRON.h

@@ -64,7 +64,7 @@
 #define TG_FAN1_PIN                            7  // Anycubic Kossel: Unused
 #define TG_FAN2_PIN                           44  // Anycubic Kossel: Hotend fan
 #define CONTROLLER_FAN_PIN                    TG_FAN1_PIN
-#define FIL_RUNOUT_PIN                        19
+#define FIL_RUNOUT_PIN                        33
 #define BEEPER_PIN                            31
 #define SDSS                                  53
 #define LED_PIN                               13