Fix load fw defaults gcode in special menu.

.github/workflows/close-stale.yml

@@ -21,7 +21,7 @@ jobs:
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label / comment or this will be closed in 5 days.'
-        days-before-stale: 30
-        days-before-close: 5
+        days-before-stale: 300
+        days-before-close: 30
         stale-issue-label: 'stale-closing-soon'
         exempt-issue-labels: 'T: Feature Request'

.github/workflows/lock-closed.yml

@@ -21,7 +21,7 @@ jobs:
       with:
         github-token: ${{ github.token }}
         process-only: 'issues'
-        issue-lock-inactive-days: '60'
+        issue-lock-inactive-days: '300'
         issue-exclude-created-before: ''
         issue-exclude-labels: 'no-locking'
         issue-lock-labels: ''

Marlin/Configuration.h

@@ -37,9 +37,6 @@
  */
 #define CONFIGURATION_H_VERSION 02010200
 #define ANYCUBIC_TOUCHSCREEN
-#if DISABLED(KNUTWURST_4MAXP2)
-  #define ANYCUBIC_FILAMENT_RUNOUT_SENSOR
-#endif
 #define KNUTWURST_SPECIAL_MENU
 #define KNUTWURST_SPECIAL_MENU_WO_SD
 // #define ANYCUBIC_TFT_DEBUG
@@ -62,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
@@ -97,6 +95,7 @@
  */
 #if ENABLED(KNUTWURST_4MAXP2)
   #define ANYCUBIC_4_MAX_PRO_ENDSTOPS
+  #define NO_AUTO_ASSIGN_WARNING
 #endif
 
 
@@ -1942,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
@@ -2380,15 +2379,15 @@
  * RAMPS-based boards use SERVO3_PIN for the first runout sensor.
  * For other boards you may need to define FIL_RUNOUT_PIN, FIL_RUNOUT2_PIN, etc.
  */
-// #define FILAMENT_RUNOUT_SENSOR
+#define FILAMENT_RUNOUT_SENSOR
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
   #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500.
   #define NUM_RUNOUT_SENSORS   1          // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
 
-  #define FIL_RUNOUT_STATE     LOW        // Pin state indicating that filament is NOT present.
-  #define FIL_RUNOUT_PULLUP               // Use internal pullup for filament runout pins.
-  // #define FIL_RUNOUT_PULLDOWN           // Use internal pulldown for filament runout pins.
-  // #define WATCH_ALL_RUNOUT_SENSORS      // Execute runout script on any triggering sensor, not only for the active extruder.
+  #define FIL_RUNOUT_STATE     HIGH        // Pin state indicating that filament is NOT present.
+  // #define FIL_RUNOUT_PULLUP           // Use internal pullup for filament runout pins.
+  // #define FIL_RUNOUT_PULLDOWN         // Use internal pulldown for filament runout pins.
+  // #define WATCH_ALL_RUNOUT_SENSORS    // Execute runout script on any triggering sensor, not only for the active extruder.
   // This is automatically enabled for MIXING_EXTRUDERs.
 
   // Override individually if the runout sensors vary
@@ -2854,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

@@ -989,7 +989,7 @@
    *
    * Set the default state here, change with 'M401 S' or UI, use M500 to save, M502 to reset.
    */
-  #define BLTOUCH_HS_MODE true
+  #define BLTOUCH_HS_MODE false
 
   // Safety: Enable voltage mode settings in the LCD menu.
   // #define BLTOUCH_LCD_VOLTAGE_MENU
@@ -1551,7 +1551,7 @@
 
   // #define MEDIA_MENU_AT_TOP               // Force the media menu to be listed on the top of the main menu
 
-  #define EVENT_GCODE_SD_ABORT "G28XY"      // G-code to run on SD Abort Print (e.g., "G28XY" or "G27")
+  #define EVENT_GCODE_SD_ABORT "G27"      // G-code to run on SD Abort Print (e.g., "G28XY" or "G27")
 
   #if ENABLED(PRINTER_EVENT_LEDS)
     #define PE_LEDS_COMPLETED_TIME  (30 * 60) // (seconds) Time to keep the LED "done" color before restoring normal illumination
@@ -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         60  // (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.
-  // #define ADVANCED_PAUSE_CONTINUOUS_PURGE       // Purge continuously up to the purge length until interrupted.
+    #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     5  // (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     5  // (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.
 
@@ -2690,7 +2734,7 @@
   #define FILAMENT_UNLOAD_PURGE_LENGTH         8  // (mm) An unretract is done, then this length is purged.
   #define FILAMENT_UNLOAD_PURGE_FEEDRATE      25  // (mm/s) feedrate to purge before unload
 
