🔖 Marlin 2.0.8.6

Fixes #22967

.gitignore

@@ -22,12 +22,16 @@
 # Generated files
 _Version.h
 bdf2u8g
+marlin_config.json
+mczip.h
+*.gen
+*.sublime-workspace
 
 #
 # OS
 #
 applet/
-*.DS_Store
+.DS_Store
 
 #
 # Misc
@@ -37,7 +41,6 @@ applet/
 *.rej
 *.bak
 *.idea
-*.s
 *.i
 *.ii
 *.swp
@@ -137,16 +140,19 @@ __vm/
 vc-fileutils.settings
 
 # Visual Studio Code
-.vscode
-.vscode/.browse.c_cpp.db*
-.vscode/c_cpp_properties.json
-.vscode/launch.json
-.vscode/*.db
+.vscode/*
+!.vscode/extensions.json
+
+#Simulation
+imgui.ini
+eeprom.dat
+spi_flash.bin
 
 # cmake
 CMakeLists.txt
 src/CMakeLists.txt
 CMakeListsPrivate.txt
+build/
 
 # CLion
 cmake-build-*
@@ -167,3 +173,6 @@ __pycache__
 # Simulation / Native
 eeprom.dat
 imgui.ini
+mczip.h
+spi_flash.bin
+*.sublime-workspace

.vscode/extensions.json

@@ -0,0 +1,12 @@
+{
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
+    "recommendations": [
+        "marlinfirmware.auto-build",
+        "platformio.platformio-ide"
+    ],
+    "unwantedRecommendations": [
+        "ms-vscode-remote.remote-containers",
+        "ms-vscode.cpptools-extension-pack"
+    ]
+}

Marlin/Version.h

@@ -28,7 +28,7 @@
 /**
  * Marlin release version identifier
  */
-//#define SHORT_BUILD_VERSION "2.0.8.3"
+//#define SHORT_BUILD_VERSION "2.0.8.6"
 
 /**
  * Verbose version identifier which should contain a reference to the location
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2023-07-18"
+//#define STRING_DISTRIBUTION_DATE "2026-01-22"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.

Marlin/src/HAL/AVR/timers.h

@@ -109,8 +109,8 @@ FORCE_INLINE void HAL_timer_start(const uint8_t timer_num, const uint32_t) {
  * (otherwise, characters will be lost due to UART overflow).
  * Then: Stepper, Endstops, Temperature, and -finally- all others.
  */
-#define HAL_timer_isr_prologue(TIMER_NUM)
-#define HAL_timer_isr_epilogue(TIMER_NUM)
+inline void HAL_timer_isr_prologue(const uint8_t) {}
+inline void HAL_timer_isr_epilogue(const uint8_t) {}
 
 /* 18 cycles maximum latency */
 #ifndef HAL_STEP_TIMER_ISR

Marlin/src/HAL/DUE/timers.h

@@ -125,4 +125,4 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
   pConfig->pTimerRegs->TC_CHANNEL[pConfig->channel].TC_SR;
 }
 
-#define HAL_timer_isr_epilogue(TIMER_NUM)
+inline void HAL_timer_isr_epilogue(const uint8_t) {}

Marlin/src/HAL/ESP32/timers.h

@@ -136,5 +136,5 @@ void HAL_timer_enable_interrupt(const uint8_t timer_num);
 void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
-#define HAL_timer_isr_prologue(TIMER_NUM)
-#define HAL_timer_isr_epilogue(TIMER_NUM)
+inline void HAL_timer_isr_prologue(const uint8_t) {}
+inline void HAL_timer_isr_epilogue(const uint8_t) {}

Marlin/src/HAL/LINUX/timers.h

@@ -93,5 +93,5 @@ void HAL_timer_enable_interrupt(const uint8_t timer_num);
 void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
-#define HAL_timer_isr_prologue(TIMER_NUM)
-#define HAL_timer_isr_epilogue(TIMER_NUM)
+inline void HAL_timer_isr_prologue(const uint8_t) {}
+inline void HAL_timer_isr_epilogue(const uint8_t) {}

Marlin/src/HAL/LPC1768/timers.h

@@ -170,4 +170,4 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
   }
 }
 
-#define HAL_timer_isr_epilogue(TIMER_NUM)
+inline void HAL_timer_isr_epilogue(const uint8_t) {}

Marlin/src/HAL/SAMD51/timers.h

@@ -140,4 +140,4 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
   }
 }
 
