Merge upstream changes from Marlin 2.1.2.2

2024-02-13 20:32:22 +01:00
parent e466309bfb
commit 752476dc8f
1367 changed files with 41601 additions and 31124 deletions
--- a/ini/avr.ini
+++ b/ini/avr.ini
@@ -14,8 +14,8 @@
 #
 [common_avr8]
 platform          = atmelavr@~4.0.1
-build_flags       = ${common.build_flags} -Wl,--relax
-build_src_flags   = -std=gnu++1z
+build_flags       = ${common.build_flags} -std=gnu++1z -Wl,--relax
+build_unflags     = -std=gnu++11
 board_build.f_cpu = 16000000L
 build_src_filter  = ${common.default_src_filter} +<src/HAL/AVR>

--- a/ini/esp32.ini
+++ b/ini/esp32.ini
@@ -13,15 +13,17 @@
 # Espressif ESP32
 #
 [env:esp32]
-platform         = espressif32@2.1.0
-board            = esp32dev
-build_flags      = ${common.build_flags} -DCORE_DEBUG_LEVEL=0
-build_src_filter = ${common.default_src_filter} +<src/HAL/ESP32>
-lib_ignore       = NativeEthernet
-upload_speed     = 500000
-monitor_speed    = 250000
-monitor_filters  = colorize, time, send_on_enter, log2file, esp32_exception_decoder
-#upload_port     = marlinesp.local
+platform          = espressif32@2.1.0
+platform_packages = espressif/toolchain-xtensa-esp32s3
+board             = esp32dev
+build_flags       = ${common.build_flags} -DCORE_DEBUG_LEVEL=0 -std=gnu++17
+build_unflags     = -std=gnu11 -std=gnu++11
+build_src_filter  = ${common.default_src_filter} +<src/HAL/ESP32>
+lib_ignore        = NativeEthernet
+upload_speed      = 500000
+monitor_speed     = 250000
+monitor_filters   = colorize, time, send_on_enter, log2file, esp32_exception_decoder
+#upload_port      = marlinesp.local
 #board_build.flash_mode = qio

 [env:FYSETC_E4]
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -9,23 +9,26 @@
 #                               #
 #################################

+# The order of the features matters for source-filter resolution inside of common-dependencies.py.
+
 [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
 MARLIN_TEST_BUILD                      = build_src_filter=+<src/tests>
 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
+MKS_WIFI_MODULE                        = QRCode=https://github.com/makerbase-mks/QRCode/archive/261c5a696a.zip
 HAS_TRINAMIC_CONFIG                    = TMCStepper@~0.7.3
                                         build_src_filter=+<src/module/stepper/trinamic.cpp> +<src/gcode/feature/trinamic/M122.cpp> +<src/gcode/feature/trinamic/M906.cpp> +<src/gcode/feature/trinamic/M911-M914.cpp> +<src/gcode/feature/trinamic/M919.cpp>
 HAS_T(RINAMIC_CONFIG|MC_SPI)           = build_src_filter=+<src/feature/tmc_util.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|DAC|SPI|PWM)    = build_src_filter=+<src/gcode/feature/digipot>
 HAS_MOTOR_CURRENT_I2C                  = SlowSoftI2CMaster
                                         build_src_filter=+<src/feature/digipot>
-HAS_TMC26X                             = TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
+HAS_TMC26X                             = TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/0.1.2.zip
                                         build_src_filter=+<src/module/stepper/TMC26X.cpp>
 LIB_INTERNAL_MAX31865                  = build_src_filter=+<src/libs/MAX31865.cpp>
 NEOPIXEL_LED                           = adafruit/Adafruit NeoPixel@~1.8.0
@@ -37,13 +40,16 @@ USES_LIQUIDCRYSTAL_I2C                 = marcoschwartz/LiquidCrystal_I2C@1.1.4
 USES_LIQUIDTWI2                        = LiquidTWI2@1.2.7
 HAS_LCDPRINT                           = build_src_filter=+<src/lcd/lcdprint.cpp>
 HAS_MARLINUI_HD44780                   = build_src_filter=+<src/lcd/HD44780>
-HAS_MARLINUI_U8GLIB                    = marlinfirmware/U8glib-HAL@~0.5.2
+HAS_MARLINUI_U8GLIB                    = marlinfirmware/U8glib-HAL@0.5.4
                                         build_src_filter=+<src/lcd/dogm>
-HAS_(FSMC|SPI|LTDC)_TFT                = build_src_filter=+<src/HAL/STM32/tft> +<src/HAL/STM32F1/tft> +<src/lcd/tft_io>
+HAS_(FSMC|SPI|LTDC)_TFT                = build_src_filter=+<src/lcd/tft_io>
+HAS_LTDC_TFT                           = build_src_filter=+<src/HAL/STM32/tft/tft_ltdc.cpp>
 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>
+HAS_SPI_TFT                            = build_src_filter=+<src/HAL/STM32/tft/tft_spi.cpp> +<src/HAL/STM32F1/tft/tft_spi.cpp> +<src/HAL/LPC1768/tft/tft_spi.cpp>
+HAS_TFT_XPT2046                        = build_src_filter=+<src/HAL/STM32/tft/xpt2046.cpp> +<src/HAL/STM32F1/tft/xpt2046.cpp> +<src/HAL/LPC1768/tft/xpt2046.cpp>
+TFT_TOUCH_DEVICE_GT911                 = build_src_filter=+<src/HAL/STM32/tft/gt911.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_DWIN_E3V2|IS_DWIN_MARLINUI         = build_src_filter=+<src/lcd/e3v2/common>
 DWIN_CREALITY_LCD                      = build_src_filter=+<src/lcd/e3v2/creality>
@@ -53,21 +59,21 @@ IS_DWIN_MARLINUI                       = build_src_filter=+<src/lcd/e3v2/marlinu
 HAS_GRAPHICAL_TFT                      = build_src_filter=+<src/lcd/tft>
 IS_TFTGLCD_PANEL                       = build_src_filter=+<src/lcd/TFTGLCD>
 HAS_TOUCH_BUTTONS                      = build_src_filter=+<src/lcd/touch/touch_buttons.cpp>
-HAS_MARLINUI_MENU                      = build_src_filter=+<src/lcd/menu>
+HAS_MARLINUI_MENU                      = build_src_filter=+<src/lcd/menu> -<src/lcd/menu/game>
 HAS_GAMES                              = build_src_filter=+<src/lcd/menu/game/game.cpp>
 MARLIN_BRICKOUT                        = build_src_filter=+<src/lcd/menu/game/brickout.cpp>
 MARLIN_INVADERS                        = build_src_filter=+<src/lcd/menu/game/invaders.cpp>
 MARLIN_MAZE                            = build_src_filter=+<src/lcd/menu/game/maze.cpp>
 MARLIN_SNAKE                           = build_src_filter=+<src/lcd/menu/game/snake.cpp>
 HAS_MENU_BACKLASH                      = build_src_filter=+<src/lcd/menu/menu_backlash.cpp>
-HAS_MENU_BED_CORNERS                   = build_src_filter=+<src/lcd/menu/menu_bed_corners.cpp>
 LCD_BED_LEVELING                       = build_src_filter=+<src/lcd/menu/menu_bed_leveling.cpp>
