Merge branch 'knutwurst:master' into klicky

Author: sui77

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
@@ -2389,15 +2386,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

Marlin/Configuration_adv.h

@@ -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
@@ -2658,7 +2658,7 @@
  */
 #define ADVANCED_PAUSE_FEATURE
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
-  #define PAUSE_PARK_RETRACT_FEEDRATE         60  // (mm/s) Initial retract feedrate.
+  #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.
@@ -2675,7 +2675,7 @@
   #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.
+  #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.
@@ -2690,7 +2690,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 +4012,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,22 +129,13 @@ 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)
     (void)thermalManager.wait_for_hotend(target_extruder, no_wait_for_cooling);
 
   // 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-b5"
 
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2023-01-03"
+  #define STRING_DISTRIBUTION_DATE "2023-05-24"
 #endif
 
 /**