-  #define PAUSE_PARK_NOZZLE_TIMEOUT           60  // (seconds) Time limit before the nozzle is turned off for safety.
+  #define PAUSE_PARK_NOZZLE_TIMEOUT          300  // (seconds) Time limit before the nozzle is turned off for safety.
   #define FILAMENT_CHANGE_ALERT_BEEPS         10  // Number of alert beeps to play when a response is needed.
   #define PAUSE_PARK_NO_STEPPER_TIMEOUT           // Enable for XYZ steppers to stay powered on during filament change.
   // #define FILAMENT_CHANGE_RESUME_ON_INSERT      // Automatically continue / load filament when runout sensor is triggered again.
@@ -4012,7 +4056,7 @@
   #define HOST_PAUSE_M76                  // Tell the host to pause in response to M76
   #define HOST_PROMPT_SUPPORT             // Initiate host prompts to get user feedback
   #if ENABLED(HOST_PROMPT_SUPPORT)
-    // #define HOST_STATUS_NOTIFICATIONS   // Send some status messages to the host as notifications
+    #define HOST_STATUS_NOTIFICATIONS   // Send some status messages to the host as notifications
   #endif
   // #define HOST_START_MENU_ITEM          // Add a menu item that tells the host to start
   // #define HOST_SHUTDOWN_MENU_ITEM       // Add a menu item that tells the host to shut down

Marlin/src/MarlinCore.cpp

@@ -252,12 +252,6 @@
   #include "tests/marlin_tests.h"
 #endif
 
-// PATCH START: Knutwurst
-#if ENABLED(ANYCUBIC_TOUCHSCREEN)
-  #include "lcd/extui/knutwurst/anycubic_touchscreen.h"
-#endif
-// PATCH END: Knutwurst
-
 PGMSTR(M112_KILL_STR, "M112 Shutdown");
 
 MarlinState marlin_state = MF_INITIALIZING;