-#define HAL_timer_isr_epilogue(timer_num)
+inline void HAL_timer_isr_epilogue(const uint8_t) {}

Marlin/src/HAL/STM32/MarlinSPI.cpp

@@ -36,12 +36,16 @@ static void spi_init(spi_t *obj, uint32_t speed, spi_mode_e mode, uint8_t msb, u
 
 void MarlinSPI::setClockDivider(uint8_t _div) {
   _speed = spi_getClkFreq(&_spi);// / _div;
-  _clockDivider = _div;
+  if (_clockDivider != _div) {
+    _clockDivider = _div;
+    _mustInit = true;
+  }
 }
 
 void MarlinSPI::begin(void) {
-  //TODO: only call spi_init if any parameter changed!!
+  if (!_mustInit) return;
   spi_init(&_spi, _speed, _dataMode, _bitOrder, _dataSize);
+  _mustInit = false;
 }
 
 void MarlinSPI::setupDma(SPI_HandleTypeDef &_spiHandle, DMA_HandleTypeDef &_dmaHandle, uint32_t direction, bool minc) {

Marlin/src/HAL/STM32/MarlinSPI.h

@@ -76,15 +76,23 @@ public:
   /* These methods are deprecated and kept for compatibility.
    * Use SPISettings with SPI.beginTransaction() to configure SPI parameters.
    */
-  void setBitOrder(BitOrder _order) { _bitOrder = _order; }
+  void setBitOrder(BitOrder order) {
+    if (_bitOrder == order) return;
+    _bitOrder = order;
+    _mustInit = true;
+  }
 
-  void setDataMode(uint8_t _mode) {
-    switch (_mode) {
+  void setDataMode(uint8_t mode) {
+    auto previous_mode = _dataMode;
+    switch (mode) {
       case SPI_MODE0: _dataMode = SPI_MODE_0; break;
       case SPI_MODE1: _dataMode = SPI_MODE_1; break;
       case SPI_MODE2: _dataMode = SPI_MODE_2; break;
       case SPI_MODE3: _dataMode = SPI_MODE_3; break;
+      default: return;
     }
+    if (previous_mode != _dataMode)
+      _mustInit = true;
   }
 
   void setClockDivider(uint8_t _div);
@@ -104,4 +112,5 @@ private:
   pin_t _misoPin;
   pin_t _sckPin;
   pin_t _ssPin;
+  bool _mustInit = true;
 };

Marlin/src/HAL/STM32/timers.h

@@ -120,5 +120,5 @@ FORCE_INLINE static void HAL_timer_set_compare(const uint8_t timer_num, const ha
   }
 }
 
-#define HAL_timer_isr_prologue(TIMER_NUM)
-#define HAL_timer_isr_epilogue(TIMER_NUM)
+inline void HAL_timer_isr_prologue(const uint8_t) {}
+inline void HAL_timer_isr_epilogue(const uint8_t) {}

Marlin/src/HAL/STM32F1/timers.h

@@ -188,7 +188,7 @@ FORCE_INLINE static void HAL_timer_isr_prologue(const uint8_t timer_num) {
   }
 }
 
-#define HAL_timer_isr_epilogue(TIMER_NUM)
+inline void HAL_timer_isr_epilogue(const uint8_t) {}
 
 // No command is available in framework to turn off ARPE bit, which is turned on by default in libmaple.
 // Needed here to reset ARPE=0 for stepper timer

Marlin/src/HAL/TEENSY31_32/timers.h

@@ -74,10 +74,10 @@ typedef uint32_t hal_timer_t;
 #define DISABLE_TEMPERATURE_INTERRUPT() HAL_timer_disable_interrupt(TEMP_TIMER_NUM)
 
 #ifndef HAL_STEP_TIMER_ISR
-  #define HAL_STEP_TIMER_ISR() extern "C" void ftm0_isr() //void TC3_Handler()
+  #define HAL_STEP_TIMER_ISR() extern "C" void ftm0_isr()
 #endif
 #ifndef HAL_TEMP_TIMER_ISR
-  #define HAL_TEMP_TIMER_ISR() extern "C" void ftm1_isr() //void TC4_Handler()
+  #define HAL_TEMP_TIMER_ISR() extern "C" void ftm1_isr()
 #endif
 
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency);
@@ -110,4 +110,4 @@ void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
 void HAL_timer_isr_prologue(const uint8_t timer_num);
-#define HAL_timer_isr_epilogue(TIMER_NUM)
+inline void HAL_timer_isr_epilogue(const uint8_t) {}