+HAS_MENU_BED_TRAMMING                  = build_src_filter=+<src/lcd/menu/menu_bed_tramming.cpp>
 HAS_MENU_CANCELOBJECT                  = build_src_filter=+<src/lcd/menu/menu_cancelobject.cpp>
 HAS_MENU_DELTA_CALIBRATE               = build_src_filter=+<src/lcd/menu/menu_delta_calibrate.cpp>
 HAS_MENU_FILAMENT                      = build_src_filter=+<src/lcd/menu/menu_filament.cpp>
 LCD_INFO_MENU                          = build_src_filter=+<src/lcd/menu/menu_info.cpp>
 HAS_MENU_JOB_RECOVERY                  = build_src_filter=+<src/lcd/menu/menu_job_recovery.cpp>
-HAS_MULTI_LANGUAGE                     = build_src_filter=+<src/lcd/menu/menu_language.cpp> +<src/gcode/lcd/M414.cpp>
+HAS_MENU_MULTI_LANGUAGE                = build_src_filter=+<src/lcd/menu/menu_language.cpp>
 HAS_MENU_LED                           = build_src_filter=+<src/lcd/menu/menu_led.cpp>
 HAS_MENU_MEDIA                         = build_src_filter=+<src/lcd/menu/menu_media.cpp>
 HAS_MENU_MIXER                         = build_src_filter=+<src/lcd/menu/menu_mixer.cpp>
@@ -78,8 +84,9 @@ HAS_MENU_CUTTER                        = build_src_filter=+<src/lcd/menu/menu_sp
 HAS_MENU_TEMPERATURE                   = build_src_filter=+<src/lcd/menu/menu_temperature.cpp>
 HAS_MENU_TMC                           = build_src_filter=+<src/lcd/menu/menu_tmc.cpp>
 HAS_MENU_TOUCH_SCREEN                  = build_src_filter=+<src/lcd/menu/menu_touch_screen.cpp>
-HAS_MENU_TRAMMING                      = build_src_filter=+<src/lcd/menu/menu_tramming.cpp>
+HAS_MENU_TRAMMING_WIZARD               = build_src_filter=+<src/lcd/menu/menu_tramming_wizard.cpp>
 HAS_MENU_UBL                           = build_src_filter=+<src/lcd/menu/menu_ubl.cpp>
+EXTENSIBLE_UI                          = build_src_filter=+<src/lcd/extui/ui_api.cpp>
 ANYCUBIC_LCD_CHIRON                    = build_src_filter=+<src/lcd/extui/anycubic_chiron>
 ANYCUBIC_LCD_I3MEGA                    = build_src_filter=+<src/lcd/extui/anycubic_i3mega>
 HAS_DGUS_LCD_CLASSIC                   = build_src_filter=+<src/lcd/extui/dgus>
@@ -168,7 +175,6 @@ HAS_EXTRA_ENDSTOPS                     = build_src_filter=+<src/gcode/calibrate/
 SKEW_CORRECTION_GCODE                  = build_src_filter=+<src/gcode/calibrate/M852.cpp>
 DIRECT_PIN_CONTROL                     = build_src_filter=+<src/gcode/control/M42.cpp> +<src/gcode/control/M226.cpp>
 PINS_DEBUGGING                         = build_src_filter=+<src/gcode/config/M43.cpp>
-NO_VOLUMETRICS                         = build_src_filter=-<src/gcode/config/M200-M205.cpp>
 HAS_MULTI_EXTRUDER                     = build_src_filter=+<src/gcode/config/M217.cpp>
 HAS_HOTEND_OFFSET                      = build_src_filter=+<src/gcode/config/M218.cpp>
 EDITABLE_SERVO_ANGLES                  = build_src_filter=+<src/gcode/config/M281.cpp>
@@ -176,6 +182,7 @@ PIDTEMP                                = build_src_filter=+<src/gcode/config/M30
 PREVENT_COLD_EXTRUSION                 = build_src_filter=+<src/gcode/config/M302.cpp>
 PIDTEMPBED                             = build_src_filter=+<src/gcode/config/M304.cpp>
 HAS_USER_THERMISTORS                   = build_src_filter=+<src/gcode/config/M305.cpp>
+PIDTEMPCHAMBER                         = build_src_filter=+<src/gcode/config/M309.cpp>
 SD_ABORT_ON_ENDSTOP_HIT                = build_src_filter=+<src/gcode/config/M540.cpp>
 BAUD_RATE_GCODE                        = build_src_filter=+<src/gcode/config/M575.cpp>
 HAS_SMART_EFF_MOD                      = build_src_filter=+<src/gcode/config/M672.cpp>
@@ -184,10 +191,12 @@ AIR_EVACUATION                         = build_src_filter=+<src/gcode/control/M1
 HAS_SOFTWARE_ENDSTOPS                  = build_src_filter=+<src/gcode/control/M211.cpp>
 SERVO_DETACH_GCODE                     = build_src_filter=+<src/gcode/control/M282.cpp>
 HAS_DUPLICATION_MODE                   = build_src_filter=+<src/gcode/control/M605.cpp>
+SPI_FLASH_BACKUP                       = build_src_filter=+<src/gcode/control/M993_M994.cpp>
+PLATFORM_M997_SUPPORT                  = build_src_filter=+<src/gcode/control/M997.cpp>
 LIN_ADVANCE                            = build_src_filter=+<src/gcode/feature/advance>
 PHOTO_GCODE                            = build_src_filter=+<src/gcode/feature/camera>
 CONTROLLER_FAN_EDITABLE                = build_src_filter=+<src/gcode/feature/controllerfan>
-HAS_SHAPING                            = build_src_filter=+<src/gcode/feature/input_shaping>
+HAS_ZV_SHAPING                         = build_src_filter=+<src/gcode/feature/input_shaping>
 GCODE_MACROS                           = build_src_filter=+<src/gcode/feature/macro>
 GRADIENT_MIX                           = build_src_filter=+<src/gcode/feature/mixing/M166.cpp>
 HAS_SAVED_POSITIONS                    = build_src_filter=+<src/gcode/feature/pause/G60.cpp> +<src/gcode/feature/pause/G61.cpp>
@@ -209,6 +218,7 @@ HAS_LCD_CONTRAST                       = build_src_filter=+<src/gcode/lcd/M250.c
 HAS_GCODE_M255                         = build_src_filter=+<src/gcode/lcd/M255.cpp>
 HAS_LCD_BRIGHTNESS                     = build_src_filter=+<src/gcode/lcd/M256.cpp>
 HAS_SOUND                              = build_src_filter=+<src/gcode/lcd/M300.cpp>
+HAS_MULTI_LANGUAGE                     = build_src_filter=+<src/gcode/lcd/M414.cpp>
 TOUCH_SCREEN_CALIBRATION               = build_src_filter=+<src/gcode/lcd/M995.cpp>
 ARC_SUPPORT                            = build_src_filter=+<src/gcode/motion/G2_G3.cpp>
 GCODE_MOTION_MODES                     = build_src_filter=+<src/gcode/motion/G80.cpp>
@@ -216,13 +226,18 @@ BABYSTEPPING                           = build_src_filter=+<src/gcode/motion/M29
 Z_PROBE_SLED                           = build_src_filter=+<src/gcode/probe/G31_G32.cpp>
 G38_PROBE_TARGET                       = build_src_filter=+<src/gcode/probe/G38.cpp>
 MAGNETIC_PARKING_EXTRUDER              = build_src_filter=+<src/gcode/probe/M951.cpp>
