First buildable hex version

DOES NOT WORK YET
MarlinFirmware · Feb 25, 2023 · 1cfb7e4 · 1cfb7e4
1 parent d3527f5
commit 1cfb7e4
Show file tree

Hide file tree

Showing 495 changed files with 7,359 additions and 31,668 deletions.
diff --git a/DWIN_SET/00_starting.bmp b/DWIN_SET/00_starting.bmp
diff --git a/DWIN_SET/01_C_main.bmp b/DWIN_SET/01_C_main.bmp
diff --git a/DWIN_SET/02_C_PrintFile.bmp b/DWIN_SET/02_C_PrintFile.bmp
diff --git a/DWIN_SET/03_C_PrintFile.bmp b/DWIN_SET/03_C_PrintFile.bmp
diff --git a/DWIN_SET/04_C_PrintFile.bmp b/DWIN_SET/04_C_PrintFile.bmp
diff --git a/DWIN_SET/05_C_PrintFile.bmp b/DWIN_SET/05_C_PrintFile.bmp
diff --git a/DWIN_SET/06_C_PrintFile.bmp b/DWIN_SET/06_C_PrintFile.bmp
diff --git a/DWIN_SET/07_C_ChooseFile.bmp b/DWIN_SET/07_C_ChooseFile.bmp
diff --git a/DWIN_SET/08_C_ChooseFile.bmp b/DWIN_SET/08_C_ChooseFile.bmp
diff --git a/DWIN_SET/09_C_Printstatus1.bmp b/DWIN_SET/09_C_Printstatus1.bmp
diff --git a/DWIN_SET/10_C_Printstatus2.bmp b/DWIN_SET/10_C_Printstatus2.bmp
diff --git a/DWIN_SET/11_C_Printstatus3.bmp b/DWIN_SET/11_C_Printstatus3.bmp
diff --git a/DWIN_SET/12_C_Printstatus4.bmp b/DWIN_SET/12_C_Printstatus4.bmp
diff --git a/DWIN_SET/13.bin b/DWIN_SET/13.bin
diff --git a/DWIN_SET/13_C_StopPause.bmp b/DWIN_SET/13_C_StopPause.bmp
diff --git a/DWIN_SET/14.bin b/DWIN_SET/14.bin
diff --git a/DWIN_SET/14_C_Ajustment.bmp b/DWIN_SET/14_C_Ajustment.bmp
diff --git a/DWIN_SET/15_Homing_Failed.bmp b/DWIN_SET/15_Homing_Failed.bmp
diff --git a/DWIN_SET/16_C_TempControl2.bmp b/DWIN_SET/16_C_TempControl2.bmp
diff --git a/DWIN_SET/17_C_PLAorABS.bmp b/DWIN_SET/17_C_PLAorABS.bmp
diff --git a/DWIN_SET/18_C_PLAorABS.bmp b/DWIN_SET/18_C_PLAorABS.bmp
diff --git a/DWIN_SET/19_C_NozzleHotbet.bmp b/DWIN_SET/19_C_NozzleHotbet.bmp
diff --git a/DWIN_SET/20_C_Shut_Cool.bmp b/DWIN_SET/20_C_Shut_Cool.bmp
diff --git a/DWIN_SET/21_C_Tool.bmp b/DWIN_SET/21_C_Tool.bmp
diff --git a/DWIN_SET/22_C_BedLeveling.bmp b/DWIN_SET/22_C_BedLeveling.bmp
diff --git a/DWIN_SET/22_Config.bin b/DWIN_SET/22_Config.bin
diff --git a/DWIN_SET/23_C_ChangeFilement.bmp b/DWIN_SET/23_C_ChangeFilement.bmp
diff --git a/DWIN_SET/24_C_Warn.bmp b/DWIN_SET/24_C_Warn.bmp
diff --git a/DWIN_SET/25_C_Warn.bmp b/DWIN_SET/25_C_Warn.bmp
diff --git a/DWIN_SET/25_SPercentage.ICO b/DWIN_SET/25_SPercentage.ICO
diff --git a/DWIN_SET/26_C_ChngFlmHeating.bmp b/DWIN_SET/26_C_ChngFlmHeating.bmp
diff --git a/DWIN_SET/27_C_ChngorNot.bmp b/DWIN_SET/27_C_ChngorNot.bmp
diff --git a/DWIN_SET/28_C_ChngorNot.bmp b/DWIN_SET/28_C_ChngorNot.bmp
diff --git a/DWIN_SET/29_C_10mmMove.bmp b/DWIN_SET/29_C_10mmMove.bmp
diff --git a/DWIN_SET/30_C_1mmMove.bmp b/DWIN_SET/30_C_1mmMove.bmp
diff --git a/DWIN_SET/31_C_01mmMove.bmp b/DWIN_SET/31_C_01mmMove.bmp
diff --git a/DWIN_SET/32_C_Autohome.bmp b/DWIN_SET/32_C_Autohome.bmp
diff --git a/DWIN_SET/33_C_Language1.bmp b/DWIN_SET/33_C_Language1.bmp
diff --git a/DWIN_SET/34_E_Language2.bmp b/DWIN_SET/34_E_Language2.bmp
diff --git a/DWIN_SET/35_C_Information.bmp b/DWIN_SET/35_C_Information.bmp
diff --git a/DWIN_SET/35_PrintStatus.ICO b/DWIN_SET/35_PrintStatus.ICO
diff --git a/DWIN_SET/36_C_ContinuePrintstatus1.bmp b/DWIN_SET/36_C_ContinuePrintstatus1.bmp
diff --git a/DWIN_SET/37_C_ContinuePrintstatus2.bmp b/DWIN_SET/37_C_ContinuePrintstatus2.bmp
diff --git a/DWIN_SET/38_C_no_filement1.bmp b/DWIN_SET/38_C_no_filement1.bmp
diff --git a/DWIN_SET/38_ICON.ICO b/DWIN_SET/38_ICON.ICO
diff --git a/DWIN_SET/39_C_no_filement2.bmp b/DWIN_SET/39_C_no_filement2.bmp
diff --git a/DWIN_SET/40_C_Keyboard1.bmp b/DWIN_SET/40_C_Keyboard1.bmp
diff --git a/DWIN_SET/41_C_Keyboard2.bmp b/DWIN_SET/41_C_Keyboard2.bmp
diff --git a/DWIN_SET/41_percent.ICO b/DWIN_SET/41_percent.ICO
diff --git a/DWIN_SET/42_C_YesorNoblack.bmp b/DWIN_SET/42_C_YesorNoblack.bmp
diff --git a/DWIN_SET/43_C_Autoleve.bmp b/DWIN_SET/43_C_Autoleve.bmp
diff --git a/DWIN_SET/44_C_HeatStop.bmp b/DWIN_SET/44_C_HeatStop.bmp
diff --git a/DWIN_SET/45_E_main.bmp b/DWIN_SET/45_E_main.bmp
diff --git a/DWIN_SET/45_PPercentage.ICO b/DWIN_SET/45_PPercentage.ICO
diff --git a/DWIN_SET/46_E_PrintFile.bmp b/DWIN_SET/46_E_PrintFile.bmp
diff --git a/DWIN_SET/47_E_PrintFile.bmp b/DWIN_SET/47_E_PrintFile.bmp
diff --git a/DWIN_SET/48_E_PrintFile.bmp b/DWIN_SET/48_E_PrintFile.bmp
diff --git a/DWIN_SET/49_E_PrintFile.bmp b/DWIN_SET/49_E_PrintFile.bmp
diff --git a/DWIN_SET/50_E_PrintFile.bmp b/DWIN_SET/50_E_PrintFile.bmp
diff --git a/DWIN_SET/51_E_Printstatus1.bmp b/DWIN_SET/51_E_Printstatus1.bmp
diff --git a/DWIN_SET/52_E_Printstatus2.bmp b/DWIN_SET/52_E_Printstatus2.bmp
diff --git a/DWIN_SET/53_E_Printstatus3.bmp b/DWIN_SET/53_E_Printstatus3.bmp
diff --git a/DWIN_SET/54_E_Printstatus4.bmp b/DWIN_SET/54_E_Printstatus4.bmp
diff --git a/DWIN_SET/55_E_StopPause.bmp b/DWIN_SET/55_E_StopPause.bmp
diff --git a/DWIN_SET/56_E_Ajustment.bmp b/DWIN_SET/56_E_Ajustment.bmp
diff --git a/DWIN_SET/57_E_TempControl1.bmp b/DWIN_SET/57_E_TempControl1.bmp
diff --git a/DWIN_SET/58_E_TempControl2.bmp b/DWIN_SET/58_E_TempControl2.bmp
diff --git a/DWIN_SET/59_E_PLAorABS.bmp b/DWIN_SET/59_E_PLAorABS.bmp
diff --git a/DWIN_SET/60_AutoHome.ICO b/DWIN_SET/60_AutoHome.ICO
diff --git a/DWIN_SET/60_E_PLAorABS.bmp b/DWIN_SET/60_E_PLAorABS.bmp
diff --git a/DWIN_SET/61_E_NozzleHotbet.bmp b/DWIN_SET/61_E_NozzleHotbet.bmp
diff --git a/DWIN_SET/62_E_Shut_Cool.bmp b/DWIN_SET/62_E_Shut_Cool.bmp
diff --git a/DWIN_SET/63_E_Tool.bmp b/DWIN_SET/63_E_Tool.bmp
diff --git a/DWIN_SET/64_E_BedLeveling.bmp b/DWIN_SET/64_E_BedLeveling.bmp
diff --git a/DWIN_SET/65_E_ChangeFilement.bmp b/DWIN_SET/65_E_ChangeFilement.bmp
diff --git a/DWIN_SET/65_Volume.ICO b/DWIN_SET/65_Volume.ICO
diff --git a/DWIN_SET/66_E_Warn.bmp b/DWIN_SET/66_E_Warn.bmp
diff --git a/DWIN_SET/67_E_Warn.bmp b/DWIN_SET/67_E_Warn.bmp
diff --git a/DWIN_SET/68_AutoLeve.ICO b/DWIN_SET/68_AutoLeve.ICO
diff --git a/DWIN_SET/68_E_ChngFlmHeating.bmp b/DWIN_SET/68_E_ChngFlmHeating.bmp
diff --git a/DWIN_SET/69_E_ChngorNot.bmp b/DWIN_SET/69_E_ChngorNot.bmp
diff --git a/DWIN_SET/70_E_ChngorNot.bmp b/DWIN_SET/70_E_ChngorNot.bmp
diff --git a/DWIN_SET/71_E_10mmMove.bmp b/DWIN_SET/71_E_10mmMove.bmp
diff --git a/DWIN_SET/72_E_1mmMove.bmp b/DWIN_SET/72_E_1mmMove.bmp
diff --git a/DWIN_SET/73_E_01mmMove.bmp b/DWIN_SET/73_E_01mmMove.bmp
diff --git a/DWIN_SET/74_E_Autohome.bmp b/DWIN_SET/74_E_Autohome.bmp
diff --git a/DWIN_SET/75_E_Information.bmp b/DWIN_SET/75_E_Information.bmp
diff --git a/DWIN_SET/76_E_ContinuePrintstatus1.bmp b/DWIN_SET/76_E_ContinuePrintstatus1.bmp
diff --git a/DWIN_SET/77_E_ContinuePrintstatus2.bmp b/DWIN_SET/77_E_ContinuePrintstatus2.bmp
diff --git a/DWIN_SET/78_E_no_filement1.bmp b/DWIN_SET/78_E_no_filement1.bmp
diff --git a/DWIN_SET/78_Filement.ICO b/DWIN_SET/78_Filement.ICO
diff --git a/DWIN_SET/79_E_no_filement2.bmp b/DWIN_SET/79_E_no_filement2.bmp
diff --git a/DWIN_SET/80_E_YesorNoblack.bmp b/DWIN_SET/80_E_YesorNoblack.bmp
diff --git a/DWIN_SET/81_E_Refuel1.bmp b/DWIN_SET/81_E_Refuel1.bmp
diff --git a/DWIN_SET/82_E_Refuel2.bmp b/DWIN_SET/82_E_Refuel2.bmp
diff --git a/DWIN_SET/83_E_Refuel3.bmp b/DWIN_SET/83_E_Refuel3.bmp
diff --git a/DWIN_SET/84_E_Auxleve.bmp b/DWIN_SET/84_E_Auxleve.bmp
diff --git a/DWIN_SET/85_E_Autoleve.bmp b/DWIN_SET/85_E_Autoleve.bmp
diff --git a/DWIN_SET/86_C_Wait.bmp b/DWIN_SET/86_C_Wait.bmp
diff --git a/DWIN_SET/87_E_Wait.bmp b/DWIN_SET/87_E_Wait.bmp
diff --git a/DWIN_SET/88_MachineFault.bmp b/DWIN_SET/88_MachineFault.bmp
diff --git a/DWIN_SET/89_Heating_Failed.bmp b/DWIN_SET/89_Heating_Failed.bmp
diff --git a/DWIN_SET/90_Thermistor_Error.bmp b/DWIN_SET/90_Thermistor_Error.bmp
diff --git a/DWIN_SET/T5OS_V20_NOACK.BIN b/DWIN_SET/T5OS_V20_NOACK.BIN
diff --git a/DWIN_SET/T5UID1.CFG b/DWIN_SET/T5UID1.CFG
diff --git a/DWIN_SET/T5UID1_V22.BIN b/DWIN_SET/T5UID1_V22.BIN
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
@@ -30,7 +30,7 @@
  *
  * Basic settings can be found in Configuration.h
  */