Marlin/src/HAL/TEENSY35_36/timers.h

@@ -109,4 +109,4 @@ void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
 void HAL_timer_isr_prologue(const uint8_t timer_num);
-#define HAL_timer_isr_epilogue(TIMER_NUM)
+inline void HAL_timer_isr_epilogue(const uint8_t) {}

Marlin/src/HAL/TEENSY40_41/timers.cpp

@@ -30,41 +30,81 @@
 
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
   switch (timer_num) {
+    //
+    // Step Timer – GPT1 - Compare Interrupt OCR1 - Reset Mode
+    //
     case 0:
-      CCM_CSCMR1 &= ~CCM_CSCMR1_PERCLK_CLK_SEL; // turn off 24mhz mode
+      // 24MHz mode off – Use peripheral clock (150MHz)
+      CCM_CSCMR1 &= ~CCM_CSCMR1_PERCLK_CLK_SEL;
+      // Enable GPT1 clock gating
       CCM_CCGR1 |= CCM_CCGR1_GPT1_BUS(CCM_CCGR_ON);
 
-      GPT1_CR = 0;                   // disable timer
-      GPT1_SR = 0x3F;                // clear all prior status
-      GPT1_PR = GPT1_TIMER_PRESCALE - 1;
-      GPT1_CR |= GPT_CR_CLKSRC(1);   //clock selection #1 (peripheral clock = 150 MHz)
-      GPT1_CR |= GPT_CR_ENMOD;       //reset count to zero before enabling
-      GPT1_CR |= GPT_CR_OM1(1);      // toggle mode
-      GPT1_OCR1 = (GPT1_TIMER_RATE / frequency) -1; // Initial compare value
-      GPT1_IR = GPT_IR_OF1IE;        // Compare3 value
-      GPT1_CR |= GPT_CR_EN;          //enable GPT2 counting at 150 MHz
+      // Disable timer, clear all status bits
+      GPT1_CR = 0;                      // Disable timer
+      GPT1_SR = 0x3F;                   // Clear all prior status
 
-      OUT_WRITE(15, HIGH);
+      // Prescaler = 2 => 75MHz counting clock
+      GPT1_PR = GPT1_TIMER_PRESCALE - 1;
+
+      GPT1_CR = GPT_CR_CLKSRC(1)        // Clock selection #1 (peripheral clock = 150 MHz)
+              | GPT_CR_ENMOD            // Reset count to zero before enabling
+              | GPT_CR_OM2(TERN(MARLIN_DEV_MODE, 1, 0)); // 0 = edge compare, 1 = toggle
+
+      // Compare value – the number of clocks between edges
+      GPT1_OCR1 = (GPT1_TIMER_RATE / frequency) - 1;
+
+      // Enable compare‑event interrupt
+      GPT1_IR = GPT_IR_OF1IE;           // OF1 interrupt enabled
+
+      // Pull Pin 15 HIGH (logic‑high is the “idle” state)
+      TERN_(MARLIN_DEV_MODE, OUT_WRITE(15, HIGH));
+
+      // Attach and enable Stepper IRQ
+      // Note: UART priority is 16
       attachInterruptVector(IRQ_GPT1, &stepTC_Handler);
-      NVIC_SET_PRIORITY(IRQ_GPT1, 16);
+      NVIC_SET_PRIORITY(IRQ_GPT1, 16);  // Priority 16 (higher than Temp Timer)
+
+      // Start GPT1 counting at 150 MHz
+      GPT1_CR |= GPT_CR_EN;
+
       break;
+
+    //
+    // Temperature Timer – GPT2 - Compare Interrupt OCR1 - Reset Mode
+    //
     case 1:
-      CCM_CSCMR1 &= ~CCM_CSCMR1_PERCLK_CLK_SEL; // turn off 24mhz mode
+      // 24MHz mode off – Use peripheral clock (150MHz)
+      CCM_CSCMR1 &= ~CCM_CSCMR1_PERCLK_CLK_SEL;
+      // Enable GPT2 clock gating
       CCM_CCGR0 |= CCM_CCGR0_GPT2_BUS(CCM_CCGR_ON);
 
-      GPT2_CR = 0;                   // disable timer
-      GPT2_SR = 0x3F;                // clear all prior status
-      GPT2_PR = GPT2_TIMER_PRESCALE - 1;
-      GPT2_CR |= GPT_CR_CLKSRC(1);   //clock selection #1 (peripheral clock = 150 MHz)
-      GPT2_CR |= GPT_CR_ENMOD;       //reset count to zero before enabling
-      GPT2_CR |= GPT_CR_OM1(1);      // toggle mode
-      GPT2_OCR1 = (GPT2_TIMER_RATE / frequency) -1; // Initial compare value
-      GPT2_IR = GPT_IR_OF1IE;        // Compare3 value
-      GPT2_CR |= GPT_CR_EN;          //enable GPT2 counting at 150 MHz
+      // Disable timer, clear all status bits
+      GPT2_CR = 0;                      // Disable timer
+      GPT2_SR = 0x3F;                   // Clear all prior status
 
-      OUT_WRITE(14, HIGH);
+      // Prescaler = 10 => 15MHz counting clock
+      GPT2_PR = GPT2_TIMER_PRESCALE - 1;
+
+      GPT2_CR = GPT_CR_CLKSRC(1)        // Clock selection #1 (peripheral clock = 150 MHz)
+              | GPT_CR_ENMOD            // and reset count to zero before enabling
+              | GPT_CR_OM2(TERN(MARLIN_DEV_MODE, 1, 0)); // 0 = edge compare, 1 = toggle
+
+      // Compare value – the number of clocks between edges
+      GPT2_OCR1 = (GPT2_TIMER_RATE / frequency) - 1;
+
+      // Enable compare‑event interrupt
+      GPT2_IR = GPT_IR_OF1IE;           // OF1 interrupt enabled
+
+      // Pull Pin 14 HIGH (logic‑high is the “idle” state)
+      TERN_(MARLIN_DEV_MODE, OUT_WRITE(14, HIGH));
+
+      // Attach Temperature ISR
       attachInterruptVector(IRQ_GPT2, &tempTC_Handler);
-      NVIC_SET_PRIORITY(IRQ_GPT2, 32);
+      NVIC_SET_PRIORITY(IRQ_GPT2, 32);  // Priority 32 (lower than Step Timer)
+
+      // Start GPT2 counting at 150 MHz
+      GPT2_CR |= GPT_CR_EN;
+
       break;
   }
 }