-SDSUPPORT                              = build_src_filter=+<src/sd/cardreader.cpp> +<src/sd/Sd2Card.cpp> +<src/sd/SdBaseFile.cpp> +<src/sd/SdFatUtil.cpp> +<src/sd/SdFile.cpp> +<src/sd/SdVolume.cpp> +<src/gcode/sd>
+HAS_MEDIA                              = build_src_filter=+<src/sd/cardreader.cpp> +<src/sd/Sd2Card.cpp> +<src/sd/SdBaseFile.cpp> +<src/sd/SdFatUtil.cpp> +<src/sd/SdFile.cpp> +<src/sd/SdVolume.cpp> +<src/gcode/sd>
 HAS_MEDIA_SUBCALLS                     = build_src_filter=+<src/gcode/sd/M32.cpp>
 GCODE_REPEAT_MARKERS                   = build_src_filter=+<src/feature/repeat.cpp> +<src/gcode/sd/M808.cpp>
-HAS_EXTRUDERS                          = build_src_filter=+<src/gcode/units/M82_M83.cpp> +<src/gcode/temp/M104_M109.cpp> +<src/gcode/config/M221.cpp>
-HAS_TEMP_PROBE                         = build_src_filter=+<src/gcode/temp/M192.cpp>
+HAS_EXTRUDERS                          = build_src_filter=+<src/gcode/units/M82_M83.cpp> +<src/gcode/config/M221.cpp>
+HAS_HOTEND                             = build_src_filter=+<src/gcode/temp/M104_M109.cpp>
+HAS_FAN                                = build_src_filter=+<src/gcode/temp/M106_M107.cpp>
+HAS_HEATED_BED                         = build_src_filter=+<src/gcode/temp/M140_M190.cpp>
+HAS_HEATED_CHAMBER                     = build_src_filter=+<src/gcode/temp/M141_M191.cpp>
 HAS_COOLER                             = build_src_filter=+<src/gcode/temp/M143_M193.cpp>
 AUTO_REPORT_TEMPERATURES               = build_src_filter=+<src/gcode/temp/M155.cpp>
+HAS_TEMP_PROBE                         = build_src_filter=+<src/gcode/temp/M192.cpp>
+HAS_PID_HEATING                        = build_src_filter=+<src/gcode/temp/M303.cpp>
 MPCTEMP                                = build_src_filter=+<src/gcode/temp/M306.cpp>
 INCH_MODE_SUPPORT                      = build_src_filter=+<src/gcode/units/G20_G21.cpp>
 TEMPERATURE_UNITS_SUPPORT              = build_src_filter=+<src/gcode/units/M149.cpp>
@@ -240,7 +255,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
--- a/ini/lpc176x.ini
+++ b/ini/lpc176x.ini
@@ -15,17 +15,19 @@
 [common_LPC]
 platform          = https://github.com/p3p/pio-nxplpc-arduino-lpc176x/archive/0.1.3.zip
 platform_packages = framework-arduino-lpc176x@^0.2.8
+                    toolchain-gccarmnoneeabi@1.100301.220327
 board             = nxp_lpc1768
 lib_ldf_mode      = off
 lib_compat_mode   = strict
 extra_scripts     = ${common.extra_scripts}
  Marlin/src/HAL/LPC1768/upload_extra_script.py
-build_src_filter  = ${common.default_src_filter} +<src/HAL/LPC1768> +<src/HAL/shared/backtrace>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/LPC1768> -<src/HAL/LPC1768/tft> +<src/HAL/shared/backtrace>
 lib_deps          = ${common.lib_deps}
  Servo
-custom_marlin.USES_LIQUIDCRYSTAL =  arduino-libraries/LiquidCrystal@~1.0.7
+custom_marlin.USES_LIQUIDCRYSTAL = arduino-libraries/LiquidCrystal@~1.0.7
 custom_marlin.NEOPIXEL_LED = Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/1.5.0.zip
-build_flags       = ${common.build_flags} -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/src/HAL/LPC1768/u8g
+build_flags       = ${common.build_flags} -DU8G_HAL_LINKS  -DPLATFORM_M997_SUPPORT
+                    -IMarlin/src/HAL/LPC1768/include -IMarlin/src/HAL/LPC1768/u8g
  # debug options for backtrace
  #-funwind-tables
  #-mpoke-function-name
--- a/ini/native.ini
+++ b/ini/native.ini
@@ -36,16 +36,17 @@ build_src_filter = ${common.default_src_filter} +<src/HAL/LINUX>
 [simulator_common]
 platform          = native
 framework         =
-build_flags       = ${common.build_flags} -std=gnu++17 -D__PLAT_NATIVE_SIM__ -DU8G_HAL_LINKS -I/usr/include/SDL2 -IMarlin -IMarlin/src/HAL/NATIVE_SIM/u8g
+build_flags       = ${common.build_flags} -std=gnu++17 -D__PLAT_NATIVE_SIM__ -DU8G_HAL_LINKS
+                    -I/usr/include/SDL2 -IMarlin -IMarlin/src/HAL/NATIVE_SIM/u8g
 build_src_flags   = -Wall -Wno-expansion-to-defined -Wno-deprecated-declarations -Wcast-align
 release_flags     = -g0 -O3 -flto
 debug_build_flags = -fstack-protector-strong -g -g3 -ggdb
 lib_compat_mode   = off
 build_src_filter  = ${common.default_src_filter} +<src/HAL/NATIVE_SIM>
 lib_deps          = ${common.lib_deps}
-  MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/refs/heads/bugfix-2.1.x.zip
-  Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/marlin_sim_native.zip
-  LiquidCrystal=https://github.com/p3p/LiquidCrystal/archive/master.zip
+  MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/8791f3ff43.zip
+  Adafruit NeoPixel=https://github.com/p3p/Adafruit_NeoPixel/archive/c6b319f447.zip
+  LiquidCrystal=https://github.com/p3p/LiquidCrystal/archive/322fb5fc23.zip
 extra_scripts = ${common.extra_scripts}
  pre:buildroot/share/PlatformIO/scripts/simulator.py

@@ -71,8 +72,9 @@ build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
 #  sudo port install gcc12 glm libsdl2 libsdl2_net
 #
 #  cd /opt/local/bin
-#  sudo rm -f gcc g++ cc
+#  sudo rm gcc g++ cc ld
 #  sudo ln -s gcc-mp-12 gcc ; sudo ln -s g++-mp-12 g++ ; sudo ln -s g++ cc
+#  sudo ln -s ld-classic ld
 #  cd -
 #  rehash
 #
@@ -134,5 +136,7 @@ custom_gcc      = g++
 [env:simulator_windows]
 extends         = simulator_common
 build_src_flags = ${simulator_common.build_src_flags} -fpermissive
-build_flags     = ${simulator_common.build_flags} ${simulator_common.debug_build_flags} -IC:\\msys64\\mingw64\\include\\SDL2 -fno-stack-protector -Wl,-subsystem,windows -ldl -lmingw32 -lSDL2main -lSDL2 -lSDL2_net -lopengl32 -lssp
+build_flags     = ${simulator_common.build_flags} ${simulator_common.debug_build_flags}
+                  -IC:\\msys64\\mingw64\\include\\SDL2 -fno-stack-protector -Wl,-subsystem,windows
+                  -ldl -lmingw32 -lSDL2main -lSDL2 -lSDL2_net -lopengl32 -lssp
 build_type      = debug
--- a/ini/renamed.ini
+++ b/ini/renamed.ini
@@ -21,6 +21,12 @@ board     = genericSTM32F103RE
 # List of environment names that are no longer used
 #

+[env:megaatmega1280]                  ;=> mega1280
+extends = renamed
+
+[env:megaatmega2560]                  ;=> mega2560
+extends = renamed
+
 [env:STM32F103RET6_creality_maple]    ;=> STM32F103RE_creality_maple
 extends = renamed

@@ -57,17 +63,35 @@ extends = renamed
 [env:BIGTREE_OCTOPUS_V1]              ;=> STM32F446ZE_btt
 extends = renamed

