🔖 Marlin 2.0.3.1

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,43 @@
+---
+name: Bug report
+about: Report a bug in Marlin
+title: "[BUG] (short description)"
+labels: ''
+assignees: ''
+
+---
+
+<!--
+
+Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md
+
+Do you want to ask a question? Are you looking for support? Please don't post here. Instead please use one of the support links at https://github.com/MarlinFirmware/Marlin/issues/new/choose
+
+Before filing an issue be sure to test the "bugfix" branches to see whether the issue has been resolved.
+
+-->
+
+### Bug Description
+
+<!-- Description of the bug -->
+
+### My Configurations
+
+**Required:** Please include a ZIP file containing your `Configuration.h` and `Configuration_adv.h` files.
+
+### Steps to Reproduce
+
+<!-- Please describe the steps needed to reproduce the issue -->
+
+1. [First Step]
+2. [Second Step]
+3. [and so on...]
+
+**Expected behavior:** [What you expect to happen]
+
+**Actual behavior:** [What actually happens]
+
+#### Additional Information
+
+* Provide pictures or links to videos that clearly demonstrate the issue.
+* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,17 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Marlin Documentation
+    url: http://marlinfw.org/
+    about: Lots of documentation on installing and using Marlin.
+  - name: MarlinFirmware Facebook group
+    url: https://www.facebook.com/groups/1049718498464482
+    about: Please ask and answer questions here.
+  - name: Marlin on Discord
+    url: https://discord.gg/n5NJ59y
+    about: Join the Discord server for support and discussion.
+  - name: Marlin Discussion Forum
+    url: http://forums.reprap.org/list.php?415
+    about: A searchable web forum hosted by RepRap dot org.
+  - name: Marlin Videos on YouTube
+    url: https://www.youtube.com/results?search_query=marlin+firmware
+    about: Tutorials and more from Marlin users all around the world. Great for new users!

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,35 @@
+---
+name: Feature request
+about: Request a Feature
+title: "[FR] (feature request title)"
+labels: ''
+assignees: ''
+
+---
+
+<!--
+
+Have you read Marlin's Code of Conduct? By filing an Issue, you are expected to comply with it, including treating everyone with respect: https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md
+
+Do you want to ask a question? Are you looking for support? Please don't post here. Instead please use one of the support links at https://github.com/MarlinFirmware/Marlin/issues/new/choose
+
+Before filing an issue be sure to test the "bugfix" branches to see whether the issue has been resolved.
+
+-->
+
+### Description
+
+<!-- Description of the requested feature -->
+
+### Feature Workflow
+
+<!-- Please describe the feature's behavior, user interaction, etc. -->
+
+1. [First Action]
+2. [Second Action]
+3. [and so on...]
+
+#### Additional Information
+
+* Provide pictures or links that demonstrate a similar feature or concept.
+* See [How Can I Contribute](#how-can-i-contribute) for additional guidelines.

.github/labeler.yml

@@ -0,0 +1,18 @@
+# Add '@domain/core' label to any change within the 'core' package
+enhancement:
+  - .github
+
+# Add 'test' label to any change to *.spec.js files within the source dir
+"C: Motion":
+  - src/module/motion.*
+  - src/module/planner.*
+  - src/module/stepper.*
+
+"C: G-code Parser":
+  - src/gcode/**
+
+"PR: Configurations":
+  - config/examples/**
+
+"T: 32-Bit & HAL":
+  - src/HAL/**

.github/workflows/bump-date.yml

@@ -0,0 +1,34 @@
+#
+# bump-date.yml
+# Bump the distribution date once per day
+#
+
+name: Bump Distribution Date
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  bump_date:
+
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - name: Check out bugfix-2.0.x
+      uses: actions/checkout@v2
+      with:
+        ref: bugfix-2.0.x
+
+    - 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}" && \
+        git config user.email "${GITHUB_ACTOR}@users.noreply.github.com" && \
+        git add . && \
+        git commit -m "[cron] Bump distribution date ($DIST)" && \
+        git push

.github/workflows/check-pr.yml

@@ -0,0 +1,31 @@
+#
+# check-pr.yml
+# Add a comment to the PR if it's directed to a release branch
+#
+
+name: Check PR
+
+on:
+  pull_request:
+    branches:
+    - 1.0.x
+    - 1.1.x
+    - 2.0.x
+
+jobs:
+  check_pr:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Comment on PR
+      uses: unsplash/comment-on-pr@master
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        msg: "<p>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.</p> \
+              <p>It may help to set your fork's default branch to `bugfix-2.0.x`.</p> \
+              <p>See <a href='http://marlinfw.org/docs/development/getting_started_pull_requests.html' target='_blank'>this page</a> for full instructions.</p>"

.github/workflows/label-pr.yml

@@ -0,0 +1,23 @@
+#
+# label-pr.yml
+# Automatically close the PR if it's directed to a release branch
+#
+
+name: Apply Labels
+
+on:
+  pull_request:
+    branches:
+    - bugfix-1.1.x
+    - bugfix-2.0.x
+    - dev-2.1.x
+
+jobs:
+  apply_labels:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/labeler@v2
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"

Marlin/Configuration_adv.h

@@ -1874,7 +1874,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 "bugfix-2.0.x"
+//#define SHORT_BUILD_VERSION "2.0.3.1"
 
 /**
  * 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 "2019-07-10"
+//#define STRING_DISTRIBUTION_DATE "2020-01-31"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.

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 "bugfix-2.0.x"
+  #define SHORT_BUILD_VERSION "2.0.3.1"
 #endif
 
 /**

README.md

@@ -8,103 +8,61 @@
 <img align="right" width=175 src="buildroot/share/pixmaps/logo/marlin-250.png" />
 
 Additional documentation can be found at the [Marlin Home Page](http://marlinfw.org/).
-Please test this firmware and let us know if it misbehaves in any way. Volunteers are standing by!
+Please let us know if Marlin misbehaves in any way. Volunteers are standing by!
 
-## Marlin 2.0 Bugfix Branch
+## Marlin 2.0
-
-__Not for production use. Use with caution!__
 
 Marlin 2.0 takes this popular RepRap firmware to the next level by adding support for much faster 32-bit and ARM-based boards while improving support for 8-bit AVR boards. Read about Marlin's decision to use a "Hardware Abstraction Layer" below.
 
-This branch is for patches to the latest 2.0.x release version. Periodically this branch will form the basis for the next minor 2.0.x release.
-
 Download earlier versions of Marlin on the [Releases page](https://github.com/MarlinFirmware/Marlin/releases).
 
 ## Building Marlin 2.0
 
-To build Marlin 2.0 you'll need [Arduino IDE 1.8.8 or newer](https://www.arduino.cc/en/main/software) or [PlatformIO](http://docs.platformio.org/en/latest/ide.html#platformio-ide). We've posted detailed instructions on [Building Marlin with Arduino](http://marlinfw.org/docs/basics/install_arduino.html) and [Building Marlin with PlatformIO for ReArm](http://marlinfw.org/docs/basics/install_rearm.html) (which applies well to other 32-bit boards).
+To build Marlin 2.0 you'll need [Arduino IDE 1.8.8 or newer](https://www.arduino.cc/en/main/software) or [PlatformIO](http://docs.platformio.org/en/latest/ide.html#platformio-ide). Detailed build and install instructions are posted at:
 
-## Hardware Abstraction Layer (HAL)
+  - [Installing Marlin (Arduino)](http://marlinfw.org/docs/basics/install_arduino.html)
+  - [Installing Marlin (VSCode)](http://marlinfw.org/docs/basics/install_platformio_vscode.html).
 
-Marlin 2.0 introduces a layer of abstraction so that all the existing high-level code can be built for 32-bit platforms while still retaining full 8-bit AVR compatibility. Retaining AVR compatibility and a single code-base is important to us, because we want to make sure that features and patches get as much testing and attention as possible, and that all platforms always benefit from the latest improvements.
+### Supported Platforms
 
-### Current HALs
+  Platform|MCU|Example Boards
+  --------|---|-------
+  [Arduino AVR](https://www.arduino.cc/)|ATmega|RAMPS, Melzi, RAMBo
+  [Teensy++ 2.0](http://www.microchip.com/wwwproducts/en/AT90USB1286)|AT90USB1286|Printrboard
+  [Arduino Due](https://www.arduino.cc/en/Guide/ArduinoDue)|SAM3X8E|RAMPS-FD, RADDS, RAMPS4DUE
+  [LPC1768](http://www.nxp.com/products/microcontrollers-and-processors/arm-based-processors-and-mcus/lpc-cortex-m-mcus/lpc1700-cortex-m3/512kb-flash-64kb-sram-ethernet-usb-lqfp100-package:LPC1768FBD100)|ARM® Cortex-M3|MKS SBASE, Re-ARM, Selena Compact
+  [LPC1769](https://www.nxp.com/products/processors-and-microcontrollers/arm-microcontrollers/general-purpose-mcus/lpc1700-cortex-m3/512kb-flash-64kb-sram-ethernet-usb-lqfp100-package:LPC1769FBD100)|ARM® Cortex-M3|Smoothieboard, Azteeg X5 mini, TH3D EZBoard
+  [STM32F103](https://www.st.com/en/microcontrollers-microprocessors/stm32f103.html)|ARM® Cortex-M3|Malyan M200, GTM32 Pro, MKS Robin, BTT SKR Mini
+  [STM32F401](https://www.st.com/en/microcontrollers-microprocessors/stm32f401.html)|ARM® Cortex-M4|ARMED, Rumba32, SKR Pro, Lerdge, FYSETC S6
+  [STM32F7x6](https://www.st.com/en/microcontrollers-microprocessors/stm32f7x6.html)|ARM® Cortex-M7|The Borg, RemRam V1
+  [SAMD51P20A](https://www.adafruit.com/product/4064)|ARM® Cortex-M4|Adafruit Grand Central M4
+  [Teensy 3.5](https://www.pjrc.com/store/teensy35.html)|ARM® Cortex-M4|
+  [Teensy 3.6](https://www.pjrc.com/store/teensy36.html)|ARM® Cortex-M4|
 
-  #### AVR (8-bit)
+## Submitting Changes
 
-  board|processor|speed|flash|sram|logic|fpu
+- 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.
-  [Arduino AVR](https://www.arduino.cc/)|ATmega, ATTiny, etc.|16-20MHz|64-256k|2-16k|5V|no
-
-  #### DUE
-
-  boards|processor|speed|flash|sram|logic|fpu
-  ----|---------|-----|-----|----|-----|---
-  [Arduino Due](https://www.arduino.cc/en/Guide/ArduinoDue), [RAMPS-FD](http://www.reprap.org/wiki/RAMPS-FD), etc.|[SAM3X8E ARM-Cortex M3](http://www.microchip.com/wwwproducts/en/ATsam3x8e)|84MHz|512k|64+32k|3.3V|no
-
-  #### ESP32
-
-  board|processor|speed|flash|sram|logic|fpu
-  ----|---------|-----|-----|----|-----|---
-  [ESP32](https://www.espressif.com/en/products/hardware/esp32/overview)|Tensilica Xtensa LX6|240MHz|---|---|3.3V|---
-
-  #### LPC1768 / LPC1769
-
-  boards|processor|speed|flash|sram|logic|fpu
-  ----|---------|-----|-----|----|-----|---
-  [Re-ARM](https://www.kickstarter.com/projects/1245051645/re-arm-for-ramps-simple-32-bit-upgrade)|[LPC1768 ARM-Cortex M3](http://www.nxp.com/products/microcontrollers-and-processors/arm-based-processors-and-mcus/lpc-cortex-m-mcus/lpc1700-cortex-m3/512kb-flash-64kb-sram-ethernet-usb-lqfp100-package:LPC1768FBD100)|100MHz|512k|32+16+16k|3.3-5V|no
-  [MKS SBASE](http://forums.reprap.org/read.php?13,499322)|LPC1768 ARM-Cortex M3|100MHz|512k|32+16+16k|3.3-5V|no
-  [Selena Compact](https://github.com/Ales2-k/Selena)|LPC1768 ARM-Cortex M3|100MHz|512k|32+16+16k|3.3-5V|no
-  [Azteeg X5 GT](https://www.panucatt.com/azteeg_X5_GT_reprap_3d_printer_controller_p/ax5gt.htm)|LPC1769 ARM-Cortex M3|120MHz|512k|32+16+16k|3.3-5V|no
-  [Smoothieboard](http://reprap.org/wiki/Smoothieboard)|LPC1769 ARM-Cortex M3|120MHz|512k|64k|3.3-5V|no
-
-  #### SAMD51
-
-  boards|processor|speed|flash|sram|logic|fpu
-  ----|---------|-----|-----|----|-----|---
-  [Adafruit Grand Central M4](https://www.adafruit.com/product/4064)|[SAMD51P20A ARM-Cortex M4](https://www.microchip.com/wwwproducts/en/ATSAMD51P20A)|120MHz|1M|256k|3.3V|yes
-
-  #### STM32F1
-
-  boards|processor|speed|flash|sram|logic|fpu
-  ----|---------|-----|-----|----|-----|---
-  [Arduino STM32](https://github.com/rogerclarkmelbourne/Arduino_STM32)|[STM32F1](https://www.st.com/en/microcontrollers-microprocessors/stm32f103.html) ARM-Cortex M3|72MHz|256-512k|48-64k|3.3V|no
-  [STEVAL-3DP001V1](http://www.st.com/en/evaluation-tools/steval-3dp001v1.html)|[STM32F401VE Arm-Cortex M4](http://www.st.com/en/microcontrollers/stm32f401ve.html)|84MHz|512k|64+32k|3.3-5V|yes
-
-  #### Teensy++ 2.0
-
-  boards|processor|speed|flash|sram|logic|fpu
-  ----|---------|-----|-----|----|-----|---
-  [Teensy++ 2.0](http://www.microchip.com/wwwproducts/en/AT90USB1286)|[AT90USB1286](http://www.microchip.com/wwwproducts/en/AT90USB1286)|16MHz|128k|8k|5V|no
-
-  #### Teensy 3.1 / 3.2
-
-  boards|processor|speed|flash|sram|logic|fpu
-  ----|---------|-----|-----|----|-----|---
-  [Teensy 3.2](https://www.pjrc.com/store/teensy32.html)|[MK20DX256VLH7](https://www.mouser.com/ProductDetail/NXP-Freescale/MK20DX256VLH7) ARM-Cortex M4|72MHz|256k|32k|3.3V-5V|yes
-
-  #### Teensy 3.5 / 3.6
-
-  boards|processor|speed|flash|sram|logic|fpu
-  ----|---------|-----|-----|----|-----|---
-  [Teensy 3.5](https://www.pjrc.com/store/teensy35.html)|[MK64FX512VMD12](https://www.mouser.com/ProductDetail/NXP-Freescale/MK64FX512VMD12) ARM-Cortex M4|120MHz|512k|192k|3.3-5V|yes
-  [Teensy 3.6](https://www.pjrc.com/store/teensy36.html)|[MK66FX1M0VMD18](https://www.mouser.com/ProductDetail/NXP-Freescale/MK66FX1M0VMD18) ARM-Cortex M4|180MHz|1M|256k|3.3V|yes
-
-## Submitting Patches
-
-Proposed patches should be submitted as a Pull Request against the ([bugfix-2.0.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.0.x)) branch.
-
-- This branch is for fixing bugs and integrating any new features for the duration of the Marlin 2.0.x life-cycle.
 - 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).
 
-### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)
+## Marlin Support
+
+For best results getting help with configuration and troubleshooting, please use the following resources:
+
+- [Marlin Documentation](http://marlinfw.org) - Official Marlin documentation
+- [Marlin Discord](https://discord.gg/n5NJ59y) - Discuss issues with Marlin users and developers
+- Facebook Group ["Marlin Firmware"](https://www.facebook.com/groups/1049718498464482/)
+- RepRap.org [Marlin Forum](http://forums.reprap.org/list.php?415)
+- [Tom's 3D Forums](https://discuss.toms3d.org/)
+- Facebook Group ["Marlin Firmware for 3D Printers"](https://www.facebook.com/groups/3Dtechtalk/)
+- [Marlin Configuration](https://www.youtube.com/results?search_query=marlin+configuration) on YouTube
 
 ## Credits
 
 The current Marlin dev team consists of:
 
- - Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - USA &nbsp; [Donate](http://www.thinkyhead.com/donate-to-marlin) / Flattr: [![Flattr Scott](http://api.flattr.com/button/flattr-badge-small.png)](https://flattr.com/submit/auto?user_id=thinkyhead&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)
+ - Scott Lahteine [[@thinkyhead](https://github.com/thinkyhead)] - USA &nbsp; [Donate](http://www.thinkyhead.com/donate-to-marlin) / Flattr: [![Flattr Scott](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=thinkyhead&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software)
  - Roxanne Neufeld [[@Roxy-3D](https://github.com/Roxy-3D)] - USA
  - Chris Pepper [[@p3p](https://github.com/p3p)] - UK
  - Bob Kuhn [[@Bob-the-Kuhn](https://github.com/Bob-the-Kuhn)] - USA

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))
+#import marlin
-#env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08010000"))
+#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']:
+marlin.relocate_firmware("0x08010000")
-    if define[0] == "VECT_TAB_ADDR":
-        env['CPPDEFINES'].remove(define)
-env['CPPDEFINES'].append(("VECT_TAB_ADDR", "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 os,struct,marlin
-import struct
 Import("env")
 
 # Relocate firmware from 0x08000000 to 0x08008800
-for define in env['CPPDEFINES']:
+marlin.relocate_firmware("0x08008800")
-    if define[0] == "VECT_TAB_ADDR":
-        env['CPPDEFINES'].remove(define)
-env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x8008800"))
 
 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))
+#import marlin
-#env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08010000"))
+#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"))
+marlin.relocate_firmware("0x0800A000")
-#alternatively, for STSTM <=5.1.0 use line below
-#env['CPPDEFINES'].remove(("VECT_TAB_ADDR", 134217728))
-env['CPPDEFINES'].append(("VECT_TAB_ADDR", "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']:
+marlin.relocate_firmware("0x08007000")
-    if define[0] == "VECT_TAB_ADDR":
-        env['CPPDEFINES'].remove(define)
-env['CPPDEFINES'].append(("VECT_TAB_ADDR", "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']:
+marlin.relocate_firmware("0x08005000")
-    if define[0] == "VECT_TAB_ADDR":
-        env['CPPDEFINES'].remove(define)
-env['CPPDEFINES'].append(("VECT_TAB_ADDR", "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']:
+marlin.relocate_firmware("0x08005000")
-    if define[0] == "VECT_TAB_ADDR":
-        env['CPPDEFINES'].remove(define)
-env['CPPDEFINES'].append(("VECT_TAB_ADDR", "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']:
+marlin.relocate_firmware("0x08007000")
-    if define[0] == "VECT_TAB_ADDR":
-        env['CPPDEFINES'].remove(define)
-env['CPPDEFINES'].append(("VECT_TAB_ADDR", "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']:
+marlin.relocate_firmware("0x08007000")
-    if define[0] == "VECT_TAB_ADDR":
-        env['CPPDEFINES'].remove(define)
-env['CPPDEFINES'].append(("VECT_TAB_ADDR", "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']:
+marlin.relocate_firmware("0x08007000")
-    if define[0] == "VECT_TAB_ADDR":
-        env['CPPDEFINES'].remove(define)
-env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08007000"))
 
 custom_ld_script = os.path.abspath("buildroot/share/PlatformIO/ldscripts/mks_robin_pro.ld")
 for i, flag in enumerate(env["LINKFLAGS"]):

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
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/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
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/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
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/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
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/HAL_AVR>
 
 #
 # FYSETC F6 V1.4
@@ -106,8 +106,8 @@ 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
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/HAL_AVR>
 
 #
 # Sanguinololu (ATmega644p)
@@ -116,8 +116,8 @@ src_filter        = ${common.default_src_filter} +<src/HAL/HAL_AVR>
 platform         = atmelavr
 board            = sanguino_atmega644p
 lib_deps         = ${common.lib_deps}
-  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_AVR>
 
 #
 # Sanguinololu (ATmega1284p)
@@ -126,8 +126,8 @@ src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
 platform         = atmelavr
 board            = sanguino_atmega1284p
 lib_deps         = ${common.lib_deps}
-  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_AVR>
 
 #
 # Melzi and clones (ATmega1284p)
@@ -136,8 +136,8 @@ src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
 platform         = atmelavr
 board            = sanguino_atmega1284p
 lib_deps         = ${common.lib_deps}
-  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_AVR>
 build_flags      = ${common.build_flags}
 lib_ignore       = TMCStepper
 upload_speed     = 57600
@@ -149,8 +149,8 @@ upload_speed  = 57600
 platform         = atmelavr
 board            = sanguino_atmega1284p
 lib_deps         = ${common.lib_deps}
-  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_AVR>
 build_flags      = ${common.build_flags}
 lib_ignore       = TMCStepper
 upload_speed     = 115200
@@ -166,9 +166,9 @@ upload_speed  = 115200
 platform         = teensy
 board            = at90usb1286
 lib_deps         = ${common.lib_deps}
-  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
 lib_ignore       = TMCStepper
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_AVR>
 
 #
 # AT90USB1286 boards using DFU bootloader
@@ -181,7 +181,7 @@ platform      = teensy
 board            = at90usb1286
 lib_deps         = ${common.lib_deps}
 lib_ignore       = TMCStepper
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_AVR>
 
 #
 # Due (Atmel SAM3X8E ARM Cortex-M3)
@@ -192,18 +192,18 @@ src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
 [env:DUE]
 platform         = atmelsam
 board            = due
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_DUE>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_DUE>
 
 [env:DUE_USB]
 platform         = atmelsam
 board            = dueUSB
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_DUE>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_DUE>
 
 [env:DUE_debug]
 # Used when WATCHDOG_RESET_MANUAL is enabled
 platform         = atmelsam
 board            = due
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_DUE>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_DUE>
 build_flags      = ${common.build_flags}
   -funwind-tables
   -mpoke-function-name
@@ -221,7 +221,7 @@ build_flags       = -DU8G_HAL_LINKS -IMarlin/src/HAL/HAL_LPC1768/include -IMarli
 lib_ldf_mode      = off
 lib_compat_mode   = strict
 extra_scripts     = Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_LPC1768>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/HAL_LPC1768>
 lib_deps          = Servo
   LiquidCrystal
   U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
@@ -239,7 +239,7 @@ build_flags       = -DU8G_HAL_LINKS -IMarlin/src/HAL/HAL_LPC1768/include -IMarli
 lib_ldf_mode      = off
 lib_compat_mode   = strict
 extra_scripts     = Marlin/src/HAL/HAL_LPC1768/upload_extra_script.py
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_LPC1768>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/HAL_LPC1768>
 lib_deps          = Servo
   LiquidCrystal
   U8glib-HAL=https://github.com/MarlinFirmware/U8glib-HAL/archive/bugfix.zip
@@ -257,7 +257,7 @@ platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
 build_unflags     = -std=gnu++11
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -275,7 +275,7 @@ build_flags       = !python Marlin/src/HAL/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/HAL_STM32F1>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -300,7 +300,7 @@ build_flags       = !python Marlin/src/HAL/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/HAL_STM32F1>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -314,7 +314,7 @@ build_flags       = !python Marlin/src/HAL/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/HAL_STM32F1>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -323,13 +323,13 @@ monitor_speed     = 115200
 [env:STM32F103RC_bigtree_512K]
 platform          = ststm32
 board             = genericSTM32F103RC
-board_upload.maximum_size=524288
+board_upload.maximum_size = 524288
 platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/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/HAL_STM32F1>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -338,13 +338,13 @@ monitor_speed     = 115200
 [env:STM32F103RC_bigtree_512K_USB]
 platform          = ststm32
 board             = genericSTM32F103RC
-board_upload.maximum_size=524288
+board_upload.maximum_size = 524288
 platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/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/HAL_STM32F1>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -360,7 +360,7 @@ platform_packages = tool-stm32duino
 build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
 build_unflags     = -std=gnu++11
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -378,7 +378,7 @@ build_flags       = !python Marlin/src/HAL/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/HAL_STM32F1>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -394,7 +394,7 @@ build_flags       = !python Marlin/src/HAL/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/HAL_STM32F1>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_deps          = ${common.lib_deps}
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore        = Adafruit NeoPixel, SPI
@@ -410,7 +410,7 @@ 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/HAL_STM32_F4_F7> -<src/HAL/HAL_STM32_F4_F7/STM32F7>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32_F4_F7> -<src/HAL/HAL_STM32_F4_F7/STM32F7>
 
 #
 # STM32F7 with STM32GENERIC
@@ -420,7 +420,7 @@ 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/HAL_STM32_F4_F7> -<src/HAL/HAL_STM32_F4_F7/STM32F4>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32_F4_F7> -<src/HAL/HAL_STM32_F4_F7/STM32F4>
 
 #
 # ARMED (STM32)
@@ -433,7 +433,7 @@ build_flags   = ${common.build_flags}
   -O2 -ffreestanding -fsigned-char -fno-move-loop-invariants -fno-strict-aliasing -std=gnu11 -std=gnu++11
   -IMarlin/src/HAL/HAL_STM32
 lib_ignore       = Adafruit NeoPixel, SoftwareSerial
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32>
 
 #
 # Geeetech GTM32 (STM32F103VET6)
@@ -446,7 +446,7 @@ build_flags     = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
   -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/HAL_STM32F1>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_ignore       = Adafruit NeoPixel, SPI
 upload_protocol  = serial
 
@@ -461,7 +461,7 @@ build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
   -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/HAL_STM32F1>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_ignore       = Adafruit NeoPixel, LiquidTWI2, SPI
 
 #
@@ -474,7 +474,7 @@ build_flags   = !python Marlin/src/HAL/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/HAL_STM32F1>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_ignore       = Adafruit NeoPixel, SPI
 
 #
@@ -488,7 +488,7 @@ build_flags   = !python Marlin/src/HAL/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/HAL_STM32F1>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_deps         =
   SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
 lib_ignore       = Adafruit NeoPixel, SPI
@@ -503,7 +503,7 @@ build_flags   = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14 -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/HAL_STM32F1>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_ignore       = Adafruit NeoPixel, SPI
 
 #
@@ -516,7 +516,7 @@ extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_pro.py
 build_flags      = !python Marlin/src/HAL/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/HAL_STM32F1>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_deps         = ${common.lib_deps}
 lib_ignore       = Adafruit NeoPixel, SPI, TMCStepper
 
@@ -530,7 +530,7 @@ build_flags   = !python Marlin/src/HAL/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/HAL_STM32F1>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_ignore       = Adafruit NeoPixel, SPI
 
 #
@@ -543,7 +543,7 @@ extra_scripts = buildroot/share/PlatformIO/scripts/mks_robin_lite3.py
 build_flags      = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
   ${common.build_flags} -std=gnu++14
 build_unflags    = -std=gnu++11
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_deps         = ${common.lib_deps}
 lib_ignore       = Adafruit NeoPixel, SPI
 
@@ -557,7 +557,7 @@ build_flags   = !python Marlin/src/HAL/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/HAL_STM32F1>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_ignore       = Adafruit NeoPixel, SPI
 
 #
@@ -568,7 +568,7 @@ platform    = ststm32
 board            = malyanM200
 build_flags      = !python Marlin/src/HAL/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/HAL_STM32F1>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_ignore       = Adafruit NeoPixel, LiquidCrystal, LiquidTWI2, TMCStepper, U8glib-HAL, SPI
 
 #
@@ -581,7 +581,7 @@ build_flags   = !python Marlin/src/HAL/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/HAL_STM32F1>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
 lib_ignore       = Adafruit NeoPixel
 
 #
@@ -601,7 +601,7 @@ 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/HAL_STM32>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/HAL_STM32>
 
 #
 # FLYF407ZG
@@ -617,7 +617,7 @@ 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/HAL_STM32>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/HAL_STM32>
 
 
 #
@@ -633,7 +633,7 @@ 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/HAL_STM32>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/HAL_STM32>
 lib_ignore        = Arduino-L6470
 debug_tool        = stlink
 #upload_protocol  = stlink
@@ -655,7 +655,7 @@ 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/HAL_STM32>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/HAL_STM32>
 
 #
 # BigTreeTech SKR Pro (STM32F407ZGT6 ARM Cortex-M4)
@@ -671,7 +671,7 @@ 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/HAL_STM32>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/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
@@ -705,7 +705,7 @@ lib_deps          =
   LiquidTWI2=https://github.com/lincomatic/LiquidTWI2/archive/master.zip
   Arduino-L6470=https://github.com/ameyer/Arduino-L6470/archive/dev.zip
 lib_ignore        = SoftwareSerial, SoftwareSerialM
-src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/HAL_STM32>
 monitor_speed     = 250000
 
 #
@@ -725,7 +725,7 @@ 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/HAL_STM32>
+build_src_filter  = ${common.default_src_filter} +<src/HAL/HAL_STM32>
 
 #
 # Teensy 3.1 / 3.2 (ARM Cortex-M4)
@@ -734,9 +734,9 @@ src_filter        = ${common.default_src_filter} +<src/HAL/HAL_STM32>
 platform         = teensy
 board            = teensy31
 lib_deps         = ${common.lib_deps}
-  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
 lib_ignore       = Adafruit NeoPixel
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_TEENSY31_32>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_TEENSY31_32>
 
 #
 # Teensy 3.5 / 3.6 (ARM Cortex-M4)
@@ -745,9 +745,9 @@ src_filter    = ${common.default_src_filter} +<src/HAL/HAL_TEENSY31_32>
 platform         = teensy
 board            = teensy35
 lib_deps         = ${common.lib_deps}
-  TMC26XStepper=https://github.com/trinamic/TMC26XStepper/archive/master.zip
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
 lib_ignore       = Adafruit NeoPixel
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_TEENSY35_36>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_TEENSY35_36>
 
 #
 # Espressif ESP32
@@ -763,7 +763,7 @@ lib_deps      = ${common.lib_deps}
   arduinoWebSockets=https://github.com/Links2004/arduinoWebSockets.git
   ESP32SSDP=https://github.com/luc-github/ESP32SSDP.git
 lib_ignore       = LiquidCrystal, LiquidTWI2, SailfishLCD, SailfishRGB_LED
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_ESP32>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_ESP32>
 upload_speed     = 115200
 #upload_port     = marlinesp.local
 #board_build.flash_mode = qio
@@ -781,7 +781,7 @@ build_unflags   = -Wall
 lib_ldf_mode     = off
 lib_deps         =
 extra_scripts    =
-src_filter      = ${common.default_src_filter} +<src/HAL/HAL_LINUX>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_LINUX>
 
 #
 # Adafruit Grand Central M4 (Atmel SAMD51P20A ARM Cortex-M4)
@@ -792,7 +792,7 @@ board         = adafruit_grandcentral_m4
 build_flags      = ${common.build_flags} -std=gnu++17
 extra_scripts    = ${common.extra_scripts}
 build_unflags    = -std=gnu++11
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_SAMD51>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_SAMD51>
 debug_tool       = jlink
 
 #
@@ -817,7 +817,7 @@ build_flags   = ${common.build_flags}
   -DHAL_UART_MODULE_ENABLED
   -Os
 lib_ignore       = Adafruit NeoPixel
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32>
 monitor_speed    = 500000
 upload_protocol  = dfu
 
@@ -838,7 +838,7 @@ build_flags   = ${common.build_flags}
   -DHAL_UART_MODULE_ENABLED
   -Os
 lib_ignore       = Adafruit NeoPixel
-src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32> +<src/HAL/HAL_STM32_F4_F7> -<src/HAL/HAL_STM32_F4_F7/STM32F7>
+build_src_filter = ${common.default_src_filter} +<src/HAL/HAL_STM32> +<src/HAL/HAL_STM32_F4_F7> -<src/HAL/HAL_STM32_F4_F7/STM32F7>
 upload_protocol  = dfu
 
 #
@@ -849,5 +849,5 @@ 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
+  TMC26XStepper=https://github.com/MarlinFirmware/TMC26XStepper/archive/master.zip
-src_filter  = +<src/Marlin.cpp>
+build_src_filter = +<src/Marlin.cpp>