-#define CONFIGURATION_ADV_H_VERSION 02010300
+#define CONFIGURATION_ADV_H_VERSION 02010200
 
 // @section develop
 
@@ -304,8 +304,8 @@
   #define THERMAL_PROTECTION_HYSTERESIS 4     // Degrees Celsius
 
   //#define ADAPTIVE_FAN_SLOWING              // Slow part cooling fan if temperature drops
-  #if ENABLED(ADAPTIVE_FAN_SLOWING) && EITHER(MPCTEMP, PIDTEMP)
-    //#define TEMP_TUNING_MAINTAIN_FAN        // Don't slow fan speed during M303 or M306 T
+  #if BOTH(ADAPTIVE_FAN_SLOWING, PIDTEMP)
+    //#define NO_FAN_SLOWING_IN_PID_TUNING    // Don't slow fan speed during M303
   #endif
 
   /**
@@ -375,7 +375,7 @@
 #endif
 
 #if ENABLED(PIDTEMP)
-  // Add an additional term to the heater power, proportional to the extrusion speed.
+  // Add an experimental additional term to the heater power, proportional to the extrusion speed.
   // A well-chosen Kc value should add just enough power to melt the increased material volume.
   //#define PID_EXTRUSION_SCALING
   #if ENABLED(PID_EXTRUSION_SCALING)
@@ -384,7 +384,7 @@
   #endif
 
   /**
-   * Add an additional term to the heater power, proportional to the fan speed.
+   * Add an experimental additional term to the heater power, proportional to the fan speed.
    * A well-chosen Kf value should add just enough power to compensate for power-loss from the cooling fan.
    * You can either just add a constant compensation with the DEFAULT_Kf value
    * or follow the instruction below to get speed-dependent compensation.
@@ -450,9 +450,6 @@
 #define AUTOTEMP
 #if ENABLED(AUTOTEMP)
   #define AUTOTEMP_OLDWEIGHT    0.98  // Factor used to weight previous readings (0.0 < value < 1.0)
-  #define AUTOTEMP_MIN          210
-  #define AUTOTEMP_MAX          250
-  #define AUTOTEMP_FACTOR       0.1f
   // Turn on AUTOTEMP on M104/M109 by default using proportions set here
   //#define AUTOTEMP_PROPORTIONAL
   #if ENABLED(AUTOTEMP_PROPORTIONAL)
@@ -472,18 +469,18 @@
  * Thermistors able to support high temperature tend to have a hard time getting
  * good readings at room and lower temperatures. This means TEMP_SENSOR_X_RAW_LO_TEMP
  * will probably be caught when the heating element first turns on during the
- * preheating process, which will trigger a MINTEMP error as a safety measure
+ * preheating process, which will trigger a min_temp_error as a safety measure
  * and force stop everything.
  * To circumvent this limitation, we allow for a preheat time (during which,
- * MINTEMP error won't be triggered) and add a min_temp buffer to handle
+ * min_temp_error won't be triggered) and add a min_temp buffer to handle
  * aberrant readings.
  *
  * If you want to enable this feature for your hotend thermistor(s)
  * uncomment and set values > 0 in the constants below
  */
 
 // The number of consecutive low temperature errors that can occur
