🔖 Marlin 2.0.5.5

Co-Authored-By: thisiskeithb <13375512+thisiskeithb@users.noreply.github.com>

.github/workflows/bad-target.md

@@ -1,7 +0,0 @@
-Thanks for your contribution! Unfortunately we can't accept PRs directed at release branches. We make patches to the bugfix branches and only later do we push them out as releases.
-
-Please redo this PR starting with the `bugfix-2.0.x` branch and be careful to target `bugfix-2.0.x` when resubmitting the PR.
-
-It may help to set your fork's default branch to `bugfix-2.0.x`.
-
-See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.

.github/workflows/bump-date.yml

@@ -11,6 +11,8 @@ on:
 
 jobs:
   bump_date:
+    name: Bump Distribution Date
+    if: github.repository == 'MarlinFirmware/Marlin'
 
     runs-on: ubuntu-latest
 
@@ -24,7 +26,6 @@ jobs:
     - name: Bump Distribution Date
       run: |
         # Inline Bump Script
-        [[ "$GITHUB_REPOSITORY" == "MarlinFirmware/Marlin" ]] || exit 0
         DIST=$( date +"%Y-%m-%d" )
         eval "sed -E -i 's/(#define +STRING_DISTRIBUTION_DATE) .*$/\1 \"$DIST\"/g' Marlin/src/inc/Version.h" && \
         git config user.name "${GITHUB_ACTOR}" && \

.github/workflows/check-pr.yml

@@ -1,6 +1,6 @@
 #
-# comment-pr.yml
-# Add a comment to any PR directed to a release branch
+# check-pr.yml
+# Close PRs directed at release branches
 #
 
 name: PR Bad Target
@@ -14,14 +14,20 @@ on:
 
 jobs:
   bad_target:
-
     name: PR Bad Target
+    if: github.repository == 'MarlinFirmware/Marlin'
+
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v1
-      - uses: harupy/comment-on-pr@master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          filename: bad-target.md
+    - uses: peter-evans/close-pull@v1
+      with:
+        delete-branch: false
+        comment: >
+          Thanks for your contribution! Unfortunately we can't accept PRs directed at release branches. We make patches to the bugfix branches and only later do we push them out as releases.
+
+          Please redo this PR starting with the `bugfix-2.0.x` branch and be careful to target `bugfix-2.0.x` when resubmitting the PR.
+
+          It may help to set your fork's default branch to `bugfix-2.0.x`.
+
+          See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.

.github/workflows/close-stale.yml

@@ -0,0 +1,27 @@
+#
+# close-stale.yml
+# Close open issues after a period of inactivity
+#
+
+name: Close Stale Issues
+
+on:
+  schedule:
+  - cron: "22 1 * * *"
+
+jobs:
+  stale:
+    name: Close Stale Issues
+    if: github.repository == 'MarlinFirmware/Marlin'
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v3
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label / comment or this will be closed in 5 days.'
+        days-before-stale: 30
+        days-before-close: 5
+        stale-issue-label: 'stale-closing-soon'
+        exempt-issue-labels: 'T: Feature Request'

.github/workflows/lock-closed.yml

@@ -0,0 +1,32 @@
+#
+# lock-closed.yml
+# Lock closed issues after a period of inactivity
+#
+
+name: Lock Closed Issues
+
+on:
+  schedule:
+    - cron: '0 1/13 * * *'
+
+jobs:
+  lock:
+    name: Lock Closed Issues
+    if: github.repository == 'MarlinFirmware/Marlin'
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: dessant/lock-threads@v2
+      with:
+        github-token: ${{ github.token }}
+        process-only: 'issues'
+        issue-lock-inactive-days: '60'
+        issue-exclude-created-before: ''
+        issue-exclude-labels: 'no-locking'
+        issue-lock-labels: ''
+        issue-lock-comment: >
+          This issue has been automatically locked since there
+          has not been any recent activity after it was closed.
+          Please open a new issue for related bugs.
+        issue-lock-reason: ''

.github/workflows/test-builds.yml

@@ -9,7 +9,14 @@ on:
   pull_request:
     branches:
     - bugfix-2.0.x
-    - dev-2.1.x
+    paths-ignore:
+    - config/**
+    - data/**
+    - docs/**
+    - '**/*.md'
+  push:
+    branches:
+    - bugfix-2.0.x
     paths-ignore:
     - config/**
     - data/**
@@ -18,6 +25,8 @@ on:
 
 jobs:
   test_builds:
+    name: Run All Tests
+    if: github.repository == 'MarlinFirmware/Marlin'
 
     runs-on: ubuntu-latest
 

.github/workflows/unlock-reopened.yml

@@ -0,0 +1,22 @@
+#
+# unlock-reopened.yml
+# Unlock an issue whenever it is re-opened
+#
+
+name: "Unlock reopened issue"
+
+on:
+  issues:
+    types: [reopened]
+
+jobs:
+  unlock:
+    name: Unlock Reopened
+    if: github.repository == 'MarlinFirmware/Marlin'
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: OSDKDev/unlock-issues@v1.1
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"

Marlin/Configuration_adv.h

@@ -1919,7 +1919,7 @@
  * TMC26X Stepper Driver options
  *
  * The TMC26XStepper library is required for this stepper driver.
- * https://github.com/trinamic/TMC26XStepper
+ * https://github.com/MarlinFirmware/TMC26XStepper
  */
 #if HAS_DRIVER(TMC26X)
 

Marlin/Version.h

@@ -28,7 +28,7 @@
 /**
  * Marlin release version identifier
  */
