- updated toolchains to newer compilers, aiming for a good Marlin FW future

- improved generic_create_variant.py to not mess with official board variant configurations (only touch if board_build.variant value is prefixed with MARLIN_)

Author: quiret

buildroot/share/PlatformIO/boards/marlin_MKS_TinyBee.json

@@ -0,0 +1,38 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "esp32_out.ld"
+    },
+    "core": "esp32",
+    "extra_flags": "-DARDUINO_ESP32_DEV",
+    "f_cpu": "240000000L",
+    "f_flash": "40000000L",
+    "flash_mode": "dio",
+    "mcu": "esp32",
+    "variant": "esp32"
+  },
+  "connectivity": [
+    "wifi",
+    "bluetooth",
+    "ethernet",
+    "can"
+  ],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "MKS TinyBee V1.0",
+  "upload": {
+    "flash_size": "8MB",
+    "maximum_ram_size": 524288,
+    "maximum_size": 8388608,
+    "require_upload_port": true,
+    "speed": 460800,
+    "offset_address": 65536
+  },
+  "url": "https://github.com/makerbase-mks/MKS-TinyBee",
+  "vendor": "MKS Makerbase"
+}

buildroot/share/PlatformIO/scripts/generic_create_variant.py

@@ -6,6 +6,8 @@
 # will be picked up by PlatformIO just like any other variant.
 #
 import pioutil
+import re
+marlin_variant_pattern = re.compile("marlin_.*")
 if pioutil.is_pio_build():
     import shutil,marlin
     from pathlib import Path
@@ -44,15 +46,20 @@
     variant = board.get("build.variant")
     #series = mcu_type[:7].upper() + "xx"
 
-    # Prepare a new empty folder at the destination
-    variant_dir = FRAMEWORK_DIR / "variants" / variant
-    if variant_dir.is_dir():
-        shutil.rmtree(variant_dir)
-    if not variant_dir.is_dir():
-        variant_dir.mkdir()
+    # Only prepare a new variant if the PlatformIO configuration provides it (board_build.variant).
+    # This check is important so that we do not delete any official board config variants.
+    if marlin_variant_pattern.match(str(variant).lower()):
+        # Prepare a new empty folder at the destination
+        variant_dir = FRAMEWORK_DIR / "variants" / variant
+        if variant_dir.is_dir():
+            shutil.rmtree(variant_dir)
+        if not variant_dir.is_dir():
+            variant_dir.mkdir()
 
-    # Source dir is a local variant sub-folder
-    source_dir = Path("buildroot/share/PlatformIO/variants", variant)
-    assert source_dir.is_dir()
+        # Source dir is a local variant sub-folder
+        source_dir = Path("buildroot/share/PlatformIO/variants", variant)
+        assert source_dir.is_dir()
 
-    marlin.copytree(source_dir, variant_dir)
+        print("Copying variant " + str(variant) + " to framework directory...")
+
+        marlin.copytree(source_dir, variant_dir)

ini/avr.ini

@@ -13,8 +13,9 @@
 # AVR (8-bit) Common Environment values
 #
 [common_avr8]
-platform          = atmelavr@~3.4
+platform          = atmelavr@~4.0.1
 build_flags       = ${common.build_flags} -Wl,--relax
+build_src_flags   = -std=gnu++1z
 board_build.f_cpu = 16000000L
 build_src_filter  = ${common.default_src_filter} +<src/HAL/AVR>
 
@@ -53,7 +54,7 @@ extends             = common_avr8
 board_build.variant = MARLIN_MEGA_EXTENDED
 extra_scripts       = ${env:mega2560ext.extra_scripts}
 upload_speed        = 57600
-build_flags         = ${common.build_flags} -fno-tree-scev-cprop -fno-split-wide-types -Wl,--relax -mcall-prologues
+build_flags         = ${common_avr8.build_flags} -fno-tree-scev-cprop -fno-split-wide-types -mcall-prologues
 
 #
 # MightyBoard ATmega1280
@@ -103,7 +104,7 @@ board_upload.maximum_size = 126976
 #
 
 [tuned_1284p]
-build_flags = ${common.build_flags} -fno-tree-scev-cprop -fno-split-wide-types -Wl,--relax -mcall-prologues
+build_flags = ${common_avr8.build_flags} -fno-tree-scev-cprop -fno-split-wide-types -mcall-prologues
 
 [env:sanguino1284p_optimized]
 extends     = env:sanguino1284p