-// before a MINTEMP error is triggered. (Shouldn't be more than 10.)
+// before a min_temp_error is triggered. (Shouldn't be more than 10.)
 //#define MAX_CONSECUTIVE_LOW_TEMPERATURE_ERROR_ALLOWED 0
 
 /**
@@ -493,8 +490,7 @@
  * the minimum temperature your thermistor can read. The lower the better/safer.
  * This shouldn't need to be more than 30 seconds (30000)
  */
-//#define PREHEAT_TIME_HOTEND_MS 0
-//#define PREHEAT_TIME_BED_MS 0
+//#define MILLISECONDS_PREHEAT_TIME 0
 
 // @section extruder
 
@@ -843,20 +839,20 @@
   //#define Z_MULTI_ENDSTOPS          // Other Z axes have their own endstops
   #if ENABLED(Z_MULTI_ENDSTOPS)
     #define Z2_USE_ENDSTOP   _XMAX_   // Z2 endstop board plug. Don't forget to enable USE_*_PLUG.
-    #define Z2_ENDSTOP_ADJUSTMENT 0   // Z2 offset relative to Z endstop
+    #define Z2_ENDSTOP_ADJUSTMENT 0   // Z2 offset relative to Y endstop
   #endif
   #ifdef Z3_DRIVER_TYPE
     //#define INVERT_Z3_VS_Z_DIR      // Z3 direction signal is the opposite of Z
     #if ENABLED(Z_MULTI_ENDSTOPS)
       #define Z3_USE_ENDSTOP   _YMAX_ // Z3 endstop board plug. Don't forget to enable USE_*_PLUG.