-//#define SHORT_BUILD_VERSION "2.0.5.3"
+//#define SHORT_BUILD_VERSION "2.0.5.5"
 
 /**
  * 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 "2020-01-31"
+//#define STRING_DISTRIBUTION_DATE "2023-07-18"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.

Marlin/src/core/types.h

@@ -347,14 +347,14 @@ struct XYZval {
   FI XYZval<T>  operator* (const XYZEval<T> &rs)       { XYZval<T> ls = *this; ls.x *= rs.x; ls.y *= rs.y; ls.z *= rs.z; return ls; }
   FI XYZval<T>  operator/ (const XYZEval<T> &rs) const { XYZval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; ls.z /= rs.z; return ls; }
   FI XYZval<T>  operator/ (const XYZEval<T> &rs)       { XYZval<T> ls = *this; ls.x /= rs.x; ls.y /= rs.y; ls.z /= rs.z; return ls; }
-  FI XYZval<T>  operator* (const float &v)       const { XYZval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= z;    return ls; }
-  FI XYZval<T>  operator* (const float &v)             { XYZval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= z;    return ls; }
-  FI XYZval<T>  operator* (const int &v)         const { XYZval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= z;    return ls; }
-  FI XYZval<T>  operator* (const int &v)               { XYZval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= z;    return ls; }
-  FI XYZval<T>  operator/ (const float &v)       const { XYZval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= z;    return ls; }
-  FI XYZval<T>  operator/ (const float &v)             { XYZval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= z;    return ls; }
-  FI XYZval<T>  operator/ (const int &v)         const { XYZval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= z;    return ls; }
-  FI XYZval<T>  operator/ (const int &v)               { XYZval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= z;    return ls; }
+  FI XYZval<T>  operator* (const float &v)       const { XYZval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= v;    return ls; }
+  FI XYZval<T>  operator* (const float &v)             { XYZval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= v;    return ls; }
+  FI XYZval<T>  operator* (const int &v)         const { XYZval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= v;    return ls; }
+  FI XYZval<T>  operator* (const int &v)               { XYZval<T> ls = *this; ls.x *= v;    ls.y *= v;    ls.z *= v;    return ls; }
+  FI XYZval<T>  operator/ (const float &v)       const { XYZval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= v;    return ls; }
+  FI XYZval<T>  operator/ (const float &v)             { XYZval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= v;    return ls; }
+  FI XYZval<T>  operator/ (const int &v)         const { XYZval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= v;    return ls; }
+  FI XYZval<T>  operator/ (const int &v)               { XYZval<T> ls = *this; ls.x /= v;    ls.y /= v;    ls.z /= v;    return ls; }
   FI XYZval<T>  operator>>(const int &v)         const { XYZval<T> ls = *this; _RS(ls.x); _RS(ls.y); _RS(ls.z); return ls; }
   FI XYZval<T>  operator>>(const int &v)               { XYZval<T> ls = *this; _RS(ls.x); _RS(ls.y); _RS(ls.z); return ls; }
   FI XYZval<T>  operator<<(const int &v)         const { XYZval<T> ls = *this; _LS(ls.x); _LS(ls.y); _LS(ls.z); return ls; }

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.5.3"
+  #define SHORT_BUILD_VERSION "2.0.5.5"
 #endif
 
 /**
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2020-03-31"
+  #define STRING_DISTRIBUTION_DATE "2023-07-18"
 #endif
 
 /**

README.md

@@ -42,7 +42,6 @@ To build Marlin 2.0 you'll need [Arduino IDE 1.8.8 or newer](https://www.arduino
 ## Submitting Changes
 
 - Submit **Bug Fixes** as Pull Requests to the ([bugfix-2.0.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x)) branch.
-- Submit **New Features** to the ([dev-2.1.x](https://github.com/MarlinFirmware/Marlin/tree/dev-2.1.x)) branch.
 - Follow the [Coding Standards](http://marlinfw.org/docs/development/coding_standards.html) to gain points with the maintainers.
 - Please submit your questions and concerns to the [Issue Queue](https://github.com/MarlinFirmware/Marlin/issues).
 

buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py

@@ -1,16 +1,13 @@
-import os
+import os, marlin
 Import("env")
 
 STM32_FLASH_SIZE = 256
-
 for define in env['CPPDEFINES']:
-    if define[0] == "VECT_TAB_ADDR":
-        env['CPPDEFINES'].remove(define)
     if define[0] == "STM32_FLASH_SIZE":
         STM32_FLASH_SIZE = define[1]
 
 # Relocate firmware from 0x08000000 to 0x08007000
-env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08007000"))
+marlin.relocate_firmware("0x08007000")
 
 custom_ld_script = os.path.abspath("buildroot/share/PlatformIO/ldscripts/STM32F103RC_SKR_MINI_" + str(STM32_FLASH_SIZE) + "K.ld")
 for i, flag in enumerate(env["LINKFLAGS"]):

buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py

@@ -3,8 +3,8 @@ from os.path import expandvars
 Import("env", "projenv")
 
 # Relocate firmware from 0x08000000 to 0x08002000
-#env['CPPDEFINES'].remove(("VECT_TAB_ADDR", 134217728))
-#env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08010000"))
+#import marlin
+#marlin.relocate_firmware("0x08001000")
 
 # Custom HEX from ELF
 env.AddPostAction(

buildroot/share/PlatformIO/scripts/STM32F103RE_SKR_E3_DIP.py

@@ -1,8 +1,8 @@
-import os
+import os, marlin
 Import("env")
 
 # Relocate firmware from 0x08000000 to 0x08007000
-env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08007000"))
+marlin.relocate_firmware("0x08007000")
 
 custom_ld_script = os.path.abspath("buildroot/share/PlatformIO/ldscripts/STM32F103RE_SKR_E3_DIP.ld")
 for i, flag in enumerate(env["LINKFLAGS"]):

buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py

@@ -1,11 +1,8 @@
-import os
+import os, marlin
 Import("env")
 
 # Relocate firmware from 0x08000000 to 0x08010000
-for define in env['CPPDEFINES']:
-    if define[0] == "VECT_TAB_ADDR":
-        env['CPPDEFINES'].remove(define)
-env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08010000"))
+marlin.relocate_firmware("0x08010000")
 
 custom_ld_script = os.path.abspath("buildroot/share/PlatformIO/ldscripts/STM32F103VE_longer.ld")
 for i, flag in enumerate(env["LINKFLAGS"]):
@@ -14,7 +11,6 @@ for i, flag in enumerate(env["LINKFLAGS"]):
     elif flag == "-T":
         env["LINKFLAGS"][i + 1] = custom_ld_script
 
-
 # Rename ${PROGNAME}.bin and save it as 'project.bin' (No encryption on the Longer3D)
 def encrypt(source, target, env):
     firmware = open(target[0].path, "rb")

buildroot/share/PlatformIO/scripts/chitu_crypt.py

@@ -1,12 +1,8 @@
-import os
-import struct
+import os,struct,marlin
 Import("env")
 
 # Relocate firmware from 0x08000000 to 0x08008800
-for define in env['CPPDEFINES']:
-    if define[0] == "VECT_TAB_ADDR":
-        env['CPPDEFINES'].remove(define)
-env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x8008800"))
+marlin.relocate_firmware("0x08008800")
 
 custom_ld_script = os.path.abspath("buildroot/share/PlatformIO/ldscripts/chitu_f103.ld")
 for i, flag in enumerate(env["LINKFLAGS"]):
@@ -15,7 +11,6 @@ for i, flag in enumerate(env["LINKFLAGS"]):
     elif flag == "-T":
         env["LINKFLAGS"][i + 1] = custom_ld_script
 
-
 def calculate_crc(contents, seed):
     accumulating_xor_value = seed;
 

buildroot/share/PlatformIO/scripts/fysetc_STM32S6.py

@@ -33,8 +33,8 @@ for file_name in os.listdir(source_dir):
         shutil.copy(full_file_name, variant_dir)
 
 # Relocate firmware from 0x08000000 to 0x08002000
-#env['CPPDEFINES'].remove(("VECT_TAB_ADDR", 134217728))
-#env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08010000"))
+#import marlin
+#marlin.relocate_firmware("0x08010000")
 #env.Replace(LDSCRIPT_PATH="buildroot/share/PlatformIO/ldscripts/fysetc_aio_ii.ld")
 
 # Custom HEX from ELF

buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py

@@ -1,11 +1,8 @@
-import os
+import os, marlin
 Import("env")
 
 # Relocate firmware from 0x08000000 to 0x0800A000
-env['CPPDEFINES'].remove(("VECT_TAB_ADDR", "0x8000000"))
-#alternatively, for STSTM <=5.1.0 use line below
-#env['CPPDEFINES'].remove(("VECT_TAB_ADDR", 134217728))
-env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x0800A000"))
+marlin.relocate_firmware("0x0800A000")
 
 custom_ld_script = os.path.abspath("buildroot/share/PlatformIO/ldscripts/jgaurora_a5s_a1.ld")
 for i, flag in enumerate(env["LINKFLAGS"]):
@@ -45,4 +42,3 @@ def addboot(source,target,env):
 	#os.rename(target[0].dir.path+'/firmware_with_bootloader.bin', target[0].dir.path+'/firmware.bin')
 
 env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", addboot);
-

buildroot/share/PlatformIO/scripts/marlin.py

@@ -0,0 +1,17 @@
+#
+# buildroot/share/PlatformIO/scripts/marlin.py
+# Helper module with some commonly-used functions
+#
+from SCons.Script import DefaultEnvironment
+env = DefaultEnvironment()
+
+def replace_define(field, value):
+	envdefs = env['CPPDEFINES'].copy()
+	for define in envdefs:
+		if define[0] == field:
+			env['CPPDEFINES'].remove(define)
+	env['CPPDEFINES'].append((field, value))
+
+# Relocate the firmware to a new address, such as "0x08005000"
+def relocate_firmware(address):
+	replace_define("VECT_TAB_ADDR", address)

buildroot/share/PlatformIO/scripts/mks_robin.py

@@ -1,11 +1,8 @@
-import os
+import os, marlin
 Import("env")
 
 # Relocate firmware from 0x08000000 to 0x08007000
-for define in env['CPPDEFINES']:
-    if define[0] == "VECT_TAB_ADDR":
-        env['CPPDEFINES'].remove(define)
-env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08007000"))
+marlin.relocate_firmware("0x08007000")
 
 custom_ld_script = os.path.abspath("buildroot/share/PlatformIO/ldscripts/mks_robin.ld")
 for i, flag in enumerate(env["LINKFLAGS"]):

buildroot/share/PlatformIO/scripts/mks_robin_lite.py

@@ -1,11 +1,8 @@
-import os
+import os, marlin
 Import("env")
 
 # Relocate firmware from 0x08000000 to 0x08005000
-for define in env['CPPDEFINES']:
-    if define[0] == "VECT_TAB_ADDR":
-        env['CPPDEFINES'].remove(define)
-env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08005000"))
+marlin.relocate_firmware("0x08005000")
 
 custom_ld_script = os.path.abspath("buildroot/share/PlatformIO/ldscripts/mks_robin_lite.ld")
 for i, flag in enumerate(env["LINKFLAGS"]):
@@ -14,7 +11,6 @@ for i, flag in enumerate(env["LINKFLAGS"]):
     elif flag == "-T":
         env["LINKFLAGS"][i + 1] = custom_ld_script
 
-
 # Encrypt ${PROGNAME}.bin and save it as 'mksLite.bin'
 def encrypt(source, target, env):
     import sys

buildroot/share/PlatformIO/scripts/mks_robin_lite3.py

@@ -1,11 +1,8 @@
-import os
+import os, marlin
 Import("env")
 
 # Relocate firmware from 0x08000000 to 0x08005000
-for define in env['CPPDEFINES']:
-    if define[0] == "VECT_TAB_ADDR":
-        env['CPPDEFINES'].remove(define)
-env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08005000"))
+marlin.relocate_firmware("0x08005000")
 
 custom_ld_script = os.path.abspath("buildroot/share/PlatformIO/ldscripts/mks_robin_lite.ld")
 for i, flag in enumerate(env["LINKFLAGS"]):
@@ -14,7 +11,6 @@ for i, flag in enumerate(env["LINKFLAGS"]):
     elif flag == "-T":
         env["LINKFLAGS"][i + 1] = custom_ld_script
 
-
 # Encrypt ${PROGNAME}.bin and save it as 'mksLite.bin'
 def encrypt(source, target, env):
     import sys

buildroot/share/PlatformIO/scripts/mks_robin_mini.py

@@ -1,11 +1,8 @@
-import os
+import os, marlin
 Import("env")
 
 # Relocate firmware from 0x08000000 to 0x08007000
-for define in env['CPPDEFINES']:
-    if define[0] == "VECT_TAB_ADDR":
-        env['CPPDEFINES'].remove(define)
-env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08007000"))
+marlin.relocate_firmware("0x08007000")
 
 custom_ld_script = os.path.abspath("buildroot/share/PlatformIO/ldscripts/mks_robin_mini.ld")
 for i, flag in enumerate(env["LINKFLAGS"]):
@@ -14,7 +11,6 @@ for i, flag in enumerate(env["LINKFLAGS"]):
     elif flag == "-T":
         env["LINKFLAGS"][i + 1] = custom_ld_script
 
-
 # Encrypt ${PROGNAME}.bin and save it as 'Robin_mini.bin'
 def encrypt(source, target, env):
     import sys

buildroot/share/PlatformIO/scripts/mks_robin_nano.py

@@ -1,11 +1,8 @@
-import os
+import os, marlin
 Import("env")
 
 # Relocate firmware from 0x08000000 to 0x08007000
-for define in env['CPPDEFINES']:
-    if define[0] == "VECT_TAB_ADDR":
-        env['CPPDEFINES'].remove(define)
-env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08007000"))
+marlin.relocate_firmware("0x08007000")
 
 custom_ld_script = os.path.abspath("buildroot/share/PlatformIO/ldscripts/mks_robin_nano.ld")
 for i, flag in enumerate(env["LINKFLAGS"]):
@@ -14,7 +11,6 @@ for i, flag in enumerate(env["LINKFLAGS"]):
     elif flag == "-T":
         env["LINKFLAGS"][i + 1] = custom_ld_script
 
-
 # Encrypt ${PROGNAME}.bin and save it as 'Robin_nano.bin'
 def encrypt(source, target, env):
     import sys

buildroot/share/PlatformIO/scripts/mks_robin_pro.py

@@ -1,11 +1,8 @@
-import os
+import os, marlin
 Import("env")
 
 # Relocate firmware from 0x08000000 to 0x08007000
-for define in env['CPPDEFINES']:
-    if define[0] == "VECT_TAB_ADDR":
-        env['CPPDEFINES'].remove(define)
-env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08007000"))
+marlin.relocate_firmware("0x08007000")
 
 custom_ld_script = os.path.abspath("buildroot/share/PlatformIO/ldscripts/mks_robin_pro.ld")
 for i, flag in enumerate(env["LINKFLAGS"]):

config/README.md

@@ -1,3 +1,3 @@
 # Where have all the configurations gone?
 
-## https://github.com/MarlinFirmware/Configurations/archive/release-2.0.5.2.zip
+## https://github.com/MarlinFirmware/Configurations/archive/release-2.0.5.zip

platformio.ini

@@ -62,8 +62,8 @@ platform          = atmelavr
 board             = megaatmega2560
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
-  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
+build_src_filter  = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # ATmega1280
@@ -73,8 +73,8 @@ platform          = atmelavr
 board             = megaatmega1280
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
-  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
+build_src_filter  = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # RAMBo
@@ -84,8 +84,8 @@ platform          = atmelavr
 board             = reprap_rambo
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
-  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
+build_src_filter  = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # FYSETC F6 V1.3
@@ -95,8 +95,8 @@ platform          = atmelavr
 board             = fysetc_f6_13
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
-  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
+build_src_filter  = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # FYSETC F6 V1.4
@@ -106,18 +106,18 @@ platform          = atmelavr
 board             = fysetc_f6_14
 board_build.f_cpu = 16000000L
 lib_deps          = ${common.lib_deps}
-  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/AVR>
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
+build_src_filter  = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # Sanguinololu (ATmega644p)
 #
 [env:sanguino644p]
-platform      = atmelavr
-board         = sanguino_atmega644p
-lib_deps      = ${common.lib_deps}
-  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
+platform         = atmelavr
+board            = sanguino_atmega644p
+lib_deps         = ${common.lib_deps}
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
+build_src_filter = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # Sanguinololu (ATmega1284p)
@@ -126,32 +126,32 @@ src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 platform      = atmelavr
 board         = sanguino_atmega1284p
 lib_deps      = ${common.lib_deps}
-  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
+build_src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # Melzi and clones (ATmega1284p)
 #
 [env:melzi]
-platform      = atmelavr
-board         = sanguino_atmega1284p
-lib_deps      = ${common.lib_deps}
-  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
-lib_ignore    = TMCStepper
-upload_speed  = 57600
+platform         = atmelavr
+board            = sanguino_atmega1284p
+lib_deps         = ${common.lib_deps}
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
+build_src_filter = ${common.default_src_filter} +<src/HAL/AVR>
+lib_ignore       = TMCStepper
+upload_speed     = 57600
 
 #
 # Melzi and clones (Optiboot bootloader)
 #
 [env:melzi_optiboot]
-platform      = atmelavr
-board         = sanguino_atmega1284p
-lib_deps      = ${common.lib_deps}
-  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
-lib_ignore    = TMCStepper
-upload_speed  = 115200
+platform         = atmelavr
+board            = sanguino_atmega1284p
+lib_deps         = ${common.lib_deps}
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
+build_src_filter = ${common.default_src_filter} +<src/HAL/AVR>
+lib_ignore       = TMCStepper
+upload_speed     = 115200
 
 #
 # AT90USB1286 boards using CDC bootloader
@@ -161,12 +161,12 @@ upload_speed  = 115200
 # - TEENSYLU
 #
 [env:at90usb1286_cdc]
-platform      = teensy
-board         = at90usb1286
-lib_deps      = ${common.lib_deps}
-  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-lib_ignore    = TMCStepper
-src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
+platform         = teensy
+board            = at90usb1286
+lib_deps         = ${common.lib_deps}
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
+lib_ignore       = TMCStepper
+build_src_filter = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # AT90USB1286 boards using DFU bootloader
@@ -175,11 +175,11 @@ src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 # - ? 5DPRINT ?
 #
 [env:at90usb1286_dfu]
-platform      = teensy
-board         = at90usb1286
-lib_deps      = ${common.lib_deps}
-lib_ignore    = TMCStepper
-src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
+platform         = teensy
+board            = at90usb1286
+lib_deps         = ${common.lib_deps}
+lib_ignore       = TMCStepper
+build_src_filter = ${common.default_src_filter} +<src/HAL/AVR>
 
 #
 # Due (Atmel SAM3X8E ARM Cortex-M3)
@@ -188,21 +188,21 @@ src_filter    = ${common.default_src_filter} +<src/HAL/AVR>
 #  - RADDS
 #
 [env:DUE]
-platform      = atmelsam
-board         = due
-src_filter    = ${common.default_src_filter} +<src/HAL/DUE>
+platform         = atmelsam
+board            = due
+build_src_filter = ${common.default_src_filter} +<src/HAL/DUE>
 
 [env:DUE_USB]
-platform      = atmelsam
-board         = dueUSB
-src_filter    = ${common.default_src_filter} +<src/HAL/DUE>
+platform         = atmelsam
+board            = dueUSB
+build_src_filter = ${common.default_src_filter} +<src/HAL/DUE>
 
 [env:DUE_debug]
 # Used when WATCHDOG_RESET_MANUAL is enabled
-platform      = atmelsam
-board         = due
-src_filter    = ${common.default_src_filter} +<src/HAL/DUE>
-build_flags   = ${common.build_flags}
+platform         = atmelsam
+board            = due
+build_src_filter = ${common.default_src_filter} +<src/HAL/DUE>
+build_flags      = ${common.build_flags}
   -funwind-tables
   -mpoke-function-name
 
@@ -219,7 +219,7 @@ build_flags       = -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/sr
 lib_ldf_mode      = off
 lib_compat_mode   = strict
 extra_scripts     = Marlin/src/HAL/LPC1768/upload_extra_script.py
-src_filter        = ${common.default_src_filter} +<src/HAL/LPC1768>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/LPC1768>
 lib_deps          = Servo
   LiquidCrystal
   U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
@@ -237,7 +237,7 @@ build_flags       = -DU8G_HAL_LINKS -IMarlin/src/HAL/LPC1768/include -IMarlin/sr
 lib_ldf_mode      = off
 lib_compat_mode   = strict
 extra_scripts     = Marlin/src/HAL/LPC1768/upload_extra_script.py
-src_filter        = ${common.default_src_filter} +<src/HAL/LPC1768>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/LPC1768>
 lib_deps          = Servo
   LiquidCrystal
   U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
@@ -249,13 +249,13 @@ lib_deps          = Servo
 # STM32F103RC
 #
 [env:STM32F103RC]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = genericSTM32F103RC
 platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
 build_unflags     = -std=gnu++11
-src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -265,7 +265,7 @@ monitor_speed     = 115200
 # STM32F103RC_fysetc
 #
 [env:STM32F103RC_fysetc]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = genericSTM32F103RC
 #board_build.core = maple
 platform_packages = tool-stm32duino
@@ -273,7 +273,7 @@ build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -DDEBUG_LEVEL=0 -DHAVE_SW_SERIAL
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_fysetc.py
-src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -291,14 +291,14 @@ upload_protocol   = serial
 #
 
 [env:STM32F103RC_btt]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = genericSTM32F103RC
 platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
-src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
   USBComposite for STM32F1@==0.91
@@ -306,14 +306,14 @@ lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
 [env:STM32F103RC_btt_USB]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = genericSTM32F103RC
 platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DUSE_USB_COMPOSITE
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
-src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
   USBComposite for STM32F1@==0.91
@@ -321,15 +321,15 @@ lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
 [env:STM32F103RC_btt_512K]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = genericSTM32F103RC
-board_upload.maximum_size=524288
+board_upload.maximum_size = 524288
 platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DSTM32_FLASH_SIZE=512
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
-src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
   USBComposite for STM32F1@==0.91
@@ -337,15 +337,15 @@ lib_ignore        = Adafruit NeoPixel, SPI
 monitor_speed     = 115200
 
 [env:STM32F103RC_btt_512K_USB]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = genericSTM32F103RC
-board_upload.maximum_size=524288
+board_upload.maximum_size = 524288
 platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DSTM32_FLASH_SIZE=512 -DUSE_USB_COMPOSITE
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RC_SKR_MINI.py
-src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
   USBComposite for STM32F1@==0.91
@@ -356,13 +356,13 @@ monitor_speed     = 115200
 # STM32F103RE
 #
 [env:STM32F103RE]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = genericSTM32F103RE
 platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
 build_unflags     = -std=gnu++11
-src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -373,14 +373,14 @@ monitor_speed     = 115200
 #   STM32F103RE_btt_USB ......... RET6 (USB mass storage)
 #
 [env:STM32F103RE_btt]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = genericSTM32F103RE
 platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RE_SKR_E3_DIP.py
-src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -389,14 +389,14 @@ upload_protocol   = stlink
 monitor_speed     = 115200
 
 [env:STM32F103RE_btt_USB]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = genericSTM32F103RE
 platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DUSE_USB_COMPOSITE
 build_unflags     = -std=gnu++11
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RE_SKR_E3_DIP.py
-src_filter        = ${common.default_src_filter} +<src/HAL/STM32F1>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -408,192 +408,192 @@ monitor_speed     = 115200
 # STM32F4 with STM32GENERIC
 #
 [env:STM32F4]
-platform      = ststm32
-board         = disco_f407vg
-build_flags   = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F4 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED
-lib_ignore    = Adafruit NeoPixel, TMCStepper
-src_filter    = ${common.default_src_filter} +<src/HAL/STM32_F4_F7> -<src/HAL/STM32_F4_F7/STM32F7>
+platform         = ststm32@<6.2.0
+board            = disco_f407vg
+build_flags      = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F4 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED
+lib_ignore       = Adafruit NeoPixel, TMCStepper
+build_src_filter = ${common.default_src_filter} +<src/HAL/STM32_F4_F7> -<src/HAL/STM32_F4_F7/STM32F7>
 
 #
 # STM32F7 with STM32GENERIC
 #
 [env:STM32F7]
-platform      = ststm32
-board         = remram_v1
-build_flags   = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F7 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED
-lib_ignore    = Adafruit NeoPixel, TMCStepper
-src_filter    = ${common.default_src_filter} +<src/HAL/STM32_F4_F7> -<src/HAL/STM32_F4_F7/STM32F4>
+platform         = ststm32@<6.2.0
+board            = remram_v1
+build_flags      = ${common.build_flags} -DUSE_STM32GENERIC -DSTM32GENERIC -DSTM32F7 -DMENU_USB_SERIAL -DMENU_SERIAL=SerialUSB -DHAL_IWDG_MODULE_ENABLED
+lib_ignore       = Adafruit NeoPixel, TMCStepper
+build_src_filter = ${common.default_src_filter} +<src/HAL/STM32_F4_F7> -<src/HAL/STM32_F4_F7/STM32F4>
 
 #
 # ARMED (STM32)
 #
 [env:ARMED]
-platform      = ststm32
-board         = armed_v1
-build_flags   = ${common.build_flags}
+platform         = ststm32@<6.2.0
+board            = armed_v1
+build_flags      = ${common.build_flags}
   -DUSBCON -DUSBD_VID=0x0483 '-DUSB_MANUFACTURER="Unknown"' '-DUSB_PRODUCT="ARMED_V1"' -DUSBD_USE_CDC
   -O2 -ffreestanding -fsigned-char -fno-move-loop-invariants -fno-strict-aliasing -std=gnu11 -std=gnu++11
   -IMarlin/src/HAL/STM32
-lib_ignore    = Adafruit NeoPixel, SoftwareSerial
-src_filter    = ${common.default_src_filter} +<src/HAL/STM32>
+lib_ignore       = Adafruit NeoPixel, SoftwareSerial
+build_src_filter = ${common.default_src_filter} +<src/HAL/STM32>
 
 #
 # Geeetech GTM32 (STM32F103VET6)
 #
 [env:STM32F103VE_GTM32]
-platform        = ststm32
-board           = genericSTM32F103VE
-build_flags     = !python Marlin/src/HAL/STM32F1/build_flags.py
+platform         = ststm32@<6.2.0
+board            = genericSTM32F103VE
+build_flags      = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DDEBUG_LEVEL=DEBUG_NONE -std=gnu++14 -MMD -ffunction-sections -fdata-sections -nostdlib
   -DBOARD_generic_stm32f103v -DARDUINO_GENERIC_STM32F103V -DARDUINO_ARCH_STM32F1
   -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DVECT_TAB_ADDR=0x8000000 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
-build_unflags = -std=gnu++11
-src_filter      = ${common.default_src_filter} +<src/HAL/STM32F1>
-lib_ignore      = Adafruit NeoPixel, SPI
-upload_protocol = serial
+build_unflags    = -std=gnu++11
+build_src_filter = ${common.default_src_filter} +<src/HAL/STM32F1>
+lib_ignore       = Adafruit NeoPixel, SPI
+upload_protocol  = serial
 
 #
 # Longer 3D board in Alfawise U20 (STM32F103VET6)
 #
 [env:STM32F103VE_longer]
-platform      = ststm32
-board         = genericSTM32F103VE
-build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
+platform         = ststm32@<6.2.0
+board            = genericSTM32F103VE
+build_flags      = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -USERIAL_USB
   -DSTM32F1xx -DU20 -DTS_V12
-build_unflags = -std=gnu++11 -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
-extra_scripts = buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
-src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
-lib_ignore    = Adafruit NeoPixel, LiquidTWI2, SPI
+build_unflags    = -std=gnu++11 -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
+extra_scripts    = buildroot/share/PlatformIO/scripts/STM32F103VE_longer.py
+build_src_filter = ${common.default_src_filter} +<src/HAL/STM32F1>
+lib_ignore       = Adafruit NeoPixel, LiquidTWI2, SPI
 
 #
 # MKS Robin Mini (STM32F103VET6)
 #
 [env:mks_robin_mini]
-platform      = ststm32
-board         = genericSTM32F103VE
-build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
+platform         = ststm32@<6.2.0
+board            = genericSTM32F103VE
+build_flags      = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
-build_unflags = -std=gnu++11
-extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_mini.py
-src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
-lib_ignore    = Adafruit NeoPixel, SPI
+build_unflags    = -std=gnu++11
+extra_scripts    = buildroot/share/PlatformIO/scripts/mks_robin_mini.py
+build_src_filter = ${common.default_src_filter} +<src/HAL/STM32F1>
+lib_ignore       = Adafruit NeoPixel, SPI
 
 #
 # MKS Robin Nano (STM32F103VET6)
 #
 [env:mks_robin_nano]
-platform      = ststm32
-board         = genericSTM32F103VE
+platform          = ststm32@<6.2.0
+board             = genericSTM32F103VE
 platform_packages = tool-stm32duino
-build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
+build_flags       = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4
-build_unflags = -std=gnu++11
-extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_nano.py
-src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
-lib_deps      = ${common.lib_deps}
+build_unflags     = -std=gnu++11
+extra_scripts     = buildroot/share/PlatformIO/scripts/mks_robin_nano.py
+build_src_filter  = ${common.default_src_filter} +<src/HAL/STM32F1>
+lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
-lib_ignore    = Adafruit NeoPixel, SPI
+lib_ignore        = Adafruit NeoPixel, SPI
 
 #
 # MKS Robin (STM32F103ZET6)
 #
 [env:mks_robin]
-platform      = ststm32
-board         = genericSTM32F103ZE
-build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
+platform         = ststm32@<6.2.0
+board            = genericSTM32F103ZE
+build_flags      = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DSTM32_XL_DENSITY
-build_unflags = -std=gnu++11
-extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin.py
-src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
-lib_deps      = ${common.lib_deps}
+build_unflags    = -std=gnu++11
+extra_scripts    = buildroot/share/PlatformIO/scripts/mks_robin.py
+build_src_filter = ${common.default_src_filter} +<src/HAL/STM32F1>
+lib_deps         = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
-lib_ignore    = Adafruit NeoPixel, SPI
+lib_ignore       = Adafruit NeoPixel, SPI
 
 #
 # MKS Robin Pro (STM32F103ZET6)
 #
 [env:mks_robin_pro]
-platform      = ststm32
-board         = genericSTM32F103ZE
-extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_pro.py
-build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
+platform         = ststm32@<6.2.0
+board            = genericSTM32F103ZE
+extra_scripts    = buildroot/share/PlatformIO/scripts/mks_robin_pro.py
+build_flags      = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -DSTM32_XL_DENSITY
-build_unflags = -std=gnu++11
-src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
-lib_deps      = ${common.lib_deps}
-lib_ignore    = Adafruit NeoPixel, SPI, TMCStepper
+build_unflags    = -std=gnu++11
+build_src_filter = ${common.default_src_filter} +<src/HAL/STM32F1>
+lib_deps         = ${common.lib_deps}
+lib_ignore       = Adafruit NeoPixel, SPI, TMCStepper
 
 #
 # MKS Robin Lite/Lite2 (STM32F103RCT6)
 #
 [env:mks_robin_lite]
-platform      = ststm32
-board         = genericSTM32F103RC
-build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
+platform         = ststm32@<6.2.0
+board            = genericSTM32F103RC
+build_flags      = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
-build_unflags = -std=gnu++11
-extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_lite.py
-src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
-lib_ignore    = Adafruit NeoPixel, SPI
+build_unflags    = -std=gnu++11
+extra_scripts    = buildroot/share/PlatformIO/scripts/mks_robin_lite.py
+build_src_filter = ${common.default_src_filter} +<src/HAL/STM32F1>
+lib_ignore       = Adafruit NeoPixel, SPI
 
 #
 # MKS ROBIN LITE3 (STM32F103RCT6)
 #
 [env:mks_robin_lite3]
-platform      = ststm32
-board         = genericSTM32F103RC
-extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
-build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
+platform         = ststm32@<6.2.0
+board            = genericSTM32F103RC
+extra_scripts    = buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
+build_flags      = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
-build_unflags = -std=gnu++11
-src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
-lib_deps      = ${common.lib_deps}
-lib_ignore    = Adafruit NeoPixel, SPI
+build_unflags    = -std=gnu++11
+build_src_filter = ${common.default_src_filter} +<src/HAL/STM32F1>
+lib_deps         = ${common.lib_deps}
+lib_ignore       = Adafruit NeoPixel, SPI
 
 #
 # JGAurora A5S A1 (STM32F103ZET6)
 #
 [env:jgaurora_a5s_a1]
-platform      = ststm32
-board         = genericSTM32F103ZE
-build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
+platform         = ststm32@<6.2.0
+board            = genericSTM32F103ZE
+build_flags      = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DSTM32F1xx -std=gnu++14 -DSTM32_XL_DENSITY
-build_unflags = -std=gnu++11
-extra_scripts = buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
-src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
-lib_ignore    = Adafruit NeoPixel, SPI
+build_unflags    = -std=gnu++11
+extra_scripts    = buildroot/share/PlatformIO/scripts/jgaurora_a5s_a1_with_bootloader.py
+build_src_filter = ${common.default_src_filter} +<src/HAL/STM32F1>
+lib_ignore       = Adafruit NeoPixel, SPI
 
 #
 # Malyan M200 (STM32F103CB)
 #
 [env:STM32F103CB_malyan]
-platform    = ststm32
-board       = malyanM200
-build_flags = !python Marlin/src/HAL/STM32F1/build_flags.py -DMCU_STM32F103CB -D __STM32F1__=1 -std=c++1y -D MOTHERBOARD="BOARD_MALYAN_M200" -DSERIAL_USB -ffunction-sections -fdata-sections -Wl,--gc-sections
+platform         = ststm32@<6.2.0
+board            = malyanM200
+build_flags      = !python Marlin/src/HAL/STM32F1/build_flags.py -DMCU_STM32F103CB -D __STM32F1__=1 -std=c++1y -D MOTHERBOARD="BOARD_MALYAN_M200" -DSERIAL_USB -ffunction-sections -fdata-sections -Wl,--gc-sections
   -DDEBUG_LEVEL=0 -D__MARLIN_FIRMWARE__
-src_filter  = ${common.default_src_filter} +<src/HAL/STM32F1>
-lib_ignore  = Adafruit NeoPixel, LiquidCrystal, LiquidTWI2, TMCStepper, U8glib-HAL, SPI
+build_src_filter = ${common.default_src_filter} +<src/HAL/STM32F1>
+lib_ignore       = Adafruit NeoPixel, LiquidCrystal, LiquidTWI2, TMCStepper, U8glib-HAL, SPI
 
 #
 # Chitu boards like Tronxy X5s (STM32F103ZET6)
 #
 [env:chitu_f103]
-platform      = ststm32
-board         = genericSTM32F103ZE
-build_flags   = !python Marlin/src/HAL/STM32F1/build_flags.py
+platform         = ststm32@<6.2.0
+board            = genericSTM32F103ZE
+build_flags      = !python Marlin/src/HAL/STM32F1/build_flags.py
   ${common.build_flags} -DSTM32F1xx -std=gnu++14 -DSTM32_XL_DENSITY
-build_unflags = -std=gnu++11 -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG= -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
-extra_scripts = buildroot/share/PlatformIO/scripts/chitu_crypt.py
-src_filter    = ${common.default_src_filter} +<src/HAL/STM32F1>
-lib_ignore    = Adafruit NeoPixel
+build_unflags    = -std=gnu++11 -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG= -DERROR_LED_PORT=GPIOE -DERROR_LED_PIN=6
+extra_scripts    = buildroot/share/PlatformIO/scripts/chitu_crypt.py
+build_src_filter = ${common.default_src_filter} +<src/HAL/STM32F1>
+lib_ignore       = Adafruit NeoPixel
 
 #
 # STM32F401VE
 # 'STEVAL-3DP001V1' STM32F401VE board - https://www.st.com/en/evaluation-tools/steval-3dp001v1.html
 #
 [env:STM32F401VE_STEVAL]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = STEVAL_STM32F401VE
 platform_packages = framework-arduinoststm32@>=3.107,<4
 build_flags       = ${common.build_flags}
@@ -605,13 +605,13 @@ build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
   buildroot/share/PlatformIO/scripts/STEVAL__F401XX.py
 lib_ignore        = Adafruit NeoPixel, TMCStepper, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, SoftwareSerial
-src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/STM32>
 
 #
 # FLYF407ZG
 #
 [env:FLYF407ZG]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = FLYF407ZG
 platform_packages = framework-arduinoststm32@>=3.107,<4
 build_flags       = ${common.build_flags}
@@ -621,14 +621,14 @@ build_flags       = ${common.build_flags}
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 lib_ignore        = Adafruit NeoPixel, TMCStepper, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, SoftwareSerial
-src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/STM32>
 
 
 #
 # FYSETC S6 (STM32F446VET6 ARM Cortex-M4)
 #
 [env:FYSETC_S6]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = fysetc_s6
 platform_packages =
    tool-stm32duino
@@ -639,10 +639,10 @@ build_flags       = ${common.build_flags}
   -DUSBCON -DUSBD_USE_CDC -DHAL_PCD_MODULE_ENABLED -DUSBD_VID=0x0483 '-DUSB_PRODUCT="FYSETC_S6"'
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/fysetc_STM32S6.py
-src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/STM32>
 lib_ignore        = Arduino-L6470
 debug_tool        = stlink
-#upload_protocol   = stlink
+#upload_protocol  = stlink
 upload_protocol   = serial
 
 #
@@ -651,7 +651,7 @@ upload_protocol   = serial
 # Shield - https://github.com/jmz52/Hardware
 #
 [env:STM32F407VE_black]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = blackSTM32F407VET6
 platform_packages = framework-arduinoststm32@>=3.107,<4
 build_flags       = ${common.build_flags}
@@ -661,13 +661,13 @@ build_flags       = ${common.build_flags}
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 lib_ignore        = Adafruit NeoPixel, TMCStepper, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster, SoftwareSerial
-src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/STM32>
 
 #
 # BigTreeTech SKR Pro (STM32F407ZGT6 ARM Cortex-M4)
 #
 [env:BIGTREE_SKR_PRO]
-platform          = ststm32
+platform          = ststm32@<6.2.0
 board             = BigTree_SKR_Pro
 platform_packages = framework-arduinoststm32@>=3.107,<4
 build_flags       = ${common.build_flags}
@@ -677,9 +677,9 @@ build_flags       = ${common.build_flags}
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 lib_ignore        = SoftwareSerial, SoftwareSerialM
-src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
-#upload_protocol   = stlink
-#upload_command    = "$PROJECT_PACKAGES_DIR/tool-stm32duino/stlink/ST-LINK_CLI.exe" -c SWD -P "$BUILD_DIR/firmware.bin" 0x8008000 -Rst -Run
+build_src_filter  = ${common.default_src_filter} +<src/HAL/STM32>
+#upload_protocol  = stlink
+#upload_command   = "$PROJECT_PACKAGES_DIR/tool-stm32duino/stlink/ST-LINK_CLI.exe" -c SWD -P "$BUILD_DIR/firmware.bin" 0x8008000 -Rst -Run
 debug_tool        = stlink
 debug_init_break  =
 
@@ -687,7 +687,7 @@ debug_init_break  =
 # Bigtreetech GTR V1.0 (STM32F407IGT6 ARM Cortex-M4)
 #
 [env:BIGTREE_GTR_V1_0]
-platform          = ststm32@>=5.7.0
+platform          = ststm32@>=5.7.0,<6.2.0
 framework         = arduino
 platform_packages = framework-arduinoststm32@>=3.107,<4
 board             = BigTree_SKR_Pro
@@ -704,7 +704,7 @@ lib_deps          =
   LiquidTWI2=https://github.com/lincomatic/LiquidTWI2/archive/master.zip
   Arduino-L6470=https://github.com/ameyer/Arduino-L6470/archive/0.7.0.zip
 lib_ignore        = SoftwareSerial, SoftwareSerialM
-src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/STM32>
 monitor_speed     = 250000
 
 #
@@ -724,47 +724,47 @@ build_flags       = ${common.build_flags}
 build_unflags     = -std=gnu++11
 extra_scripts     = pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
 lib_ignore        = Adafruit NeoPixel, SailfishLCD, SailfishRGB_LED, SlowSoftI2CMaster
-src_filter        = ${common.default_src_filter} +<src/HAL/STM32>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/STM32>
 
 #
 # Teensy 3.1 / 3.2 (ARM Cortex-M4)
 #
 [env:teensy31]
-platform      = teensy
-board         = teensy31
-lib_deps      = ${common.lib_deps}
-  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-lib_ignore    = Adafruit NeoPixel
-src_filter    = ${common.default_src_filter} +<src/HAL/TEENSY31_32>
+platform         = teensy
+board            = teensy31
+lib_deps         = ${common.lib_deps}
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
+lib_ignore       = Adafruit NeoPixel
+build_src_filter = ${common.default_src_filter} +<src/HAL/TEENSY31_32>
 
 #
 # Teensy 3.5 / 3.6 (ARM Cortex-M4)
 #
 [env:teensy35]
-platform      = teensy
-board         = teensy35
-lib_deps      = ${common.lib_deps}
-  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-lib_ignore    = Adafruit NeoPixel
-src_filter    = ${common.default_src_filter} +<src/HAL/TEENSY35_36>
+platform         = teensy
+board            = teensy35
+lib_deps         = ${common.lib_deps}
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
+lib_ignore       = Adafruit NeoPixel
+build_src_filter = ${common.default_src_filter} +<src/HAL/TEENSY35_36>
 
 #
 # Espressif ESP32
 #
 [env:esp32]
-platform      = espressif32@1.11.2
-board         = esp32dev
-build_flags   = ${common.build_flags} -DCORE_DEBUG_LEVEL=0
-lib_deps      = ${common.lib_deps}
+platform         = espressif32@1.11.2
+board            = esp32dev
+build_flags      = ${common.build_flags} -DCORE_DEBUG_LEVEL=0
+lib_deps         = ${common.lib_deps}
   AsyncTCP=https://github.com/me-no-dev/AsyncTCP/archive/master.zip
   ESPAsyncWebServer=https://github.com/me-no-dev/ESPAsyncWebServer/archive/master.zip
   ESP3DLib=https://github.com/luc-github/ESP3DLib.git
   arduinoWebSockets=https://github.com/Links2004/arduinoWebSockets.git
   ESP32SSDP=https://github.com/luc-github/ESP32SSDP.git
-lib_ignore    = LiquidCrystal, LiquidTWI2, SailfishLCD, SailfishRGB_LED, ESPAsyncTCP
-src_filter    = ${common.default_src_filter} +<src/HAL/ESP32>
-upload_speed  = 115200
-#upload_port   = marlinesp.local
+lib_ignore       = LiquidCrystal, LiquidTWI2, SailfishLCD, SailfishRGB_LED, ESPAsyncTCP
+build_src_filter = ${common.default_src_filter} +<src/HAL/ESP32>
+upload_speed     = 115200
+#upload_port     = marlinesp.local
 #board_build.flash_mode = qio
 
 #
@@ -772,36 +772,36 @@ upload_speed  = 115200
 # No supported Arduino libraries, base Marlin only
 #
 [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
-src_build_flags = -Wall -IMarlin/src/HAL/LINUX/include
-build_unflags   = -Wall
-lib_ldf_mode    = off
-lib_deps        =
-src_filter      = ${common.default_src_filter} +<src/HAL/LINUX>
+platform         = native
+framework        =
+build_flags      = -D__PLAT_LINUX__ -std=gnu++17 -ggdb -g -lrt -lpthread -D__MARLIN_FIRMWARE__ -Wno-expansion-to-defined
+src_build_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>
 
 #
 # Adafruit Grand Central M4 (Atmel SAMD51P20A ARM Cortex-M4)
 #
 [env:SAMD51_grandcentral_m4]
-platform       = atmelsam
-board          = adafruit_grandcentral_m4
-build_flags    = ${common.build_flags} -std=gnu++17 -Wno-register
-build_unflags  = -std=gnu++11
-src_filter     = ${common.default_src_filter} +<src/HAL/SAMD51>
-lib_deps       = ${common.lib_deps}
+platform         = atmelsam
+board            = adafruit_grandcentral_m4
+build_flags      = ${common.build_flags} -std=gnu++17 -Wno-register
+build_unflags    = -std=gnu++11
+build_src_filter = ${common.default_src_filter} +<src/HAL/SAMD51>
+lib_deps         = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
   Adafruit_SPIFlash=https://github.com/adafruit/Adafruit_SPIFlash/archive/master.zip
-debug_tool     = jlink
+debug_tool       = jlink
 
 #
 # RUMBA32
 #
 [env:rumba32_f446ve]
-platform      = ststm32
-board         = rumba32_f446ve
-build_flags   = ${common.build_flags}
+platform         = ststm32@<6.2.0
+board            = rumba32_f446ve
+build_flags      = ${common.build_flags}
   -DSTM32F4xx
   -DARDUINO_RUMBA32_F446VE
   -DARDUINO_ARCH_STM32
@@ -816,18 +816,18 @@ build_flags   = ${common.build_flags}
   -DDISABLE_GENERIC_SERIALUSB
   -DHAL_UART_MODULE_ENABLED
   -Os
-lib_ignore    = Adafruit NeoPixel
-src_filter    = ${common.default_src_filter} +<src/HAL/STM32>
-monitor_speed = 500000
-upload_protocol = dfu
+lib_ignore       = Adafruit NeoPixel
+build_src_filter = ${common.default_src_filter} +<src/HAL/STM32>
+monitor_speed    = 500000
+upload_protocol  = dfu
 
 #
 # MKS RUMBA32 (adds TMC2208/2209 UART interface and AUX-1)
 #
 [env:rumba32_mks]
-platform      = ststm32
-board         = rumba32_f446ve
-build_flags   = ${common.build_flags}
+platform         = ststm32@<6.2.0
+board            = rumba32_f446ve
+build_flags      = ${common.build_flags}
  -DSTM32F4xx -DARDUINO_RUMBA32_F446VE -DARDUINO_ARCH_STM32 "-DBOARD_NAME=\"RUMBA32_F446VE\""
  -DSTM32F446xx -DUSBCON -DUSBD_VID=0x8000
   "-DUSB_MANUFACTURER=\"Unknown\""
@@ -837,17 +837,17 @@ build_flags   = ${common.build_flags}
   -DDISABLE_GENERIC_SERIALUSB
   -DHAL_UART_MODULE_ENABLED
   -Os
-lib_ignore    = Adafruit NeoPixel
-src_filter    = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/STM32_F4_F7> -<src/HAL/STM32_F4_F7/STM32F7>
-upload_protocol = dfu
+lib_ignore       = Adafruit NeoPixel
+build_src_filter = ${common.default_src_filter} +<src/HAL/STM32> +<src/HAL/STM32_F4_F7> -<src/HAL/STM32_F4_F7/STM32F7>
+upload_protocol  = dfu
 
 #
 # Just print the dependency tree
 #
 [env:include_tree]
-platform    = atmelavr
-board       = megaatmega2560
-build_flags = -c -H -std=gnu++11 -Wall -Os -D__MARLIN_FIRMWARE__
-lib_deps    = ${common.lib_deps}
-  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
-src_filter  = +<src/Marlin.cpp>
+platform         = atmelavr
+board            = megaatmega2560
+build_flags      = -c -H -std=gnu++11 -Wall -Os -D__MARLIN_FIRMWARE__
+lib_deps         = ${common.lib_deps}
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
+build_src_filter = +<src/Marlin.cpp>