-[env:BIGTREE_OCTOPUS_V1_USB]          ;=> STM32F446ZE_btt_USB
+[env:BIGTREE_OCTOPUS_V1_USB]          ;=> STM32F446ZE_btt_usb_flash_drive
 extends = renamed

 [env:BIGTREE_OCTOPUS_PRO_V1_F429]     ;=> STM32F429ZG_btt
 extends = renamed

-[env:BIGTREE_OCTOPUS_PRO_V1_F429_USB] ;=> STM32F429ZG_btt_USB
+[env:BIGTREE_OCTOPUS_PRO_V1_F429_USB] ;=> STM32F429ZG_btt_usb_flash_drive
 extends = renamed

 [env:BIGTREE_OCTOPUS_V1_F407]         ;=> STM32F407ZE_btt
 extends = renamed

-[env:BIGTREE_OCTOPUS_V1_F407_USB]     ;=> STM32F407ZE_btt_USB
+[env:BIGTREE_OCTOPUS_V1_F407_USB]     ;=> STM32F407ZE_btt_usb_flash_drive
+extends = renamed
+
+[env:STM32H723Vx_btt]                 ;=> STM32H723VG_btt
+extends = renamed
+
+[env:STM32H723Zx_btt]                 ;=> STM32H723ZE_btt
+extends = renamed
+
+[env:STM32H743Vx_btt]                 ;=> STM32H743VI_btt
+extends = renamed
+
+[env:STM32F446ZE_btt_USB]             ;=> STM32F446ZE_btt_usb_flash_drive
+extends = renamed
+
+[env:STM32F429ZG_btt_USB]             ;=> STM32F429ZG_btt_usb_flash_drive
+extends = renamed
+
+[env:STM32F407ZE_btt_USB]             ;=> STM32F407ZE_btt_usb_flash_drive
 extends = renamed
--- a/ini/samd21.ini
+++ b/ini/samd21.ini
@@ -16,7 +16,7 @@
 platform         = atmelsam
 board            = minitronics20
 build_flags      = ${common.build_flags} -std=gnu++17
-                   -DUSBCON -DUSBD_USE_CDC -D__SAMD21__ -DARDUINO_SAMD_MINITRONICS20  -Wno-deprecated-declarations -DU8G_HAL_LINKS -DDEBUG
+                   -DUSBCON -DUSBD_USE_CDC -D__SAMD21__ -DARDUINO_SAMD_MINITRONICS20  -Wno-deprecated-declarations -DDEBUG
                   -IMarlin/src/HAL/SAMD21/u8g
 build_unflags    = -std=gnu++11
 build_src_filter = ${common.default_src_filter} +<src/HAL/SAMD21>
--- a/ini/samd51.ini
+++ b/ini/samd51.ini
@@ -22,5 +22,5 @@ lib_deps         = ${common.lib_deps}
                   SoftwareSerialM
 extra_scripts    = ${common.extra_scripts}
                   pre:buildroot/share/PlatformIO/scripts/SAMD51_grandcentral_m4.py
-custom_marlin.SDSUPPORT = SdFat - Adafruit Fork, Adafruit SPIFlash
+custom_marlin.HAS_MEDIA = SdFat - Adafruit Fork, Adafruit SPIFlash
 debug_tool       = jlink
--- a/ini/stm32-common.ini
+++ b/ini/stm32-common.ini
@@ -12,13 +12,11 @@
 [common_stm32]
 platform         = ststm32@~12.1
 board_build.core = stm32
-build_flags      = ${common.build_flags}
-                   -std=gnu++14 -DHAL_STM32
-                   -DUSBCON -DUSBD_USE_CDC
-                   -DTIM_IRQ_PRIO=13
-                   -DADC_RESOLUTION=12
+build_flags      = ${common.build_flags} -std=gnu++14
+                   -DHAL_STM32 -DPLATFORM_M997_SUPPORT
+                   -DUSBCON -DUSBD_USE_CDC -DTIM_IRQ_PRIO=13 -DADC_RESOLUTION=12
 build_unflags    = -std=gnu++11
-build_src_filter = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/shared/backtrace>
+build_src_filter = ${common.default_src_filter} +<src/HAL/STM32> -<src/HAL/STM32/tft> +<src/HAL/shared/backtrace>
 extra_scripts    = ${common.extra_scripts}
                   pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py

@@ -35,7 +33,8 @@ extra_scripts = ${common_stm32.extra_scripts}
 # 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-cdc-msc-3.zip
+# Arduino_Core_STM32 uses usb-host-msc-cdc-msc-3 branch
+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
--- a/ini/stm32f0.ini
+++ b/ini/stm32f0.ini
@@ -48,4 +48,4 @@ board            = malyanm300_f070cb
 build_flags      = ${common_stm32.build_flags}
                   -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB
                   -DHAL_UART_MODULE_ENABLED
-build_src_filter = ${common.default_src_filter} +<src/HAL/STM32>
+build_src_filter = ${common.default_src_filter} +<src/HAL/STM32> -<src/HAL/STM32/tft>
--- a/ini/stm32f1-maple.ini
+++ b/ini/stm32f1-maple.ini
@@ -26,9 +26,9 @@
 platform          = ststm32@~12.1
 board_build.core  = maple
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
-  ${common.build_flags} -DARDUINO_ARCH_STM32 -DMAPLE_STM32F1
+                    ${common.build_flags} -DARDUINO_ARCH_STM32 -DMAPLE_STM32F1 -DPLATFORM_M997_SUPPORT
 build_unflags     = -std=gnu11 -std=gnu++11
-build_src_filter  = ${common.default_src_filter} +<src/HAL/STM32F1>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/STM32F1> -<src/HAL/STM32F1/tft>
 lib_ignore        = SPI, FreeRTOS701, FreeRTOS821
 lib_deps          = ${common.lib_deps}
  SoftwareSerialM
@@ -95,7 +95,7 @@ upload_protocol = serial
 # BigTreeTech SKR Mini V1.1 / SKR Mini E3 & MZ (STM32F103RCT6 ARM Cortex-M3)
 #
 #   STM32F103RC_btt_maple ............. RCT6 with 256K
-#   STM32F103RC_btt_USB_maple ......... RCT6 with 256K (USB mass storage)
+#   STM32F103RC_btt_USB_maple ......... RCT6 with 256K with USB Media Share Support
 #
 [env:STM32F103RC_btt_maple]
 extends              = env:STM32F103RC_maple
@@ -111,28 +111,26 @@ lib_deps    = ${env:STM32F103RC_btt_maple.lib_deps}
              USBComposite for STM32F1@0.91

 #
-# Creality (STM32F103RET6)
+# Creality 512K (STM32F103RET6)
 #
 [env:STM32F103RE_creality_maple]
 extends              = env:STM32F103RE_maple
 build_flags          = ${env:STM32F103RE_maple.build_flags} -DTEMP_TIMER_CHAN=4
 board_build.address  = 0x08007000
 board_build.ldscript = creality.ld
-extra_scripts        = ${env:STM32F103RE_maple.extra_scripts}
-                       pre:buildroot/share/PlatformIO/scripts/random-bin.py
+board_build.rename   = firmware-{date}-{time}.bin
 debug_tool           = jlink
 upload_protocol      = jlink

 #
-# Creality (STM32F103RCT6)
+# Creality 256K (STM32F103RCT6)
 #
 [env:STM32F103RC_creality_maple]
 extends              = env:STM32F103RC_maple
 build_flags          = ${env:STM32F103RC_maple.build_flags} -DTEMP_TIMER_CHAN=4
 board_build.address  = 0x08007000