-      #define Z3_ENDSTOP_ADJUSTMENT 0 // Z3 offset relative to Z endstop
+      #define Z3_ENDSTOP_ADJUSTMENT 0 // Z3 offset relative to Y endstop
     #endif
   #endif
   #ifdef Z4_DRIVER_TYPE
     //#define INVERT_Z4_VS_Z_DIR      // Z4 direction signal is the opposite of Z
     #if ENABLED(Z_MULTI_ENDSTOPS)
       #define Z4_USE_ENDSTOP   _ZMAX_ // Z4 endstop board plug. Don't forget to enable USE_*_PLUG.
-      #define Z4_ENDSTOP_ADJUSTMENT 0 // Z4 offset relative to Z endstop
+      #define Z4_ENDSTOP_ADJUSTMENT 0 // Z4 offset relative to Y endstop
     #endif
   #endif
 #endif
@@ -1034,7 +1030,7 @@
 //#define ASSISTED_TRAMMING
 #if ENABLED(ASSISTED_TRAMMING)
 
-  // Define from 3 to 9 points to probe.
+  // Define positions for probe points.
   #define TRAMMING_POINT_XY { {  20, 20 }, { 180,  20 }, { 180, 180 }, { 20, 180 } }
 
   // Define position names for probe points.
@@ -1418,9 +1414,6 @@
     //#define LCD_PRINTER_INFO_IS_BOOTSCREEN // Show bootscreen(s) instead of Printer Info pages
   #endif
 
