Merge upstream changes from Marlin 2.1.2.5

2024-11-23 13:43:26 +01:00
parent c41a85354a
commit c8ff13654b
376 changed files with 4922 additions and 3840 deletions
--- a/ini/avr.ini
+++ b/ini/avr.ini
@@ -46,6 +46,16 @@ extra_scripts       = ${common.extra_scripts}
 extends  = common_avr8
 board    = megaatmega1280

+#
+# ATmega1281 pin mapping (Minitronics)
+#
+[env:mega1281]
+extends             = env:mega1280
+board_build.mcu     = atmega1281
+board_build.variant = MARLIN_MEGA1281
+extra_scripts       = ${common.extra_scripts}
+                      pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
+
 #
 # MightyBoard AVR with extended pins
 #
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -187,7 +187,7 @@ SD_ABORT_ON_ENDSTOP_HIT                = build_src_filter=+<src/gcode/config/M54
 BAUD_RATE_GCODE                        = build_src_filter=+<src/gcode/config/M575.cpp>
 HAS_SMART_EFF_MOD                      = build_src_filter=+<src/gcode/config/M672.cpp>
 COOLANT_CONTROL|AIR_ASSIST             = build_src_filter=+<src/gcode/control/M7-M9.cpp>
-AIR_EVACUATION                         = build_src_filter=+<src/gcode/control/M10-M11.cpp>
+AIR_EVACUATION                         = build_src_filter=+<src/gcode/control/M10_M11.cpp>
 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>
--- a/ini/native.ini
+++ b/ini/native.ini
@@ -15,13 +15,26 @@
 [env:linux_native]
 platform         = native
 framework        =
-build_flags      = -D__PLAT_LINUX__ -std=gnu++17 -ggdb -g -lrt -lpthread -D__MARLIN_FIRMWARE__ -Wno-expansion-to-defined
+build_flags      = ${common.build_flags} -D__PLAT_LINUX__ -std=gnu++17 -ggdb -g -lrt -lpthread -D__MARLIN_FIRMWARE__ -Wno-expansion-to-defined
 build_src_flags  = -Wall -IMarlin/src/HAL/LINUX/include
 build_unflags    = -Wall
 lib_ldf_mode     = off
-lib_deps         =
 build_src_filter = ${common.default_src_filter} +<src/HAL/LINUX>

+# Environment specifically for unit testing through the Makefile
+# This is somewhat unorthodox, in that it uses the PlatformIO Unity testing framework,
+# but actual targets are dynamically generated during the build. This seems to prevent
+# Unity from being automatically included, so it is added here.
+[env:linux_native_test]
+extends          = env:linux_native
+extra_scripts    = ${common.extra_scripts}
+                   post:buildroot/share/PlatformIO/scripts/collect-code-tests.py
+build_src_filter = ${env:linux_native.build_src_filter} +<tests>
+lib_deps         = throwtheswitch/Unity@^2.5.2
+test_build_src   = true
+build_unflags    =
+build_flags      = ${env:linux_native.build_flags} -Werror
+
 #
 # Native Simulation
 # Builds with a small subset of available features
@@ -36,19 +49,20 @@ 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
+build_flags       = ${common.build_flags} -std=gnu++17
                    -I/usr/include/SDL2 -IMarlin -IMarlin/src/HAL/NATIVE_SIM/u8g
+                    -D__PLAT_NATIVE_SIM__ -DU8G_HAL_LINKS -DGLM_ENABLE_EXPERIMENTAL
 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/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
+                    MarlinSimUI=https://github.com/p3p/MarlinSimUI/archive/afe7c1c293.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

 [simulator_linux]
 extends     = simulator_common
@@ -69,37 +83,32 @@ build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}

 #
 # MacPorts:
-#  sudo port install gcc12 glm libsdl2 libsdl2_net
+#  sudo port install gcc14 glm mesa libsdl2 libsdl2_net
 #
 #  cd /opt/local/bin
 #  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 gcc-mp-14 gcc ; sudo ln -s g++-mp-14 g++ ; sudo ln -s g++ cc
 #  sudo ln -s ld-classic ld
 #  cd -
 #  rehash
 #
-# Use 'sudo port install mesa' to get a <GL/gl.h> if no Xcode is installed.
-# If Xcode is installed be sure to run `xcode-select --install` first.
-#
 #==================================================================================
 #
 # Homebrew:
 #  /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 #
-#  brew install gcc@12 glm sdl2 sdl2_net
+#  brew install gcc@14 glm mesa sdl2 sdl2_net
 #
 #  cd /opt/homebrew/bin
 #  sudo rm -f gcc g++ cc
-#  sudo ln -s gcc-12 gcc ; sudo ln -s g++-12 g++ ; sudo ln -s g++ cc
+#  sudo ln -s gcc-14 gcc ; sudo ln -s g++-14 g++ ; sudo ln -s g++ cc
 #  cd -
 #
-# Use 'brew install mesa' to get a <GL/gl.h> if no Xcode is installed.
-# If Xcode is installed be sure to run `xcode-select --install` first.
-#

 [simulator_macos]
-build_unflags     = -lGL -fstack-protector-strong
-build_flags       =
+build_unflags     = -g3 -lGL -fstack-protector-strong
+build_flags       = -g2
+  -DHAS_LIBBSD
  -I/opt/local/include
  -I/opt/local/include/freetype2
  -I/opt/local/include/SDL2/
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -100,7 +100,7 @@ extends           = stm32_variant
 board             = marlin_opulo_lumen_rev3
 build_flags       = ${stm32_variant.build_flags}
  -DARDUINO_BLACK_F407VE
-  -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
+  -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS -DHAS_STM32_UID
 extra_scripts     = ${stm32_variant.extra_scripts}

 #
@@ -111,7 +111,7 @@ extends           = stm32_variant
 board             = marlin_opulo_lumen_rev4
 build_flags       = ${stm32_variant.build_flags}
  -DARDUINO_BLACK_F407VE
-  -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS
+  -DUSBD_USE_CDC_COMPOSITE -DUSE_USB_FS -DHAS_STM32_UID
 extra_scripts     = ${stm32_variant.extra_scripts}

 #