Domush
diff --git a/‎Marlin/Configuration.h
+25 b/‎Marlin/Configuration.h
+25
diff --git a/‎Marlin/Configuration_adv.h
+114-8 b/‎Marlin/Configuration_adv.h
+114-8
diff --git a/‎Marlin/Version.h
+1-1 b/‎Marlin/Version.h
+1-1
diff --git a/‎Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
+2-2 b/‎Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_st7920_sw_spi.cpp
+2-2
diff --git a/‎Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
+2-2 b/‎Marlin/src/HAL/DUE/dogm/u8g_com_HAL_DUE_sw_spi.cpp
+2-2
diff --git a/‎Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
+4-4 b/‎Marlin/src/HAL/LPC1768/eeprom_sdcard.cpp
+4-4
diff --git a/‎Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp
+2-2 b/‎Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_st7920_sw_spi.cpp
+2-2
diff --git a/‎Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
+2-2 b/‎Marlin/src/HAL/LPC1768/u8g/u8g_com_HAL_LPC1768_sw_spi.cpp
+2-2
diff --git a/‎Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp
+2-2 b/‎Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp
+2-2
diff --git a/‎Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp
+2-2 b/‎Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_sw_spi.cpp
+2-2
@@ -546,6 +546,22 @@
   #define TEMP_SENSOR_REDUNDANT_MAX_DIFF 10  // (°C) Temperature difference that will trigger a print abort.
 #endif
 
+/**
+ * Redundant Temperature Sensor (TEMP_SENSOR_REDUNDANT)
+ *
+ * Use a temp sensor as a redundant sensor for another reading. Select an unused temperature sensor, and another
+ * sensor you'd like it to be redundant for. If the two thermistors differ by TEMP_SENSOR_REDUNDANT_MAX_DIFF (°C),
+ * the print will be aborted. Whichever sensor is selected will have its normal functions disabled; i.e. selecting
+ * the Bed sensor (-1) will disable bed heating/monitoring.
+ *
+ * For selecting source/target use: COOLER, PROBE, BOARD, CHAMBER, BED, E0, E1, E2, E3, E4, E5, E6, E7
+ */
+#if TEMP_SENSOR_REDUNDANT
+  #define TEMP_SENSOR_REDUNDANT_SOURCE   E1  // The sensor that will provide the redundant reading.
+  #define TEMP_SENSOR_REDUNDANT_TARGET   E0  // The sensor that we are providing a redundant reading for.
+  #define TEMP_SENSOR_REDUNDANT_MAX_DIFF 10  // (°C) Temperature difference that will trigger a print abort.
+#endif
+
 // Below this temperature the heater will be switched off
 // because it probably indicates a broken thermistor wire.
 #define HEATER_0_MINTEMP 5
@@ -1665,6 +1681,8 @@
 
 //#define UBL_MESH_WIZARD         // Run several commands in a row to get a complete mesh
 
+//#define UBL_MESH_WIZARD         // Run several commands in a row to get a complete mesh
+
 #elif ENABLED(MESH_BED_LEVELING)
 
 //===========================================================================
@@ -2402,6 +2420,11 @@
 //#define VIKI2
 //#define miniVIKI
 
+//
+// Alfawise Ex8 printer LCD marked as WYH L12864 COG
+//
+//#define WYH_L12864
+
 //
 // MakerLab Mini Panel with graphic
 // controller and SD support - https://reprap.org/wiki/Mini_panel
@@ -2813,6 +2836,8 @@
   #define BUTTON_DELAY_EDIT 50   // (ms) Button repeat delay for edit screens
   #define BUTTON_DELAY_MENU 250  // (ms) Button repeat delay for menus
 
+//#define TOUCH_IDLE_SLEEP 300 // (secs) Turn off the TFT backlight if set (5mn)
+
 //#define TOUCH_IDLE_SLEEP 300 // (secs) Turn off the TFT backlight if set (5mn)
 
   #define TOUCH_SCREEN_CALIBRATION
 
@@ -242,6 +242,18 @@
   #endif
 #endif
 
+//
+// Motherboard Sensor options
+//
+#if TEMP_SENSOR_BOARD
+  #define THERMAL_PROTECTION_BOARD  // Halt the printer if the board sensor leaves the temp range below.
+  #define BOARD_MINTEMP 8           // (°C)
+  #define BOARD_MAXTEMP 70          // (°C)
+  #ifndef TEMP_BOARD_PIN
+  //#define TEMP_BOARD_PIN -1      // Board temp sensor pin, if not set in pins file.
+  #endif
+#endif
+
 //
 // Laser Coolant Flow Meter
 //