-  // Add 50/100mm moves to MarlinUI even with a smaller bed
-  //#define LARGE_MOVE_ITEMS
-
   // BACK menu items keep the highlight at the top
   //#define TURBO_BACK_MENU_ITEM
 
@@ -1429,10 +1422,12 @@
 
 #endif // HAS_MARLINUI_MENU
 
-#if HAS_DISPLAY
+#if ANY(HAS_DISPLAY, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
   //#define SOUND_MENU_ITEM   // Add a mute option to the LCD menu
   #define SOUND_ON_DEFAULT    // Buzzer/speaker default enabled state
+#endif
 
+#if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI)
   // The timeout to return to the status screen from sub-menus
   //#define LCD_TIMEOUT_TO_STATUS 15000   // (ms)
 
@@ -1455,9 +1450,6 @@
   // Show the E position (filament used) during printing
   //#define LCD_SHOW_E_TOTAL
 
-  // Display a negative temperature instead of "err"
-  //#define SHOW_TEMPERATURE_BELOW_ZERO
-
   /**
    * LED Control Menu
    * Add LED Control to the LCD menu
@@ -1484,7 +1476,7 @@
     #endif
   #endif
 
-#endif // HAS_DISPLAY
+#endif // HAS_DISPLAY || DWIN_LCD_PROUI
 
 // Add 'M73' to set print job progress, overrides Marlin's built-in estimate
 //#define SET_PROGRESS_MANUALLY
@@ -1872,11 +1864,11 @@
 
   #define DGUS_UPDATE_INTERVAL_MS  500    // (ms) Interval between automatic screen updates
 
-  #if DGUS_UI_IS(FYSETC, MKS, HIPRECY)
+  #if ANY(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_MKS, DGUS_LCD_UI_HIPRECY)
     #define DGUS_PRINT_FILENAME           // Display the filename during printing
     #define DGUS_PREHEAT_UI               // Display a preheat screen during heatup
 
-    #if DGUS_UI_IS(FYSETC, MKS)
+    #if EITHER(DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_MKS)
       //#define DGUS_UI_MOVE_DIS_OPTION   // Disabled by default for FYSETC and MKS
     #else
       #define DGUS_UI_MOVE_DIS_OPTION     // Enabled by default for UI_HIPRECY
@@ -2066,11 +2058,11 @@
  *
  * Warning: Does not respect endstops!
  */