@@ -396,88 +390,6 @@ void startOrResumeJob() {
 
 #endif // SDSUPPORT
 
-// PATCH START: Knutwurst
-#ifdef ENDSTOP_BEEP
-void EndstopBeep() {
-    static char last_status = ((READ(X_MIN_PIN) << 2) | (READ(Y_MIN_PIN) << 1) | READ(X_MAX_PIN));
-    static unsigned char now_status;
-
-    now_status = ((READ(X_MIN_PIN) << 2) | (READ(Y_MIN_PIN) << 1) | READ(X_MAX_PIN)) & 0xff;
-
-    if (now_status<last_status) {
-      static millis_t endstop_ms = millis() + 300UL;
-      if (ELAPSED(millis(), endstop_ms)) {
-        buzzer.tone(60, 2000);
-      }
-      last_status = now_status;
-    } else if (now_status != last_status) {
-      last_status=now_status;
-    }
-  }
-#endif
-
-#if HAS_FILAMENT_SENSOR
-  void event_filament_runout() {
-    #if ENABLED(ADVANCED_PAUSE_FEATURE)
-      if (did_pause_print) return;  // Action already in progress. Purge triggered repeated runout.
-    #endif
-
-    #if ENABLED(EXTENSIBLE_UI)
-      ExtUI::onFilamentRunout(ExtUI::getActiveTool());
-    #endif
-
-    #if EITHER(HOST_PROMPT_SUPPORT, HOST_ACTION_COMMANDS)
-      const char tool = '0'
-      #if NUM_RUNOUT_SENSORS > 1
-        + active_extruder
-      #endif
-      ;
-    #endif
-
-    //action:out_of_filament
-    #if ENABLED(HOST_PROMPT_SUPPORT)
-      host_prompt_reason = PROMPT_FILAMENT_RUNOUT;
-      host_action_prompt_end();
-      host_action_prompt_begin(PSTR("FilamentRunout T"), false);
-      SERIAL_CHAR(tool);
-      SERIAL_EOL();
-      host_action_prompt_show();
-    #endif
-
-    const bool run_runout_script = !runout.host_handling;
-
-    #if ENABLED(HOST_ACTION_COMMANDS)
-      if (run_runout_script
-        && ( strstr(FILAMENT_RUNOUT_SCRIPT, "M600")
-          || strstr(FILAMENT_RUNOUT_SCRIPT, "M125")
-          #if ENABLED(ADVANCED_PAUSE_FEATURE)
-            || strstr(FILAMENT_RUNOUT_SCRIPT, "M25")
-          #endif
-        )
-      ) {
-        host_action_paused(false);
-      } else {
-        // Legacy Repetier command for use until newer version supports standard dialog
-        // To be removed later when pause command also triggers dialog
-        #ifdef ACTION_ON_FILAMENT_RUNOUT
-          host_action(PSTR(ACTION_ON_FILAMENT_RUNOUT " T"), false);
-          SERIAL_CHAR(tool);
-          SERIAL_EOL();
-        #endif
-
-        host_action_pause(false);
-      }
-      SERIAL_ECHOPGM(" " ACTION_REASON_ON_FILAMENT_RUNOUT " ");
-      SERIAL_CHAR(tool);
-      SERIAL_EOL();
-    #endif // HOST_ACTION_COMMANDS
-
-    if (run_runout_script) {
-      queue.inject_P(PSTR(FILAMENT_RUNOUT_SCRIPT));
-    }
-  }
-#endif // HAS_FILAMENT_SENSOR
-// PATCH END: Knutwurst
 
 /**
  * Minimal management of Marlin's core activities:
@@ -493,12 +405,6 @@ void EndstopBeep() {
  *  - Pulse FET_SAFETY_PIN if it exists
  */
 inline void manage_inactivity(const bool no_stepper_sleep=false) {
-  // PATCH START: Knutwurst
-  #if ENABLED(ANYCUBIC_TOUCHSCREEN) && ENABLED(ANYCUBIC_FILAMENT_RUNOUT_SENSOR)
-    AnycubicTouchscreen.FilamentRunout();
-  #endif
-  // PATCH END: Knutwurst
-
   queue.get_available_commands();
 
   const millis_t ms = millis();
@@ -889,12 +795,6 @@ void idle(bool no_stepper_sleep/*=false*/) {
   // Max7219 heartbeat, animation, etc
   TERN_(MAX7219_DEBUG, max7219.idle_tasks());
 
-  // PATCH START: Knutwurst
-  #ifdef ENDSTOP_BEEP
-    EndstopBeep();
-  #endif
-  // PATCH END: Knutwurst
-
   // Return if setup() isn't completed
   if (marlin_state == MF_INITIALIZING) goto IDLE_DONE;
 

Marlin/src/feature/pause.cpp

@@ -576,17 +576,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
       IF_DISABLED(PAUSE_REHEAT_FAST_RESUME, wait_for_user = true);
 
       nozzle_timed_out = false;
-/*
-      #ifdef ANYCUBIC_TOUCHSCREEN
-        if (AnycubicTouchscreen.ai3m_pause_state > 3) {
-          AnycubicTouchscreen.ai3m_pause_state -= 3;
-          #ifdef ANYCUBIC_TFT_DEBUG
-            SERIAL_ECHOPGM(" DEBUG: NTO - AI3M Pause State set to: ", AnycubicTouchscreen.ai3m_pause_state);
-            SERIAL_EOL();
-          #endif
-        }
-      #endif
-*/
+
       first_impatient_beep(max_beep_count);
     }
     idle_no_sleep();

Marlin/src/gcode/feature/pause/M600.cpp

@@ -30,13 +30,6 @@
 #include "../../../module/printcounter.h"
 #include "../../../lcd/marlinui.h"
 
-// PATCH START: Knutwurst
-#ifdef ANYCUBIC_TOUCHSCREEN
-  #include "../../../lcd/extui/knutwurst/anycubic_touchscreen.h"
-  #include "../../../sd/cardreader.h"
-#endif
-// PATCH END: Knutwurst
-
 #if HAS_MULTI_EXTRUDER
   #include "../../../module/tool_change.h"
 #endif
@@ -78,29 +71,6 @@
  *  Default values are used for omitted arguments.
  */
 void GcodeSuite::M600() {
-  // PATCH START: Knutwurst
-  #ifdef ANYCUBIC_TOUCHSCREEN
-    #ifdef SDSUPPORT
-      if (card.isPrinting()) { // are we printing from sd?
-        if (AnycubicTouchscreen.ai3m_pause_state < 2) {
-          AnycubicTouchscreen.ai3m_pause_state = 2;
-          #ifdef ANYCUBIC_TFT_DEBUG
-            SERIAL_ECHOPGM(" DEBUG: M600 - AI3M Pause State set to: ", AnycubicTouchscreen.ai3m_pause_state);
-            SERIAL_EOL();
-          #endif
-        }
-        #ifdef ANYCUBIC_TFT_DEBUG
-          SERIAL_ECHOLNPGM("DEBUG: Enter M600 TFTstate routine");
-        #endif
-        AnycubicTouchscreen.TFTstate = ANYCUBIC_TFT_STATE_SDPAUSE_REQ; // enter correct display state to show resume button
-        #ifdef ANYCUBIC_TFT_DEBUG
-          SERIAL_ECHOLNPGM("DEBUG: Set TFTstate to SDPAUSE_REQ");
-        #endif
-      }
-    #endif
-  #endif
-  // PATCH END: Knutwurst
-
   #if ENABLED(MIXING_EXTRUDER)
     const int8_t eindex = get_target_e_stepper_from_command();
     if (eindex < 0) return;

Marlin/src/gcode/temp/M104_M109.cpp

@@ -38,10 +38,6 @@
 
 #include "../../MarlinCore.h" // for startOrResumeJob, etc.
 
-#ifdef ANYCUBIC_TOUCHSCREEN
-  #include "../../lcd/extui/knutwurst/anycubic_touchscreen.h"
-#endif
-
 #if ENABLED(PRINTJOB_TIMER_AUTOSTART)
   #include "../../module/printcounter.h"
   #if ENABLED(CANCEL_OBJECTS)
@@ -133,10 +129,6 @@ void GcodeSuite::M104_M109(const bool isM109) {
       thermalManager.set_heating_message(target_extruder, !isM109 && got_temp);
   }
 
-  #ifdef ANYCUBIC_TOUCHSCREEN
-    AnycubicTouchscreen.HeatingStart();
-  #endif
-
   TERN_(AUTOTEMP, planner.autotemp_M104_M109());
 
   if (isM109 && got_temp)
@@ -144,11 +136,6 @@ void GcodeSuite::M104_M109(const bool isM109) {
 
   // flush the serial buffer after heating to prevent lockup by m105
   SERIAL_FLUSH();
-
-  #ifdef ANYCUBIC_TOUCHSCREEN
-    AnycubicTouchscreen.CommandScan();
-    AnycubicTouchscreen.BedHeatingDone();
-  #endif
 }
 
 #endif // EXTRUDERS

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-b3"
+ #define CUSTOM_BUILD_VERSION "1.5.0-RC1"
 
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2023-01-03"
+  #define STRING_DISTRIBUTION_DATE "2023-06-02"
 #endif
 
 /**

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

@@ -21,19 +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"
 
-
-enum axis_t     : uint8_t { X, Y, Z, X2, Y2, Z2, Z3, Z4 };
-enum extruder_t : uint8_t { E0, E1, E2, E3, E4, E5, E6, E7 };
-void setAxisPosition_mm(const float, const axis_t, const feedRate_t=0);
-void initializeGrid();
-
 char *itostr2(const uint8_t &x);
 
 #ifndef ULTRA_LCD
@@ -46,19 +36,26 @@ char *itostr2(const uint8_t &x);
 #define MSG_MY_VERSION CUSTOM_BUILD_VERSION
 #define MAX_PRINTABLE_FILENAME_LEN 26
 
-#if ENABLED(KNUTWURST_CHIRON)
-  #define FILAMENT_RUNOUT_PIN 33
-#else
-  #define FILAMENT_RUNOUT_PIN 19
-#endif
+enum AnycubicMediaPrintState {
+  AMPRINTSTATE_NOT_PRINTING,
+  AMPRINTSTATE_PRINTING,
+  AMPRINTSTATE_PAUSE_REQUESTED,
+  AMPRINTSTATE_PAUSED,
+  AMPRINTSTATE_STOP_REQUESTED,
+  AMPRINTSTATE_PROBING
+};
 
-#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 AnycubicMediaPauseState {
+  AMPAUSESTATE_NOT_PAUSED,
+  AMPAUSESTATE_PARKING,
+  AMPAUSESTATE_PARKED,
+  AMPAUSESTATE_FILAMENT_OUT,
+  AMPAUSESTATE_FILAMENT_PURGING,
+  AMPAUSESTATE_HEATER_TIMEOUT,
+  AMPAUSESTATE_REHEATING,
+  AMPAUSESTATE_REHEAT_FINISHED,
+  AMPAUSESTATE_PAUSED
+};
 
 #if DISABLED(KNUTWURST_DGUS2_TFT)
   #define SM_DIR_UP_L           "/.."
@@ -148,7 +145,7 @@ char *itostr2(const uint8_t &x);
 #endif // !KNUTWURST_DGUS2_TFT
 
 #if ENABLED(KNUTWURST_DGUS2_TFT)
-  #define SM_DIR_UP_L           "<<< BACK <<<        .gcode"
+  #define SM_DIR_UP_L           "/..                 .gcode"
   #define SM_DIR_UP_S           "DIR_UP~1.GCO"
   #define SM_SPECIAL_MENU_L     "<Special Menu>      .gcode"
   #define SM_SPECIAL_MENU_S     "<SPECI~1.GCO"
@@ -234,48 +231,30 @@ char *itostr2(const uint8_t &x);
   #define SM_BLTZ_EXIT_S        "<EXTABLM.GCO"
 #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();
+
 void Setup();
 void CommandScan();
-void BedHeatingStart();
-void BedHeatingDone();
-void HeatingDone();
-void HeatingStart();
 void FilamentRunout();
+void DoFilamentRunoutCheck();
 void UserConfirmRequired(const char *);
 void SDCardStateChange(bool);
 void SDCardError();
 void KillTFT();
+static void OnPrintTimerStarted();
+static void OnPrintTimerPaused();
+static 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
-char TFTstate = ANYCUBIC_TFT_STATE_IDLE;
-
-/**
-     * Anycubic TFT pause states:
-     *
-     * 0 - printing / stopped
-     * 1 - regular pause
-     * 2 - M600 pause
-     * 3 - filament runout pause
-     * 4 - nozzle timeout on regular pause   // OBSOLETE
-     * 5 - nozzle timeout on M600            // OBSOLETE
-     * 6 - nozzle timeout on filament runout // OBSOLETE
-     */
-uint8_t ai3m_pause_state = 0;
 
 private:
 char TFTcmdbuffer[TFTBUFSIZE][TFT_MAX_CMD_SIZE];
@@ -297,6 +276,14 @@ int currentFlowRate       = 0;
 bool PrintdoneAndPowerOFF = true;
 bool powerOFFflag         = 0;
 
+#if ENABLED(KNUTWURST_TFT_LEVELING)
+  xy_uint8_t       selectedmeshpoint;
+  float            live_Zoffset;
+#endif
+
+static AnycubicMediaPrintState mediaPrintingState;
+static AnycubicMediaPauseState mediaPauseState;
+
 #if defined(POWER_OUTAGE_TEST)
   struct OutageDataStruct {
     char OutageDataVersion;
@@ -312,7 +299,6 @@ bool powerOFFflag         = 0;
 int CodeValueInt();
 float CodeValue();
 bool CodeSeen(char);
-void PrintList();
 void StartPrint();
 void PausePrint();
 void StopPrint();
@@ -322,15 +308,17 @@ void CheckSDCardChange();
 void CheckHeaterError();
 void HandleSpecialMenu();
 void FilamentChangePause();
-void FilamentChangeResume();
+void ResumePrint();
 void ReheatNozzle();
 void ParkAfterStop();
+void RenderCurrentFileList();
+void RenderSpecialMenu(uint16_t);
+void RenderCurrentFolder(uint16_t);
 
 char currentTouchscreenSelection[64];
 char currentFileOrDirectory[64];
 String flowRateBuffer;
 String zOffsetBuffer;
-uint16_t MyFileNrCnt          = 0;
 uint8_t FilamentSensorEnabled = true;
 
 uint8_t SpecialMenu = false;
@@ -340,13 +328,6 @@ uint8_t BLTouchMenu = false;
 uint8_t LevelMenu   = false;
 uint8_t CaseLight   = true;
 
-#if ENABLED(ANYCUBIC_FILAMENT_RUNOUT_SENSOR)
-  char FilamentTestStatus     = false;
-  char FilamentTestLastStatus = false;
-  bool FilamentSetMillis      = true;
-  int FilamentRunoutCounter   = 0;
-#endif
-
 #if ENABLED(KNUTWURST_MEGA_P_LASER)
   typedef struct {
     unsigned char bfType[2];

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

@@ -43,9 +43,9 @@ namespace ExtUI {
   void onPlayTone(const uint16_t frequency, const uint16_t duration) {
     TERN_(SPEAKER, ::tone(BEEPER_PIN, frequency, duration));
   }
-  void onPrintTimerStarted()  { }
-  void onPrintTimerPaused()   { }
-  void onPrintTimerStopped()  { }
+  void onPrintTimerStarted()  { AnycubicTouchscreen.OnPrintTimerStarted(); }
+  void onPrintTimerPaused()   { AnycubicTouchscreen.OnPrintTimerPaused(); }
+  void onPrintTimerStopped()  { AnycubicTouchscreen.OnPrintTimerStopped(); }
   void onFilamentRunout(const extruder_t extruder)   { AnycubicTouchscreen.FilamentRunout(); }
   void onUserConfirmRequired(const char * const msg) { AnycubicTouchscreen.UserConfirmRequired(msg); }
   void onStatusChanged(const char * const msg) {}

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                       4
+
+#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