-board_build.ldscript = creality.ld
-extra_scripts        = ${env:STM32F103RC_maple.extra_scripts}
-                       pre:buildroot/share/PlatformIO/scripts/random-bin.py
+board_build.ldscript = creality256k.ld
+board_build.rename   = firmware-{date}-{time}.bin
 debug_tool           = jlink
 upload_protocol      = jlink

@@ -148,7 +146,7 @@ board_build.ldscript = crealityPro.ld
 # BigTreeTech SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
 #
 #   STM32F103RE_btt_maple ............. RET6
-#   STM32F103RE_btt_USB_maple ......... RET6 (USB mass storage)
+#   STM32F103RE_btt_USB_maple ......... RET6 with USB Media Share Support
 #
 [env:STM32F103RE_btt_maple]
 extends              = env:STM32F103RE_maple
@@ -305,7 +303,7 @@ extends     = STM32F1_maple
 board       = marlin_malyanM200
 build_flags = ${STM32F1_maple.build_flags}
              -DMCU_STM32F103CB -D__STM32F1__=1 -std=c++1y -DSERIAL_USB -ffunction-sections -fdata-sections
-              -Wl,--gc-sections -DDEBUG_LEVEL=0 -D__MARLIN_FIRMWARE__
+              -Wl,--gc-sections -DDEBUG_LEVEL=0
 lib_ignore  = ${STM32F1_maple.lib_ignore}
              SoftwareSerialM

@@ -400,8 +398,6 @@ extends              = env:STM32F103RE_maple
 build_flags          = ${STM32F1_maple.build_flags} -DTEMP_TIMER_CHAN=4
 board_build.address  = 0x08007000
 board_build.ldscript = sovol.ld
-extra_scripts        = ${STM32F1_maple.extra_scripts}
-  pre:buildroot/share/PlatformIO/scripts/random-bin.py
-  buildroot/share/PlatformIO/scripts/custom_board.py
+board_build.rename   = firmware-{date}-{time}.bin
 debug_tool           = jlink
 upload_protocol      = jlink
--- a/ini/stm32f1.ini
+++ b/ini/stm32f1.ini
@@ -54,7 +54,7 @@ monitor_speed = 115200
 # BigTreeTech SKR Mini V1.1 / SKR Mini E3 & MZ (STM32F103RCT6 ARM Cortex-M3)
 #
 #   STM32F103RC_btt ............. RCT6 with 256K
-#   STM32F103RC_btt_USB ......... RCT6 with 256K (USB mass storage)
+#   STM32F103RC_btt_USB ......... RCT6 with 256K with USB Media Share Support
 #
 [env:STM32F103RC_btt]
 extends                     = common_STM32F103RC_variant
@@ -121,6 +121,7 @@ debug_tool                  = stlink
 extends                     = stm32_variant
 board_build.variant         = MARLIN_F103Rx
 board_build.offset          = 0x7000
+board_build.rename          = firmware-{date}-{time}.bin
 board_upload.offset_address = 0x08007000
 build_flags                 = ${stm32_variant.build_flags}
                              -DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED
@@ -128,8 +129,6 @@ build_flags                 = ${stm32_variant.build_flags}
                              -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8
 build_unflags               = ${stm32_variant.build_unflags}
                              -DUSBCON -DUSBD_USE_CDC
-extra_scripts               = ${stm32_variant.extra_scripts}
-                              pre:buildroot/share/PlatformIO/scripts/random-bin.py
 monitor_speed               = 115200
 debug_tool                  = jlink
 upload_protocol             = jlink
@@ -207,7 +206,7 @@ build_flags         = ${stm32_variant.build_flags}
 # BigTreeTech SKR Mini E3 V2.0 & DIP / SKR CR6 (STM32F103RET6 ARM Cortex-M3)
 #
 #   STM32F103RE_btt ............. RET6
-#   STM32F103RE_btt_USB ......... RET6 (USB mass storage)
+#   STM32F103RE_btt_USB ......... RET6 with USB Media Share Support
 #
 [env:STM32F103RE_btt]
 extends                     = stm32_variant
@@ -253,7 +252,7 @@ board            = malyanm200_f103cb
 build_flags      = ${common_stm32.build_flags}
                   -DHAL_PCD_MODULE_ENABLED -DDISABLE_GENERIC_SERIALUSB
                   -DHAL_UART_MODULE_ENABLED
-build_src_filter = ${common.default_src_filter} +<src/HAL/STM32>
+build_src_filter = ${common.default_src_filter} +<src/HAL/STM32> -<src/HAL/STM32/tft>

 #
 # FLYmaker FLY Mini (STM32F103RCT6)
@@ -303,7 +302,8 @@ build_unflags               = ${mks_robin_nano_v1v2_common.build_unflags} -DUSBC
 [env:mks_robin_mini]
 extends                     = STM32F103VE_robin
 board_build.encrypt_mks     = Robin_mini.bin
-build_unflags               = ${STM32F103VE_robin.build_unflags} -DSS_TIMER=4
+build_unflags               = ${STM32F103VE_robin.build_unflags} -DSS_TIMER=4 -DTIMER_SERVO=TIM2
+build_flags                 = ${STM32F103VE_robin.build_flags} -DTIMER_SERVO=TIM1

 #
 # MKS Robin E3p (STM32F103VET6)
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -47,6 +47,7 @@ board               = marlin_STM32F407ZGT6
 board_build.variant = MARLIN_FLY_F407ZG
 board_build.offset  = 0x8000
 upload_protocol     = dfu
+
 #
 # FYSETC S6 (STM32F446RET6 ARM Cortex-M4)
 #
@@ -282,7 +283,7 @@ build_flags                 = ${stm32_variant.build_flags}
 #
 # BigTreeTech Octopus V1.0/1.1 / Octopus Pro V1.0 (STM32F446ZET6 ARM Cortex-M4) with USB Flash Drive Support
 #
-[env:STM32F446ZE_btt_USB]
+[env:STM32F446ZE_btt_usb_flash_drive]
 extends           = env:STM32F446ZE_btt
 platform_packages = ${stm_flash_drive.platform_packages}
 build_unflags     = -DUSBD_USE_CDC
@@ -308,7 +309,7 @@ build_flags                 = ${stm32_variant.build_flags}
 #
 # BigTreeTech Octopus V1.1 / Octopus Pro V1.0 (STM32F429ZGT6 ARM Cortex-M4) with USB Flash Drive Support
 #
-[env:STM32F429ZG_btt_USB]
+[env:STM32F429ZG_btt_usb_flash_drive]
 extends           = env:STM32F429ZG_btt
 platform_packages = ${stm_flash_drive.platform_packages}
 build_unflags     = -DUSBD_USE_CDC
@@ -330,7 +331,7 @@ build_flags        = ${stm32_variant.build_flags}
 #
 # BigTreeTech Octopus / Octopus Pro (STM32F407ZET6 ARM Cortex-M4) with USB Flash Drive Support
 #
-[env:STM32F407ZE_btt_USB]
+[env:STM32F407ZE_btt_usb_flash_drive]
 extends           = env:STM32F407ZE_btt
 platform_packages = ${stm_flash_drive.platform_packages}
 build_unflags     = -DUSBD_USE_CDC
@@ -468,7 +469,6 @@ upload_protocol             = jlink

 #
 # MKS Robin Nano V3 with USB Flash Drive Support
-# Currently, using a STM32duino fork, until USB Host get merged
 #
 [env:mks_robin_nano_v3_usb_flash_drive]
 extends           = env:mks_robin_nano_v3