ini/esp32.ini

@@ -39,4 +39,16 @@ monitor_speed          = 115200
 
 [env:mks_tinybee]
 extends                = env:esp32
+board                  = marlin_MKS_TinyBee
+# New espressif32 packages actually REQUIRE a valid, correctly-specified board definition file.
+# You can put the board definition file inside of the buildroot\share\PlatformIO\boards folder (please name it prefixed with marlin stuff).
+# Old revisions (pre 5.0.0) actually allowed auto-detection of the flash size (support for that has since been removed).
+platform               = [email protected]
+platform_packages      = [email protected]
+#, framework-arduinoespressif32@https://github.com/quiret/Arduino-ESP32-1.0.6.git
+# (https://github.com/espressif/arduino-esp32/pull/7744)
+board_build.arduino.upstream_packages = no
+# These build flags fix bugs in the packages.
+build_flags            = ${env:esp32.build_flags} -Wno-attributes -D_POSIX_TIMEOUTS=-1 -D'__alloc_size2(x,y)=__attribute__((alloc_size(x,y)))' -D'__alloc_align(y)=' -D'__result_use_check=__attribute__((warn_unused_result))' -D'__alloc_size(x)=__attribute__((alloc_size(x)))' 
 board_build.partitions = default_8MB.csv
+build_src_flags        = -O3 -std=gnu++2a -Wno-volatile -D_BITMANAGE_ALWAYS_INLINE

ini/lpc176x.ini

@@ -14,7 +14,7 @@
 #
 [common_LPC]
 platform          = https://github.com/p3p/pio-nxplpc-arduino-lpc176x/archive/0.1.3.zip
-platform_packages = framework-arduino-lpc176x@^0.2.8
+platform_packages = framework-arduino-lpc176x@^0.2.9, [email protected]
 board             = nxp_lpc1768
 lib_ldf_mode      = off
 lib_compat_mode   = strict
@@ -29,6 +29,7 @@ build_flags       = ${common.build_flags} -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC17
   # debug options for backtrace
   #-funwind-tables
   #-mpoke-function-name
+build_src_flags   = -std=gnu++20 -Wno-volatile
 
 #
 # NXP LPC176x ARM Cortex-M3

ini/stm32-common.ini

@@ -9,6 +9,7 @@
 #
 ####################################
 
+# For Compatibility. Should be set to version that is last known to work across all boards.
 [common_stm32]
 platform         = ststm32@~12.1
 board_build.core = stm32
@@ -22,6 +23,15 @@ build_src_filter = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/share
 extra_scripts    = ${common.extra_scripts}
                    pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py
 
+# For the latest stuff. Latest as in: we test and then bump the version.
+# Please test before upgrading.
+[common_stm32_latest]
+extends          = common_stm32
+platform         = ststm32@~15.4.1
+build_flags      = ${common_stm32.build_flags}
+                   -std=gnu++2a
+build_unflags    = -std=gnu++14
+
 #
 # STM32 board based on a variant.
 #
@@ -31,6 +41,10 @@ extra_scripts = ${common_stm32.extra_scripts}
                 pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
                     buildroot/share/PlatformIO/scripts/offset_and_rename.py
 
+[stm32_variant_latest]
+extends       = common_stm32_latest
+extra_scripts = ${stm32_variant.extra_scripts}
+
 #
 # USB Flash Drive mix-ins for STM32
 #

ini/stm32f1-maple.ini

@@ -23,7 +23,7 @@
 # HAL/STM32F1 Common Environment values
 #
 [STM32F1_maple]
-platform          = ststm32@~12.1
+platform          = ststm32@~15.4.1
 board_build.core  = maple
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DARDUINO_ARCH_STM32 -DMAPLE_STM32F1
@@ -32,7 +32,7 @@ build_src_filter  = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_ignore        = SPI, FreeRTOS701, FreeRTOS821
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM
-platform_packages = tool-stm32duino
+platform_packages = tool-stm32duino, [email protected]
 extra_scripts     = ${common.extra_scripts}
                     pre:buildroot/share/PlatformIO/scripts/fix_framework_weakness.py
                     pre:buildroot/share/PlatformIO/scripts/stm32_serialbuffer.py