-//#define BABYSTEPPING
+#define BABYSTEPPING
 #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
@@ -2089,10 +2081,10 @@
 
   //#define BABYSTEP_DISPLAY_TOTAL          // Display total babysteps since last G28
 
-  //#define BABYSTEP_ZPROBE_OFFSET          // Combine M851 Z and Babystepping
+  #define BABYSTEP_ZPROBE_OFFSET            // Combine M851 Z and Babystepping
   #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
     //#define BABYSTEP_HOTEND_Z_OFFSET      // For multiple hotends, babystep relative Z offsets
-    //#define BABYSTEP_GFX_OVERLAY          // Enable graphical overlay on Z-offset editor
+    //#define BABYSTEP_ZPROBE_GFX_OVERLAY   // Enable graphical overlay on Z-offset editor
   #endif
 #endif
 
@@ -2122,6 +2114,7 @@
   #endif
   //#define ADVANCE_K_EXTRA       // Add a second linear advance constant, configurable with M900 L.
   //#define LA_DEBUG              // Print debug information to serial during operation. Disable for production use.
+  //#define EXPERIMENTAL_SCURVE   // Allow S-Curve Acceleration to be used with LA.
   //#define ALLOW_LOW_EJERK       // Allow a DEFAULT_EJERK value of <10. Recommended for direct drive hotends.
   //#define EXPERIMENTAL_I2S_LA   // Allow I2S_STEPPER_STREAM to be used with LA. Performance degrades as the LA step rate reaches ~20kHz.
 #endif
@@ -2447,7 +2440,7 @@
  * Currently handles M108, M112, M410, M876
  * NOTE: Not yet implemented for all platforms.
  */
-//#define EMERGENCY_PARSER
+#define EMERGENCY_PARSER
 
 /**
  * Realtime Reporting (requires EMERGENCY_PARSER)
@@ -2556,17 +2549,9 @@
    * Extra G-code to run while executing tool-change commands. Can be used to use an additional
    * stepper motor (e.g., I axis in Configuration.h) to drive the tool-changer.
    */
-  //#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!
-
-  /**
-   * Consider coordinates for EVENT_GCODE_TOOLCHANGE_Tx as relative to T0
-   * so that moves in the specified axes are the same for all tools.
-   */
-  //#define TC_GCODE_USE_GLOBAL_X   // Use X position relative to Tool 0
-  //#define TC_GCODE_USE_GLOBAL_Y   // Use Y position relative to Tool 0
-  //#define TC_GCODE_USE_GLOBAL_Z   // Use Z position relative to Tool 0
+  //#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.
@@ -2651,9 +2636,9 @@
 //#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            2  // (mm) Initial retract.
+  #define PAUSE_PARK_RETRACT_LENGTH            4  // (mm) Initial retract.
                                                   // This short retract is done immediately, before parking the nozzle.
