Update build version

config: enable g-code M808 for repeat markers (#325)

Marlin/Configuration.h

@@ -1972,7 +1972,7 @@
 #if ENABLED(MIN_SOFTWARE_ENDSTOPS)
   #define MIN_SOFTWARE_ENDSTOP_X
   #define MIN_SOFTWARE_ENDSTOP_Y
-  //#define MIN_SOFTWARE_ENDSTOP_Z  // Disabled for BLTouch
+  #define MIN_SOFTWARE_ENDSTOP_Z
   #define MIN_SOFTWARE_ENDSTOP_I
   #define MIN_SOFTWARE_ENDSTOP_J
   #define MIN_SOFTWARE_ENDSTOP_K
@@ -3462,20 +3462,20 @@
 // Use software PWM to drive the fan, as for the heaters. This uses a very low frequency
 // which is not as annoying as with the hardware PWM. On the other hand, if this frequency
 // is too low, you should also increment SOFT_PWM_SCALE.
-#define FAN_SOFT_PWM
+//#define FAN_SOFT_PWM
 
 // Incrementing this by 1 will double the software PWM frequency,
 // affecting heaters, and the fan if FAN_SOFT_PWM is enabled.
 // However, control resolution will be halved for each increment;
 // at zero value, there are 128 effective control positions.
 // :[0,1,2,3,4,5,6,7]
-#define SOFT_PWM_SCALE 5
+//#define SOFT_PWM_SCALE 2
 
 // If SOFT_PWM_SCALE is set to a value higher than 0, dithering can
 // be used to mitigate the associated resolution loss. If enabled,
 // some of the PWM cycles are stretched so on average the desired
 // duty cycle is attained.
-#define SOFT_PWM_DITHER
+//#define SOFT_PWM_DITHER
 
 // Temperature status LEDs that display the hotend and bed temperature.
 // If all hotends, bed temperature, and target temperature are under 54C

Marlin/Configuration_adv.h

@@ -1387,7 +1387,7 @@
   //#define SD_IGNORE_AT_STARTUP            // Don't mount the SD card when starting up
   //#define SDCARD_READONLY                 // Read-only SD card (to save over 2K of flash)
 
-  //#define GCODE_REPEAT_MARKERS            // Enable G-code M808 to set repeat markers and do looping
+  #define GCODE_REPEAT_MARKERS              // Enable G-code M808 to set repeat markers and do looping
 
   #define SD_PROCEDURE_DEPTH 1              // Increase if you need more nested M32 calls
 
@@ -1902,7 +1902,7 @@
 #if ENABLED(BABYSTEPPING)
   //#define INTEGRATED_BABYSTEPPING         // EXPERIMENTAL integration of babystepping into the Stepper ISR
   //#define BABYSTEP_WITHOUT_HOMING
-  //#define BABYSTEP_ALWAYS_AVAILABLE       // Allow babystepping at all times (not just during movement).
+  #define BABYSTEP_ALWAYS_AVAILABLE         // Allow babystepping at all times (not just during movement).
   //#define BABYSTEP_XY                     // Also enable X/Y Babystepping. Not supported on DELTA!
   #define BABYSTEP_INVERT_Z false           // Change if Z babysteps should go the other way
   //#define BABYSTEP_MILLIMETER_UNITS       // Specify BABYSTEP_MULTIPLICATOR_(XY|Z) in mm instead of micro-steps
@@ -1920,6 +1920,9 @@
   #endif
 
   //#define BABYSTEP_DISPLAY_TOTAL          // Display total babysteps since last G28
+  #if ENABLED(KNUTWURST_BLTOUCH)
+    #define BABYSTEP_ZPROBE_OFFSET          // Combine M851 Z and Babystepping
+  #endif
 
   //#define BABYSTEP_ZPROBE_OFFSET          // Combine M851 Z and Babystepping
   #if ENABLED(BABYSTEP_ZPROBE_OFFSET)

Marlin/src/feature/pause.cpp

@@ -282,8 +282,8 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
           #if EITHER(HAS_LCD_MENU, DWIN_CREALITY_LCD_ENHANCED)
             ui.pause_show_message(PAUSE_MESSAGE_OPTION); // Also sets PAUSE_RESPONSE_WAIT_FOR
           #else
-            //pause_menu_response = PAUSE_RESPONSE_WAIT_FOR;
-            pause_menu_response = PAUSE_RESPONSE_RESUME_PRINT;
+            pause_menu_response = PAUSE_RESPONSE_WAIT_FOR;
+            //pause_menu_response = PAUSE_RESPONSE_RESUME_PRINT; // KNUTWURST
           #endif
           while (pause_menu_response == PAUSE_RESPONSE_WAIT_FOR) idle_no_sleep();
         }

Marlin/src/inc/Version.h

@@ -25,7 +25,7 @@
  * Release version. Leave the Marlin version or apply a custom scheme.
  */
 #ifndef SHORT_BUILD_VERSION