@@ -1620,7 +1632,7 @@
    * Set STATUS_EXPIRE_SECONDS to zero to never clear the status.
    * This will prevent position updates from being displayed.
    */
-  #if ENABLED(U8GLIB_ST7920)
+  #if IS_U8GLIB_ST7920
     // Enable this option and reduce the value to optimize screen updates.
     // The normal delay is 10µs. Use the lowest value that still gives a reliable display.
     //#define DOGM_SPI_DELAY_US 5
@@ -1642,13 +1654,13 @@
 // #define STATUS_HOTEND_ANIM      // Use a second bitmap to indicate hotend heating
 // #define STATUS_BED_ANIM         // Use a second bitmap to indicate bed heating
 // #define STATUS_CHAMBER_ANIM     // Use a second bitmap to indicate chamber heating
-  //#define STATUS_CUTTER_ANIM        // Use a second bitmap to indicate spindle / laser active
-  //#define STATUS_COOLER_ANIM        // Use a second bitmap to indicate laser cooling
-  //#define STATUS_FLOWMETER_ANIM     // Use multiple bitmaps to indicate coolant flow
-  //#define STATUS_ALT_BED_BITMAP     // Use the alternative bed bitmap
-  //#define STATUS_ALT_FAN_BITMAP     // Use the alternative fan bitmap
-  //#define STATUS_FAN_FRAMES 3       // :[0,1,2,3,4] Number of fan animation frames
-  //#define STATUS_HEAT_PERCENT       // Show heating in a progress bar
+//#define STATUS_CUTTER_ANIM        // Use a second bitmap to indicate spindle / laser active
+//#define STATUS_COOLER_ANIM        // Use a second bitmap to indicate laser cooling
+//#define STATUS_FLOWMETER_ANIM     // Use multiple bitmaps to indicate coolant flow
+//#define STATUS_ALT_BED_BITMAP     // Use the alternative bed bitmap
+//#define STATUS_ALT_FAN_BITMAP     // Use the alternative fan bitmap
+//#define STATUS_FAN_FRAMES 3       // :[0,1,2,3,4] Number of fan animation frames
+//#define STATUS_HEAT_PERCENT       // Show heating in a progress bar
   #define BOOT_MARLIN_LOGO_ANIMATED  // Animated Marlin logo. Costs ~‭3260 (or ~940) bytes of PROGMEM.
 
 // Frivolous Game Options
@@ -1670,6 +1682,17 @@
 //#define OVERLAY_GFX_REVERSE
 #endif
 
+#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI
+  // Show SD percentage next to the progress bar
+  //#define SHOW_SD_PERCENT
+
+  // Enable to save many cycles by drawing a hollow frame on Menu Screens
+  #define MENU_HOLLOW_FRAME
+
+// Swap the CW/CCW indicators in the graphics overlay
+//#define OVERLAY_GFX_REVERSE
+#endif
+
 //
 // Additional options for DGUS / DWIN displays
 //
@@ -2332,6 +2355,7 @@
    */
   //#define EVENT_GCODE_TOOLCHANGE_T0 "G28 A\nG1 A0" // Extra G-code to run while executing tool-change command T0
   //#define EVENT_GCODE_TOOLCHANGE_T1 "G1 A10"       // Extra G-code to run while executing tool-change command T1