@@ -86,6 +126,7 @@ void HAL_timer_disable_interrupt(const uint8_t timer_num) {
     case 1: NVIC_DISABLE_IRQ(IRQ_GPT2); break;
   }
 
+  // Ensure the CPU actually stops servicing the IRQ
   // We NEED memory barriers to ensure Interrupts are actually disabled!
   // ( https://dzone.com/articles/nvic-disabling-interrupts-on-arm-cortex-m-and-the )
   asm volatile("dsb");
@@ -101,12 +142,8 @@ bool HAL_timer_interrupt_enabled(const uint8_t timer_num) {
 
 void HAL_timer_isr_prologue(const uint8_t timer_num) {
   switch (timer_num) {
-    case 0:
-      GPT1_SR = GPT_IR_OF1IE;  // clear OF3 bit
-      break;
-    case 1:
-      GPT2_SR = GPT_IR_OF1IE;  // clear OF3 bit
-      break;
+    case 0: GPT1_SR = GPT_IR_OF1IE; break;   // clear OF1
+    case 1: GPT2_SR = GPT_IR_OF1IE; break;
   }
   asm volatile("dsb");
 }

Marlin/src/HAL/TEENSY40_41/timers.h

@@ -58,7 +58,7 @@ typedef uint32_t hal_timer_t;
 
 #define STEPPER_TIMER_RATE     GPT1_TIMER_RATE
 #define STEPPER_TIMER_TICKS_PER_US ((STEPPER_TIMER_RATE) / 1000000)
-#define STEPPER_TIMER_PRESCALE ((GPT_TIMER_RATE / 1000000) / STEPPER_TIMER_TICKS_PER_US)
+#define STEPPER_TIMER_PRESCALE (GPT_TIMER_RATE / STEPPER_TIMER_RATE)
 
 #define PULSE_TIMER_RATE       STEPPER_TIMER_RATE   // frequency of pulse timer
 #define PULSE_TIMER_PRESCALE   STEPPER_TIMER_PRESCALE
@@ -88,10 +88,14 @@ void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency);
 FORCE_INLINE static void HAL_timer_set_compare(const uint8_t timer_num, const hal_timer_t compare) {
   switch (timer_num) {
     case 0:
+      GPT1_CR |= GPT_CR_FRR;    // Free Run Mode (setting OCRx preserves CNT)
       GPT1_OCR1 = compare - 1;
+      GPT1_CR &= ~GPT_CR_FRR;   // Reset Mode (CNT resets on trigger)
       break;
     case 1:
+      GPT2_CR |= GPT_CR_FRR;    // Free Run Mode (setting OCRx preserves CNT)
       GPT2_OCR1 = compare - 1;
+      GPT2_CR &= ~GPT_CR_FRR;   // Reset Mode (CNT resets on trigger)
       break;
   }
 }