-  #define SHORT_BUILD_VERSION "2.0.x"   // PATCH: Knutwurst
+  #define SHORT_BUILD_VERSION "2.0.9.2"   // PATCH: Knutwurst
 #endif
 
 /**
@@ -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.4.0"
+ #define CUSTOM_BUILD_VERSION "1.4.4"
 
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2022-02-07"
+  #define STRING_DISTRIBUTION_DATE "2022-05-12"
 #endif
 
 /**

Marlin/src/lcd/anycubic_touchscreen.cpp

@@ -499,13 +499,13 @@ inline void AnycubicTouchscreenClass::StopPrint()
 {
   card.abortFilePrintSoon();
 
-  #ifdef ANYCUBIC_TFT_DEBUG
-    SERIAL_ECHOLNPGM("DEBUG: Stopped and cleared");
-  #endif
-
   print_job_timer.stop();
   thermalManager.disable_all_heaters();
   thermalManager.zero_fan_speeds();
+  
+  #ifdef ANYCUBIC_TFT_DEBUG
+    SERIAL_ECHOLNPGM("DEBUG: Stopped and cleared");
+  #endif
 
   ai3m_pause_state = 0;
   #ifdef ANYCUBIC_TFT_DEBUG
@@ -513,7 +513,6 @@ inline void AnycubicTouchscreenClass::StopPrint()
     SERIAL_EOL();
   #endif
 
-  IsParked = true;
   TFTstate = ANYCUBIC_TFT_STATE_SDSTOP_REQ;
 }
 
@@ -588,21 +587,10 @@ void AnycubicTouchscreenClass::ReheatNozzle() {
 }
 
 void AnycubicTouchscreenClass::ParkAfterStop(){
-  // only park the nozzle if homing was done before
-  if (!homing_needed_error()) {
-    // raize nozzle by 25mm respecting Z_MAX_POS
-    do_blocking_move_to_z(_MIN(current_position[Z_AXIS] + 25, Z_MAX_POS), 5);
-    #ifdef ANYCUBIC_TFT_DEBUG
-      SERIAL_ECHOLNPGM("DEBUG: SDSTOP: Park Z");
-    #endif
-    // move bed and hotend to park position
-    do_blocking_move_to_xy((X_MIN_POS + 10), (Y_MAX_POS - 10), 100);
-    #ifdef ANYCUBIC_TFT_DEBUG
-      SERIAL_ECHOLNPGM("DEBUG: SDSTOP: Park XY");
-    #endif
-  }
+
   queue.enqueue_now_P(PSTR("M84")); // disable stepper motors
   queue.enqueue_now_P(PSTR("M27")); // force report of SD status
+
   ai3m_pause_state = 0;
   #ifdef ANYCUBIC_TFT_DEBUG
     SERIAL_ECHOPGM("DEBUG: AI3M Pause State: ", ai3m_pause_state);
@@ -741,7 +729,7 @@ void AnycubicTouchscreenClass::HandleSpecialMenu() {
     else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTOUCH_L)) != NULL)
           || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_BLTOUCH_S)) != NULL)) {
       SERIAL_ECHOLNPGM("Special Menu: BLTouch Leveling");
-      queue.inject_P(PSTR("G28\nG29\nM500\nG90\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300\nG1 Z30 F4000\nG1 X0 F4000\nG91\nM84"));
+      queue.inject_P(PSTR("G28\nG29\nM500\nG90\nM300 S440 P200\nM300 S660 P250\nM300 S880 P300\nG1 Z30 F4000\nG1 X0 F4000\nG91\nM84\nM420 S1"));
       buzzer.tone(105, 1108);
       buzzer.tone(210, 1661);
     }
@@ -862,7 +850,7 @@ void AnycubicTouchscreenClass::HandleSpecialMenu() {
         || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_MENU_S)) != NULL)) {
     SERIAL_ECHOLNPGM("Special Menu: Enter Easy Level Menu");
     LevelMenu = true;
-    queue.inject_P(PSTR("G28\nG90\nG1 Z5\nG1 X15 Y15 F4000\nG1 Z0"));
+    queue.inject_P(PSTR("G28\nM420 S0\nG90\nG1 Z5\nG1 X15 Y15 F4000\nG1 Z0"));
   }
   else if ((strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_P1_L)) != NULL)
         || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_P1_S)) != NULL)) {
@@ -930,7 +918,7 @@ void AnycubicTouchscreenClass::HandleSpecialMenu() {
         || (strcasestr_P(currentTouchscreenSelection, PSTR(SM_EZLVL_EXIT_S)) != NULL)) {
     SERIAL_ECHOLNPGM("Special Menu: Exit Easy Level Menu");
     LevelMenu = false;
-    queue.inject_P(PSTR("G90\nG1 Z10\nG1 X15 Y15 F4000"));
+    queue.inject_P(PSTR("G90\nG1 Z10\nG1 X15 Y15 F4000\nM420 S1"));
   }
 #endif
 }
@@ -2157,6 +2145,11 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() {
             #endif
 
             #if ENABLED(KNUTWURST_4MAXP2)
+            case 40:
+                HARDWARE_SERIAL_PROTOCOLPGM("J17"); // J17 Main board reset
+                HARDWARE_SERIAL_ENTER();
+                delay(10);
+                break;
             case 41:
                 if(CodeSeen('O')) {
                   PrintdoneAndPowerOFF = true;
@@ -2286,6 +2279,9 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() {
                     WRITE(HEATER_0_PIN, 0);
                   }
                   break;
+            #endif
+            
+            #if ENABLED(KNUTWURST_MEGA_P)
                 case 51:
                   if (CodeSeen('H')) {
                     queue.enqueue_now_P(PSTR("G1 Z5 F500"));
@@ -2310,11 +2306,11 @@ void AnycubicTouchscreenClass::GetCommandFromTFT() {
                   else if (CodeSeen('L')) {
                     queue.enqueue_now_P(PSTR("G1 X100 Y100  Z50 F5000"));
                   }
-                }
-                break;
+                  break;
             #endif
-            default:
-              break;
+            
+          default:
+          break;
           }
         }
         TFTbufindw = (TFTbufindw + 1)%TFTBUFSIZE;