+  //#define EVENT_GCODE_TOOLCHANGE_ALWAYS_RUN        // Always execute above G-code sequences. Use with caution!
 
   /**
    * Tool Sensors detect when tools have been picked up or dropped.
@@ -2532,6 +2556,24 @@
     #define K_MICROSTEPS     16
   #endif
 
+  #if AXIS_DRIVER_TYPE_I(TMC26X)
+    #define I_MAX_CURRENT    1000
+    #define I_SENSE_RESISTOR 91
+    #define I_MICROSTEPS     16
+  #endif
+
+  #if AXIS_DRIVER_TYPE_J(TMC26X)
+    #define J_MAX_CURRENT    1000
+    #define J_SENSE_RESISTOR 91
+    #define J_MICROSTEPS     16
+  #endif
+
+  #if AXIS_DRIVER_TYPE_K(TMC26X)
+    #define K_MAX_CURRENT    1000
+    #define K_SENSE_RESISTOR 91
+    #define K_MICROSTEPS     16
+  #endif
+
   #if AXIS_DRIVER_TYPE_E0(TMC26X)
     #define E0_MAX_CURRENT    1000
     #define E0_SENSE_RESISTOR 91
@@ -2709,6 +2751,33 @@
   //#define K_INTERPOLATE  true
   #endif
 
+  #if AXIS_IS_TMC(I)
+    #define I_CURRENT      800
+    #define I_CURRENT_HOME I_CURRENT
+    #define I_MICROSTEPS   16
+    #define I_RSENSE       0.11
+    #define I_CHAIN_POS    -1
+  //#define I_INTERPOLATE  true
+  #endif
+
+  #if AXIS_IS_TMC(J)
+    #define J_CURRENT      800
+    #define J_CURRENT_HOME J_CURRENT
+    #define J_MICROSTEPS   16
+    #define J_RSENSE       0.11
+    #define J_CHAIN_POS    -1
+  //#define J_INTERPOLATE  true
+  #endif
+
+  #if AXIS_IS_TMC(K)
+    #define K_CURRENT      800
+    #define K_CURRENT_HOME K_CURRENT
+    #define K_MICROSTEPS   16
+    #define K_RSENSE       0.11
+    #define K_CHAIN_POS    -1
+  //#define K_INTERPOLATE  true
+  #endif
+
   #if AXIS_IS_TMC(E0)
     #define E0_CURRENT    800
     #define E0_MICROSTEPS 16
@@ -3148,6 +3217,33 @@
     #define K_SLEW_RATE    1
   #endif
 
+  #if AXIS_DRIVER_TYPE_I(L6470)
+    #define I_MICROSTEPS   128
+    #define I_OVERCURRENT  2000
+    #define I_STALLCURRENT 1500
+    #define I_MAX_VOLTAGE  127
+    #define I_CHAIN_POS    -1
+    #define I_SLEW_RATE    1
+  #endif
+
+  #if AXIS_DRIVER_TYPE_J(L6470)
+    #define J_MICROSTEPS   128
+    #define J_OVERCURRENT  2000
+    #define J_STALLCURRENT 1500
+    #define J_MAX_VOLTAGE  127
+    #define J_CHAIN_POS    -1
+    #define J_SLEW_RATE    1
+  #endif
+
+  #if AXIS_DRIVER_TYPE_K(L6470)
+    #define K_MICROSTEPS   128
+    #define K_OVERCURRENT  2000
+    #define K_STALLCURRENT 1500
+    #define K_MAX_VOLTAGE  127
+    #define K_CHAIN_POS    -1
+    #define K_SLEW_RATE    1
+  #endif
+
   #if AXIS_IS_L64XX(E0)
     #define E0_MICROSTEPS   128
     #define E0_OVERCURRENT  2000
@@ -4005,6 +4101,16 @@
   #define FREEZE_PIN P2_00  // Override the default (KILL) pin here
 #endif
 
+/**
+ * Instant freeze / unfreeze functionality
+ * Specified pin has pullup and connecting to ground will instantly pause motion.
+ * Potentially useful for emergency stop that allows being resumed.
+ */
+//#define FREEZE_FEATURE
+#if ENABLED(FREEZE_FEATURE)
+//#define FREEZE_PIN 41   // Override the default (KILL) pin here
+#endif
+
 /**
  * MAX7219 Debug Matrix
  *
 
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2021-09-03"
+//#define STRING_DISTRIBUTION_DATE "2021-10-17"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
 
@@ -57,7 +57,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
 
 #include "../../../inc/MarlinConfig.h"
 #include "../../shared/Delay.h"
@@ -182,5 +182,5 @@ uint8_t u8g_com_HAL_DUE_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_va
   }
 #endif // LIGHTWEIGHT_UI
 
-#endif // U8GLIB_ST7920
+#endif // IS_U8GLIB_ST7920
 #endif // ARDUINO_ARCH_SAM
@@ -57,7 +57,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if HAS_MARLINUI_U8GLIB && DISABLED(U8GLIB_ST7920)
+#if HAS_MARLINUI_U8GLIB && !IS_U8GLIB_ST7920
 
 #include "u8g_com_HAL_DUE_sw_spi_shared.h"
 
@@ -141,5 +141,5 @@ uint8_t u8g_com_HAL_DUE_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void
   return 1;
 }
 
-#endif // HAS_MARLINUI_U8GLIB && !U8GLIB_ST7920
+#endif // HAS_MARLINUI_U8GLIB && !IS_U8GLIB_ST7920
 #endif // ARDUINO_ARCH_SAM
@@ -90,15 +90,15 @@ bool PersistentStore::access_finish() {
 // to see errors that are happening in read_data / write_data
 static void debug_rw(const bool write, int &pos, const uint8_t *value, const size_t size, const FRESULT s, const size_t total=0) {
   #if ENABLED(DEBUG_SD_EEPROM_EMULATION)
-    PGM_P const rw_str = write ? PSTR("write") : PSTR("read");
+    FSTR_P const rw_str = write ? F("write") : F("read");
     SERIAL_CHAR(' ');
-    SERIAL_ECHOPGM_P(rw_str);
+    SERIAL_ECHOF(rw_str);
     SERIAL_ECHOLNPGM("_data(", pos, ",", *value, ",", size, ", ...)");
     if (total) {
       SERIAL_ECHOPGM(" f_");
-      SERIAL_ECHOPGM_P(rw_str);
+      SERIAL_ECHOF(rw_str);
       SERIAL_ECHOPGM("()=", s, "\n size=", size, "\n bytes_");
-      SERIAL_ECHOLNPGM_P(write ? PSTR("written=") : PSTR("read="), total);
+      SERIAL_ECHOLNF(write ? F("written=") : F("read="), total);
     }
     else
       SERIAL_ECHOLNPGM(" f_lseek()=", s);
 
@@ -57,7 +57,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
 
 #include <U8glib-HAL.h>
 #include <SoftwareSPI.h>
@@ -143,5 +143,5 @@ uint8_t u8g_com_HAL_LPC1768_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t ar
   return 1;
 }
 
-#endif // U8GLIB_ST7920
+#endif // IS_U8GLIB_ST7920
 #endif // TARGET_LPC1768
@@ -57,7 +57,7 @@
 
 #include "../../../inc/MarlinConfigPre.h"
 
-#if HAS_MARLINUI_U8GLIB && DISABLED(U8GLIB_ST7920)
+#if HAS_MARLINUI_U8GLIB && !IS_U8GLIB_ST7920
 
 #include <SoftwareSPI.h>
 #include "../../shared/HAL_SPI.h"
@@ -205,5 +205,5 @@ uint8_t u8g_com_HAL_LPC1768_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val,
   return 1;
 }
 
-#endif // HAS_MARLINUI_U8GLIB && !U8GLIB_ST7920
+#endif // HAS_MARLINUI_U8GLIB && !IS_U8GLIB_ST7920
 #endif // TARGET_LPC1768
@@ -57,7 +57,7 @@
 
 #include "../../../inc/MarlinConfig.h"
 
-#if ENABLED(U8GLIB_ST7920)
+#if IS_U8GLIB_ST7920
 
 #include <U8glib-HAL.h>
 #include "../../shared/Delay.h"
@@ -167,5 +167,5 @@ uint8_t u8g_com_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void
   }
 #endif
 
-#endif // U8GLIB_ST7920
+#endif // IS_U8GLIB_ST7920
 #endif // TARGET_LPC1768
@@ -57,7 +57,7 @@
 
 #include "../../../inc/MarlinConfig.h"
 
-#if HAS_MARLINUI_U8GLIB && DISABLED(U8GLIB_ST7920)
+#if HAS_MARLINUI_U8GLIB && !IS_U8GLIB_ST7920
 
 #undef SPI_SPEED
 #define SPI_SPEED 2  // About 2 MHz
@@ -211,5 +211,5 @@ uint8_t u8g_com_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_pt
 #elif !ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, TFT_LVGL_UI, HAS_MARLINUI_HD44780) && HAS_MARLINUI_U8GLIB
   #include <U8glib-HAL.h>
   uint8_t u8g_com_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void *arg_ptr) {return 0;}
-#endif // HAS_MARLINUI_U8GLIB && !U8GLIB_ST7920
+#endif // HAS_MARLINUI_U8GLIB && !IS_U8GLIB_ST7920
 #endif // __PLAT_NATIVE_SIM__