-  #define FILAMENT_CHANGE_UNLOAD_FEEDRATE     10  // (mm/s) Unload filament feedrate. This can be pretty fast.
+  #define FILAMENT_CHANGE_UNLOAD_FEEDRATE    200  // (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      100  // (mm) The length of filament for a complete unload.
                                                   //   For Bowden, the full length of the tube and nozzle.
@@ -2662,9 +2647,9 @@
   #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   6  // (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     0  // (mm) Load length of filament, from extruder gear to nozzle.
+  #define FILAMENT_CHANGE_FAST_LOAD_FEEDRATE 100  // (mm/s) Load filament feedrate. This can be pretty fast.
+  #define FILAMENT_CHANGE_FAST_LOAD_ACCEL     15  // (mm/s^2) Lower acceleration may allow a faster feedrate.
+  #define FILAMENT_CHANGE_FAST_LOAD_LENGTH    15  // (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.
@@ -4236,7 +4221,7 @@
 //#define PINS_DEBUGGING
 
 // Enable Tests that will run at startup and produce a report
-//#define MARLIN_TEST_BUILD
+#define MARLIN_TEST_BUILD
 
 // Enable Marlin dev mode which adds some special commands
 //#define MARLIN_DEV_MODE
@@ -4259,7 +4244,7 @@
 /**
  * Software Reset options
  */
-//#define SOFT_RESET_VIA_SERIAL         // 'KILL' and '^X' commands will soft-reset the controller
+#define SOFT_RESET_VIA_SERIAL         // 'KILL' and '^X' commands will soft-reset the controller
 //#define SOFT_RESET_ON_KILL            // Use a digital button to soft-reset the controller after KILL
 
 // Report uncleaned reset reason from register r2 instead of MCUSR. Supported by Optiboot on AVR.

diff --git a/Marlin/Makefile b/Marlin/Makefile
@@ -59,7 +59,7 @@
 #
 
 # This defines the board to compile for (see boards.h for your board's ID)
-HARDWARE_MOTHERBOARD ?= 1020
+HARDWARE_MOTHERBOARD ?= 11
 
 ifeq ($(OS),Windows_NT)
   # Windows
@@ -114,10 +114,10 @@ WIRE               ?= 0
 TONE               ?= 1
 
 # This defines if U8GLIB is needed (may require RELOC_WORKAROUND)
-U8GLIB             ?= 0
+U8GLIB             ?= 1
 
 # This defines whether to include the Trinamic TMCStepper library
-TMC                ?= 0
+TMC                ?= 1
 
 # This defines whether to include the AdaFruit NeoPixel library
 NEOPIXEL           ?= 0

diff --git a/Marlin/Version.h b/Marlin/Version.h
@@ -28,33 +28,33 @@
 /**
  * Marlin release version identifier
  */
-//#define SHORT_BUILD_VERSION "bugfix-2.1.x"
+#define SHORT_BUILD_VERSION "2.1.2"
 
 /**
  * Verbose version identifier which should contain a reference to the location
  * from where the binary was downloaded or the source code was compiled.
  */
-//#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION
+#define DETAILED_BUILD_VERSION "Waggster D9 Firmware v2.0"
 
 /**
  * The STRING_DISTRIBUTION_DATE represents when the binary file was built,
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2023-02-23"
+#define STRING_DISTRIBUTION_DATE "2023-02-23"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
  */
-//#define MACHINE_NAME "3D Printer"
+#define MACHINE_NAME "Wanhao D9 Mk2"
 
 /**
  * The SOURCE_CODE_URL is the location where users will find the Marlin Source
  * Code which is installed on the device. In most cases —unless the manufacturer
  * has a distinct Github fork— the Source Code URL should just be the main
  * Marlin repository.
  */
-//#define SOURCE_CODE_URL "github.com/MarlinFirmware/Marlin"
+#define SOURCE_CODE_URL "github.com/rpetz/MarlinD9"
 
 /**
  * Default generic printer UUID.
@@ -65,7 +65,7 @@
  * The WEBSITE_URL is the location where users can get more information such as
  * documentation about a specific Marlin release.
  */
-//#define WEBSITE_URL "marlinfw.org"
+#define WEBSITE_URL "https://github.com/rpetz/MarlinD9"
 
 /**
  * Set the vendor info the serial USB interface, if changable