@@ -481,7 +481,6 @@ build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}

 #
 # MKS Robin Nano V3 with USB Flash Drive Support and Shared Media
-# Currently, using a STM32duino fork, until USB Host and USB Device MSC get merged
 #
 [env:mks_robin_nano_v3_usb_flash_drive_msc]
 extends           = env:mks_robin_nano_v3_usb_flash_drive
@@ -498,7 +497,6 @@ board             = marlin_STM32F407VET6_CCM

 #
 # MKS Robin Nano V3.1 with USB Flash Drive Support
-# Currently, using a STM32duino fork, until USB Host get merged
 #
 [env:mks_robin_nano_v3_1_usb_flash_drive]
 extends           = env:mks_robin_nano_v3_usb_flash_drive
@@ -506,7 +504,6 @@ board             = marlin_STM32F407VET6_CCM

 #
 # MKS Robin Nano V3.1 with USB Flash Drive Support and Shared Media
-# Currently, using a STM32duino fork, until USB Host and USB Device MSC get merged
 #
 [env:mks_robin_nano_v3_1_usb_flash_drive_msc]
 extends           = env:mks_robin_nano_v3_usb_flash_drive_msc
@@ -531,7 +528,6 @@ upload_protocol             = jlink

 #
 # MKS Eagle with USB Flash Drive Support
-# Currently, using a STM32duino fork, until USB Host get merged
 #
 [env:mks_eagle_usb_flash_drive]
 extends           = env:mks_eagle
@@ -544,7 +540,6 @@ build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1.build_flags}

 #
 # MKS Eagle with USB Flash Drive Support and Shared Media
-# Currently, using a STM32duino fork, until USB Host and USB Device MSC get merged
 #
 [env:mks_eagle_usb_flash_drive_msc]
 extends           = env:mks_eagle_usb_flash_drive
@@ -576,7 +571,6 @@ upload_protocol             = jlink

 #
 # MKS Monster8 V1 / V2 (STM32F407VET6 ARM Cortex-M4) with USB Flash Drive Support
-# Currently, using a STM32duino fork, until USB Host get merged
 #
 [env:mks_monster8_usb_flash_drive]
 extends           = env:mks_monster8