@@ -117,5 +121,4 @@ void HAL_timer_disable_interrupt(const uint8_t timer_num);
 bool HAL_timer_interrupt_enabled(const uint8_t timer_num);
 
 void HAL_timer_isr_prologue(const uint8_t timer_num);
-//void HAL_timer_isr_epilogue(const uint8_t timer_num) {}
-#define HAL_timer_isr_epilogue(TIMER_NUM)
+inline void HAL_timer_isr_epilogue(const uint8_t) {}

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.8.3"
+  #define SHORT_BUILD_VERSION "2.0.8.6"
 #endif
 
 /**
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2023-07-18"
+  #define STRING_DISTRIBUTION_DATE "2026-01-22"
 #endif
 
 /**

Marlin/src/module/stepper.cpp

@@ -1353,11 +1353,7 @@ HAL_STEP_TIMER_ISR() {
   HAL_timer_isr_epilogue(STEP_TIMER_NUM);
 }
 
-#ifdef CPU_32_BIT
-  #define STEP_MULTIPLY(A,B) MultiU32X24toH32(A, B)
-#else
-  #define STEP_MULTIPLY(A,B) MultiU24X32toH16(A, B)
-#endif
+#define STEP_MULTIPLY(A,B) TERN(CPU_32_BIT, MultiU32X24toH32, MultiU24X32toH16)(A, B)
 
 void Stepper::isr() {
 

ini/features.ini

@@ -11,20 +11,20 @@
 
 [features]
 YHCB2004                               = red-scorp/LiquidCrystal_AIP31068@^1.0.4, red-scorp/SoftSPIB@^1.1.1
-HAS_TFT_LVGL_UI                        = lvgl=https://github.com/makerbase-mks/LVGL-6.1.1-MKS/archive/master.zip
+HAS_TFT_LVGL_UI                        = lvgl=https://github.com/makerbase-mks/LVGL-6.1.1-MKS/archive/a3ebe98bc6.zip
                                          build_src_filter=+<src/lcd/extui/mks_ui>
                                          extra_scripts=download_mks_assets.py
 POSTMORTEM_DEBUGGING                   = build_src_filter=+<src/HAL/shared/cpu_exception> +<src/HAL/shared/backtrace>
                                          build_flags=-funwind-tables
-MKS_WIFI_MODULE                        = QRCode=https://github.com/makerbase-mks/QRCode/archive/master.zip
-HAS_TRINAMIC_CONFIG                    = TMCStepper@~0.7.1
+MKS_WIFI_MODULE                        = QRCode=https://github.com/makerbase-mks/QRCode/archive/261c5a696a.zip
+HAS_TRINAMIC_CONFIG                    = TMCStepper@~0.7.3
                                          build_src_filter=+<src/feature/tmc_util.cpp> +<src/module/stepper/trinamic.cpp> +<src/gcode/feature/trinamic/M122.cpp> +<src/gcode/feature/trinamic/M906.cpp> +<src/gcode/feature/trinamic/M911-M914.cpp>
 HAS_STEALTHCHOP                        = build_src_filter=+<src/gcode/feature/trinamic/M569.cpp>
-SR_LCD_3W_NL                           = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/master.zip
+SR_LCD_3W_NL                           = SailfishLCD=https://github.com/mikeshub/SailfishLCD/archive/6f53c19a8a.zip
 HAS_MOTOR_CURRENT_I2C                  = SlowSoftI2CMaster
                                          build_src_filter=+<src/feature/digipot>
-HAS_TMC26X                             = TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
-                                         build_src_filter=+<src/module/TMC26X.cpp>
+HAS_TMC26X                             = TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/a7d7c92a13.zip
+                                         build_src_filter=+<src/module/stepper/TMC26X.cpp>
 HAS_L64XX                              = Arduino-L6470@0.8.0
                                          build_src_filter=+<src/libs/L64XX> +<src/module/stepper/L64xx.cpp> +<src/gcode/feature/L6470> +<src/HAL/shared/HAL_spi_L6470.cpp>
 NEOPIXEL_LED                           = adafruit/Adafruit NeoPixel@~1.8.0
@@ -41,7 +41,7 @@ HAS_(FSMC|SPI|LTDC)_TFT                = build_src_filter=+<src/HAL/STM32/tft> +
 HAS_FSMC_TFT                           = build_src_filter=+<src/HAL/STM32/tft/tft_fsmc.cpp> +<src/HAL/STM32F1/tft/tft_fsmc.cpp>
 HAS_SPI_TFT                            = build_src_filter=+<src/HAL/STM32/tft/tft_spi.cpp> +<src/HAL/STM32F1/tft/tft_spi.cpp>
 I2C_EEPROM                             = build_src_filter=+<src/HAL/shared/eeprom_if_i2c.cpp>
-SOFT_I2C_EEPROM                        = SlowSoftI2CMaster, SlowSoftWire=https://github.com/felias-fogg/SlowSoftWire/archive/master.zip
+SOFT_I2C_EEPROM                        = SlowSoftI2CMaster, SlowSoftWire=https://github.com/felias-fogg/SlowSoftWire/archive/f34d777f39.zip
 SPI_EEPROM                             = build_src_filter=+<src/HAL/shared/eeprom_if_spi.cpp>
 HAS_GRAPHICAL_TFT                      = build_src_filter=+<src/lcd/tft>
 DWIN_CREALITY_LCD                      = build_src_filter=+<src/lcd/dwin>
@@ -218,7 +218,7 @@ HAS_SERVOS                             = build_src_filter=+<src/module/servo.cpp
 MORGAN_SCARA                           = build_src_filter=+<src/gcode/scara>
 HAS_MICROSTEPS                         = build_src_filter=+<src/gcode/control/M350_M351.cpp>
 (ESP3D_)?WIFISUPPORT                   = AsyncTCP, ESP Async WebServer
-                                         ESP3DLib=https://github.com/luc-github/ESP3DLib/archive/master.zip
+                                         ESP3DLib=https://github.com/luc-github/ESP3DLib/archive/dc0f3d96c6.zip
                                          arduinoWebSockets=links2004/WebSockets@2.3.4
                                          luc-github/ESP32SSDP@^1.1.1
                                          lib_ignore=ESPAsyncTCP

ini/stm32f1.ini

@@ -171,7 +171,7 @@ board_upload.offset_address = 0x08007000
 [env:STM32F103RC_btt_USB_stm32]
 extends           = env:STM32F103RC_btt_stm32
 platform          = ${common_stm32.platform}
-platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc.zip
+platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/39f37d6d6a.zip
 build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
 build_flags       = ${env:STM32F103RC_btt_stm32.build_flags} ${env:stm32_flash_drive.build_flags}
   -DUSBCON

ini/stm32f4.ini

@@ -160,7 +160,7 @@ debug_init_break  =
 # USB Flash Drive mix-ins for STM32
 #
 [stm_flash_drive]
-platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc.zip
+platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/39f37d6d6a.zip
 build_flags       = ${common_stm32.build_flags}
   -DHAL_PCD_MODULE_ENABLED -DHAL_HCD_MODULE_ENABLED
   -DUSBHOST -DUSBH_IRQ_PRIO=3 -DUSBH_IRQ_SUBPRIO=4
@@ -438,12 +438,12 @@ build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}
 [env:mks_robin_nano_v3_usb_flash_drive_msc]
 platform          = ${common_stm32.platform}
 extends           = env:mks_robin_nano_v3
-platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/usb-host-msc-cdc-msc.zip
+platform_packages = framework-arduinoststm32@https://github.com/rhapsodyv/Arduino_Core_STM32/archive/39f37d6d6a.zip
 build_unflags     = ${common_stm32.build_unflags} -DUSBD_USE_CDC
 build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}
-  -DUSBCON
-  -DUSE_USBHOST_HS
-  -DUSBD_IRQ_PRIO=5
-  -DUSBD_IRQ_SUBPRIO=6
-  -DUSE_USB_HS_IN_FS
-  -DUSBD_USE_CDC_MSC
+                    -DUSBCON
+                    -DUSE_USBHOST_HS
+                    -DUSBD_IRQ_PRIO=5
+                    -DUSBD_IRQ_SUBPRIO=6
+                    -DUSE_USB_HS_IN_FS
+                    -DUSBD_USE_CDC_MSC