@@ -589,7 +583,6 @@ build_flags       = ${stm_flash_drive.build_flags} ${stm32f4_I2C1_CAN.build_flag

 #
 # MKS Monster8 V1 / V2 (STM32F407VET6 ARM Cortex-M4) with USB Flash Drive Support and Shared Media
-# Currently, using a STM32duino fork, until USB Host and USB Device MSC get merged
 #
 [env:mks_monster8_usb_flash_drive_msc]
 extends           = env:mks_monster8_usb_flash_drive
@@ -677,37 +670,70 @@ extra_scripts = ${common_stm32.extra_scripts}
 #
 # Ender-3 S1 STM32F401RC_creality
 #
-[env:STM32F401RC_creality]
+[STM32F401RC_creality_base]
 extends                     = stm32_variant
 board                       = genericSTM32F401RC
 board_build.variant         = MARLIN_CREALITY_STM32F401RC
-board_build.offset          = 0x10000
-board_upload.offset_address = 0x08010000
 build_flags                 = ${stm32_variant.build_flags} -DMCU_STM32F401RC -DSTM32F4
                              -DSS_TIMER=4 -DTIMER_SERVO=TIM5
                              -DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8
 build_unflags               = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC
-extra_scripts               = ${stm32_variant.extra_scripts}
-                              pre:buildroot/share/PlatformIO/scripts/random-bin.py
 monitor_speed               = 115200

-[env:STM32F401RC_creality_jlink]
-extends                     = env:STM32F401RC_creality
-debug_tool                  = jlink
-upload_protocol             = jlink
+[env:STM32F401RC_creality]
+extends                     = STM32F401RC_creality_base
+board_build.offset          = 0x10000
+board_upload.offset_address = 0x08010000
+board_build.rename          = firmware-{date}-{time}.bin

-[env:STM32F401RC_creality_stlink]
-extends                     = env:STM32F401RC_creality
+[env:STM32F401RC_creality_nobootloader]
+extends                     = STM32F401RC_creality_base
+board_build.offset          = 0x0000
+board_upload.offset_address = 0x08000000
 debug_tool                  = stlink
 upload_protocol             = stlink

+[env:STM32F401RC_creality_jlink]
+extends         = env:STM32F401RC_creality
+debug_tool      = jlink
+upload_protocol = jlink
+
+[env:STM32F401RC_creality_stlink]
+extends         = env:STM32F401RC_creality
+debug_tool      = stlink
+upload_protocol = stlink
+
+#
+# Ender-5 S1 STM32F401RE_creality (CR4NS200141C13 with STM32F401RET6)
+#
+[env:STM32F401RE_creality]
+extends                     = stm32_variant
+board                       = marlin_CREALITY_STM32F401RE
+board_build.offset          = 0x10000
+board_upload.offset_address = 0x08010000
+board_build.rename          = firmware-{date}-{time}.bin
+build_flags                 = ${stm32_variant.build_flags} -DSTM32F401xE -DSTM32F4 -DSTM32F4_UPDATE_FOLDER
+build_unflags               = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC
+monitor_speed               = 115200
+
+[env:STM32F401RE_creality_jlink]
+extends         = env:STM32F401RE_creality
+debug_tool      = jlink
+upload_protocol = jlink
+
+[env:STM32F401RE_creality_stlink]
+extends         = env:STM32F401RE_creality
+debug_tool      = stlink
+upload_protocol = stlink
+
 #
 # BigTree SKR mini E3 V3.0.1 (STM32F401RCT6 ARM Cortex-M4)
 #
 [env:STM32F401RC_btt]
 extends                     = stm32_variant
 platform                    = ststm32@~14.1.0
-platform_packages           = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
+platform_packages           = framework-arduinoststm32@~4.20600.231001
+                              toolchain-gccarmnoneeabi@1.100301.220327
 board                       = marlin_STM32F401RC
 board_build.offset          = 0x4000
 board_upload.offset_address = 0x08004000
@@ -719,6 +745,20 @@ build_flags                 = ${stm32_variant.build_flags}
 upload_protocol             = stlink
 debug_tool                  = stlink

+#
+# BigTreeTech SKR Mini E3 V3.0.1 (STM32F401RCT6 ARM Cortex-M0+)
+# Custom upload to SD via Marlin with Binary Protocol
+# Requires Marlin with BINARY_FILE_TRANSFER already installed on the target board.
+# If CUSTOM_FIRMWARE_UPLOAD is also installed, Marlin will reboot the board to install the firmware.
+# Currently CUSTOM_FIRMWARE_UPLOAD must also be enabled to use 'xfer' build envs.
+#
+[env:STM32F401RC_btt_xfer]
+extends         = env:STM32F401RC_btt
+build_flags     = ${env:STM32F401RC_btt.build_flags} -DXFER_BUILD
+extra_scripts   = ${env:STM32F401RC_btt.extra_scripts}
+                  pre:buildroot/share/scripts/upload.py
+upload_protocol = custom
+
 #
 # MKS SKIPR v1.0 all-in-one board (STM32F407VE)
 #
--- a/ini/stm32g0.ini
+++ b/ini/stm32g0.ini
@@ -31,35 +31,41 @@ build_flags = -DPIN_WIRE_SCL=PB3 -DPIN_WIRE_SDA=PB4
 #
 [env:BTT_EBB42_V1_1_filament_extruder]
 extends                     = stm32_variant
-platform                    = ststm32@~14.1.0
-platform_packages           = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
+platform                    = ststm32@17.1.0
+platform_packages           = framework-arduinoststm32@~4.20600.231001
+                              toolchain-gccarmnoneeabi@1.120301.0
 board                       = marlin_BTT_EBB42_V1_1
 board_build.offset          = 0x0000
 board_upload.offset_address = 0x08000000
 build_flags                 = ${stm32_variant.build_flags} ${stm32g0_I2C2.build_flags}
-upload_protocol             = stlink
+                              -flto
+                              -Wl,--no-warn-rwx-segment
 debug_tool                  = stlink
+upload_protocol             = dfu
+upload_command              = dfu-util -a 0 -s 0x08000000:leave -D "$SOURCE"

 #
-# BigTreeTech SKR Mini E3 V3.0 (STM32G0B1RET6 ARM Cortex-M0+)
+# BigTreeTech SKR Mini E3 V3.0 (STM32G0B0RET6 / STM32G0B1RET6 ARM Cortex-M0+)
 #
 [env:STM32G0B1RE_btt]
 extends                     = stm32_variant
-platform                    = ststm32@~14.1.0
-platform_packages           = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
+platform                    = ststm32@17.1.0
+platform_packages           = framework-arduinoststm32@~4.20600.231001
+                              toolchain-gccarmnoneeabi@1.120301.0
 board                       = marlin_STM32G0B1RE
 board_build.offset          = 0x2000
 board_upload.offset_address = 0x08002000
 build_flags                 = ${stm32_variant.build_flags}
-                            -DPIN_SERIAL4_RX=PC_11 -DPIN_SERIAL4_TX=PC_10
-                            -DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
-                            -DTIMER_SERVO=TIM3 -DTIMER_TONE=TIM4
-                            -DSTEP_TIMER_IRQ_PRIO=0
+                              -DPIN_SERIAL4_RX=PC_11 -DPIN_SERIAL4_TX=PC_10
+                              -DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
+                              -DTIMER_SERVO=TIM3 -DTIMER_TONE=TIM4
+                              -DSTEP_TIMER_IRQ_PRIO=0
+                              -Wl,--no-warn-rwx-segment
 upload_protocol             = stlink
 debug_tool                  = stlink

 #
-# BigTreeTech SKR Mini E3 V3.0 (STM32G0B1RET6 ARM Cortex-M0+)
+# BigTreeTech SKR Mini E3 V3.0 (STM32G0B0RET6 / STM32G0B1RET6 ARM Cortex-M0+)
 # Custom upload to SD via Marlin with Binary Protocol
 # Requires Marlin with BINARY_FILE_TRANSFER already installed on the target board.
 # If CUSTOM_FIRMWARE_UPLOAD is also installed, Marlin will reboot the board to install the firmware.
@@ -73,7 +79,8 @@ extra_scripts   = ${env:STM32G0B1RE_btt.extra_scripts}
 upload_protocol = custom

 #
-# BigTreeTech Manta E3 EZ V1.0 / Manta M4P V1.0 / Manta M5P V1.0 (STM32G0B1RET6 ARM Cortex-M0+)
+# BigTreeTech Manta M4P V2.1 (STM32G0B0RET6 ARM Cortex-M0+)
+# BigTreeTech Manta E3 EZ V1.0 / Manta M5P V1.0 (STM32G0B1RET6 ARM Cortex-M0+)
 #
 [env:STM32G0B1RE_manta_btt]
 extends         = env:STM32G0B1RE_btt
@@ -81,7 +88,8 @@ build_flags     = ${env:STM32G0B1RE_btt.build_flags}
                  -DPIN_SERIAL3_RX=PD_9 -DPIN_SERIAL3_TX=PD_8 -DENABLE_HWSERIAL3

 #
-# BigTreeTech Manta E3 EZ V1.0 / Manta M4P V1.0 / Manta M5P V1.0 (STM32G0B1RET6 ARM Cortex-M0+)
+# BigTreeTech Manta M4P V2.1 (STM32G0B0RET6 ARM Cortex-M0+)
+# BigTreeTech Manta E3 EZ V1.0 / Manta M5P V1.0 (STM32G0B1RET6 ARM Cortex-M0+)
 # Custom upload to SD via Marlin with Binary Protocol
 # Requires Marlin with BINARY_FILE_TRANSFER already installed on the target board.
 # If CUSTOM_FIRMWARE_UPLOAD is also installed, Marlin will reboot the board to install the firmware.
@@ -99,17 +107,19 @@ upload_protocol = custom
 #
 [env:STM32G0B1VE_btt]
 extends                     = stm32_variant
-platform                    = ststm32@~14.1.0
-platform_packages           = framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/main.zip
+platform                    = ststm32@17.1.0
+platform_packages           = framework-arduinoststm32@~4.20600.231001
+                              toolchain-gccarmnoneeabi@1.120301.0
 board                       = marlin_STM32G0B1VE
 board_build.offset          = 0x2000
 board_upload.offset_address = 0x08002000
 build_flags                 = ${stm32_variant.build_flags}
-                            -DPIN_SERIAL4_RX=PE_9 -DPIN_SERIAL4_TX=PE_8
-                            -DPIN_SERIAL5_RX=PE_11 -DPIN_SERIAL5_TX=PE_10
-                            -DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
-                            -DTIMER_SERVO=TIM3 -DTIMER_TONE=TIM4
-                            -DSTEP_TIMER_IRQ_PRIO=0
+                              -DPIN_SERIAL4_RX=PE_9 -DPIN_SERIAL4_TX=PE_8
+                              -DPIN_SERIAL5_RX=PE_11 -DPIN_SERIAL5_TX=PE_10
+                              -DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
+                              -DTIMER_SERVO=TIM3 -DTIMER_TONE=TIM4
+                              -DSTEP_TIMER_IRQ_PRIO=0
+                              -Wl,--no-warn-rwx-segment
 upload_protocol             = stlink
 debug_tool                  = stlink

--- a/ini/stm32h7.ini
+++ b/ini/stm32h7.ini
@@ -12,8 +12,8 @@
 #   H : High Performance
 #   7 : Cortex M7 core (0:M0, 1-2:M3, 3-4:M4, 7:M7)
 #  43 : Line/Features
-#   I : 176 pins
-#   I : 2048KB Flash-memory
+#   I : 176 pins (T:36, C:48 or 49, M:81, V:100, Z:144, I:176)
+#   I : 2048KB Flash-memory (C:256KB, D:384KB, E:512KB, G:1024KB, I:2048KB)
 #   T : LQFP package
 #   6 : -40...85°C   (7: ...105°C)
 #
@@ -24,7 +24,8 @@
 #
 [env:BTT_SKR_SE_BX]
 extends            = stm32_variant
-platform_packages  = framework-arduinoststm32@https://github.com/thisiskeithb/Arduino_Core_STM32/archive/biqu-bx-workaround.zip
+# framework-arduinoststm32 uses biqu-bx-workaround branch
+platform_packages  = framework-arduinoststm32@https://github.com/thisiskeithb/Arduino_Core_STM32/archive/8b3522051a.zip
 board              = marlin_BTT_SKR_SE_BX
 board_build.offset = 0x20000
 build_flags        = ${stm32_variant.build_flags} ${stm_flash_drive.build_flags}
@@ -40,19 +41,18 @@ upload_protocol    = cmsis-dap
 debug_tool         = cmsis-dap

 #
-# BigTreeTech SKR V3.0 / V3.0 EZ (STM32H743VIT6 ARM Cortex-M7)
+# BigTreeTech STM32H743Vx ARM Cortex-M7 Common
 #
-[env:STM32H743Vx_btt]
+[STM32H743Vx_btt]
 extends                     = stm32_variant
 platform                    = ststm32@15.4.1
 platform_packages           = framework-arduinoststm32@~4.20200.220530
-board                       = marlin_STM32H743Vx
 board_build.offset          = 0x20000
 board_upload.offset_address = 0x08020000
 build_flags                 = ${stm32_variant.build_flags}
-                              -DPIN_SERIAL1_RX=PA_10 -DPIN_SERIAL1_TX=PA_9
-                              -DPIN_SERIAL3_RX=PD_9 -DPIN_SERIAL3_TX=PD_8
-                              -DPIN_SERIAL4_RX=PA_1 -DPIN_SERIAL4_TX=PA_0
+                              -DPIN_SERIAL1_TX=PA_9 -DPIN_SERIAL1_RX=PA_10
+                              -DPIN_SERIAL3_TX=PD_8 -DPIN_SERIAL3_RX=PD_9
+                              -DPIN_SERIAL4_TX=PA_0 -DPIN_SERIAL4_RX=PA_1
                              -DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
                              -DTIMER_SERVO=TIM5 -DTIMER_TONE=TIM2
                              -DSTEP_TIMER_IRQ_PRIO=0
@@ -60,23 +60,60 @@ build_flags                 = ${stm32_variant.build_flags}
 upload_protocol             = cmsis-dap
 debug_tool                  = cmsis-dap

+#
+# BigTreeTech SKR V3.0 / V3.0 EZ (STM32H743VIT6 ARM Cortex-M7)
+#
+[env:STM32H743VI_btt]
+extends                     = STM32H743Vx_btt
+board                       = marlin_STM32H743VI
+
+#
+# BigTreeTech STM32H723Vx ARM Cortex-M7 Common
+#
+[STM32H723Vx_btt]
+extends                     = stm32_variant
+platform                    = ststm32@15.4.1
+platform_packages           = framework-arduinoststm32@~4.20200.220530
+board_build.offset          = 0x20000
+board_upload.offset_address = 0x08020000
+build_flags                 = ${stm32_variant.build_flags}
+                              -DPIN_SERIAL1_TX=PA_9 -DPIN_SERIAL1_RX=PA_10
+                              -DPIN_SERIAL2_TX=PD_5 -DPIN_SERIAL2_RX=PD_6
+                              -DPIN_SERIAL3_TX=PD_8 -DPIN_SERIAL3_RX=PD_9
+                              -DPIN_SERIAL4_TX=PA_0 -DPIN_SERIAL4_RX=PA_1
+                              -DPIN_SERIAL7_TX=PE_8 -DPIN_SERIAL7_RX=PE_7
+                              -DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
+                              -DTIMER_SERVO=TIM5 -DTIMER_TONE=TIM2
+                              -DSTEP_TIMER_IRQ_PRIO=0
+                              -DRCC_PERIPHCLK_I2C35=RCC_PERIPHCLK_I2C5
+                              -DUSE_USB_HS -DUSE_USB_HS_IN_FS
+                              -DD_CACHE_DISABLED
+                              -UI2C5_BASE
+upload_protocol             = cmsis-dap
+debug_tool                  = cmsis-dap
+
 #
 # BigTreeTech SKR V3.0 / SKR V3.0 EZ (STM32H723VGT6 ARM Cortex-M7)
-# BigTreeTech Octopus Max EZ V1.0 (STM32H723VET6 ARM Cortex-M7)
 #
-[env:STM32H723Vx_btt]
+[env:STM32H723VG_btt]
+extends                     = STM32H723Vx_btt
+board                       = marlin_STM32H723VG
+
+#
+# BigTreeTech STM32H723Zx ARM Cortex-M7 Common
+#
+[STM32H723Zx_btt]
 extends                     = stm32_variant
 platform                    = ststm32@15.4.1
 platform_packages           = framework-arduinoststm32@~4.20200.220530
-board                       = marlin_STM32H723Vx
 board_build.offset          = 0x20000
 board_upload.offset_address = 0x08020000
 build_flags                 = ${stm32_variant.build_flags}
-                              -DPIN_SERIAL1_RX=PA_10 -DPIN_SERIAL1_TX=PA_9
-                              -DPIN_SERIAL2_RX=PD_6 -DPIN_SERIAL2_TX=PD_5
-                              -DPIN_SERIAL3_RX=PD_9 -DPIN_SERIAL3_TX=PD_8
-                              -DPIN_SERIAL4_RX=PA_1 -DPIN_SERIAL4_TX=PA_0
-                              -DPIN_SERIAL7_RX=PE_7 -DPIN_SERIAL7_TX=PE_8
+                              -DPIN_SERIAL1_TX=PA_9 -DPIN_SERIAL1_RX=PA_10
+                              -DPIN_SERIAL2_TX=PD_5 -DPIN_SERIAL2_RX=PD_6
+                              -DPIN_SERIAL3_TX=PD_8 -DPIN_SERIAL3_RX=PD_9
+                              -DPIN_SERIAL4_TX=PA_0 -DPIN_SERIAL4_RX=PA_1
+                              -DPIN_SERIAL7_TX=PE_8 -DPIN_SERIAL7_RX=PE_7
                              -DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
                              -DTIMER_SERVO=TIM5 -DTIMER_TONE=TIM2
                              -DSTEP_TIMER_IRQ_PRIO=0
@@ -88,27 +125,8 @@ upload_protocol             = cmsis-dap
 debug_tool                  = cmsis-dap

 #
-# BigTreeTech Octopus Pro V1.0 / Octopus Max EZ V1.0 (STM32H723ZET6 ARM Cortex-M7)
+# BigTreeTech Octopus Pro V1.0.1/1.1 / Octopus Max EZ V1.0 (STM32H723ZET6 ARM Cortex-M7)
 #
-[env:STM32H723Zx_btt]
-extends                     = stm32_variant
-platform                    = ststm32@15.4.1
-platform_packages           = framework-arduinoststm32@~4.20200.220530
-board                       = marlin_STM32H723Zx
-board_build.offset          = 0x20000
-board_upload.offset_address = 0x08020000
-build_flags                 = ${stm32_variant.build_flags}
-                              -DPIN_SERIAL1_RX=PA_10 -DPIN_SERIAL1_TX=PA_9
-                              -DPIN_SERIAL2_RX=PD_6 -DPIN_SERIAL2_TX=PD_5
-                              -DPIN_SERIAL3_RX=PD_9 -DPIN_SERIAL3_TX=PD_8
-                              -DPIN_SERIAL4_RX=PA_1 -DPIN_SERIAL4_TX=PA_0
-                              -DPIN_SERIAL7_RX=PE_7 -DPIN_SERIAL7_TX=PE_8
-                              -DSERIAL_RX_BUFFER_SIZE=1024 -DSERIAL_TX_BUFFER_SIZE=1024
-                              -DTIMER_SERVO=TIM5 -DTIMER_TONE=TIM2
-                              -DSTEP_TIMER_IRQ_PRIO=0
-                              -DRCC_PERIPHCLK_I2C35=RCC_PERIPHCLK_I2C5
-                              -DUSE_USB_HS -DUSE_USB_HS_IN_FS
-                              -DD_CACHE_DISABLED
-                              -UI2C5_BASE
-upload_protocol             = cmsis-dap
-debug_tool                  = cmsis-dap
+[env:STM32H723ZE_btt]
+extends                     = STM32H723Zx_btt
+board                       = marlin_STM32H723ZE