🔖 Moving to bugfix-2.1.x

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -14,13 +14,13 @@ body:
 
         ## Before Reporting a Bug
 
-        - Read and understand Marlin's [Code of Conduct](https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.0.x/.github/code_of_conduct.md). You are expected to comply with it, including treating everyone with respect.
+        - Read and understand Marlin's [Code of Conduct](https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.1.x/.github/code_of_conduct.md). You are expected to comply with it, including treating everyone with respect.
 
-        - Test with the [`bugfix-2.0.x` branch](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.0.x.zip) to see whether the issue still exists.
+        - Test with the [`bugfix-2.1.x` branch](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.1.x.zip) to see whether the issue still exists.
 
         ## Instructions
 
-        Please follow the instructions below. Failure to do so may result in your issue being closed. See [Contributing to Marlin](https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.0.x/.github/contributing.md) for additional guidelines.
+        Please follow the instructions below. Failure to do so may result in your issue being closed. See [Contributing to Marlin](https://github.com/MarlinFirmware/Marlin/blob/bugfix-2.1.x/.github/contributing.md) for additional guidelines.
 
         1. Provide a good title starting with [BUG].
         2. Fill out all sections of this bug report form.
@@ -28,10 +28,10 @@ body:
 
   - type: dropdown
     attributes:
-      label: Did you test the latest `bugfix-2.0.x` code?
+      label: Did you test the latest `bugfix-2.1.x` code?
       description: >-
         Always try the latest code to make sure the issue you are reporting is not already fixed. To download
-        the latest code just [click this link](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.0.x.zip).
+        the latest code just [click this link](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.1.x.zip).
       options:
         - Yes, and the problem still exists.
         - No, but I will test it now!

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -17,7 +17,7 @@ body:
 
         - Read and understand Marlin's [Code of Conduct](https://github.com/MarlinFirmware/Marlin/blob/master/.github/code_of_conduct.md). You are expected to comply with it, including treating everyone with respect.
 
-        - Check the latest [`bugfix-2.0.x` branch](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.0.x.zip) to see if the feature already exists.
+        - Check the latest [`bugfix-2.1.x` branch](https://github.com/MarlinFirmware/Marlin/archive/bugfix-2.1.x.zip) to see if the feature already exists.
 
         - Before you proceed with your request, please consider if it is necessary to make it into a firmware feature, or if it may be better suited for a slicer or host feature.
 

.github/contributing.md

@@ -116,7 +116,7 @@ Unsure where to begin contributing to Marlin? You can start by looking through t
 
 ### Pull Requests
 
-Pull Requests should always be targeted to working branches (e.g., `bugfix-2.0.x` and/or `bugfix-1.1.x`) and never to release branches (e.g., `2.0.x` and/or `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](https://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.
+Pull Requests should always be targeted to working branches (e.g., `bugfix-2.1.x` and/or `bugfix-1.1.x`) and never to release branches (e.g., `2.0.x` and/or `1.1.x`). If this is your first Pull Request, please read our [Guide to Pull Requests](https://marlinfw.org/docs/development/getting_started_pull_requests.html) and Github's [Pull Request](https://help.github.com/articles/creating-a-pull-request/) documentation.
 
 * Fill in [the required template](pull_request_template.md).
 * Don't include issue numbers in the PR title.

.github/workflows/bump-date.yml

@@ -18,10 +18,10 @@ jobs:
 
     steps:
 
-    - name: Check out bugfix-2.0.x
+    - name: Check out bugfix-2.1.x
       uses: actions/checkout@v2
       with:
-        ref: bugfix-2.0.x
+        ref: bugfix-2.1.x
 
     - name: Bump Distribution Date
       run: |

.github/workflows/check-pr.yml

@@ -26,8 +26,8 @@ jobs:
         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.
+          Please redo this PR starting with the `bugfix-2.1.x` branch and be careful to target `bugfix-2.1.x` when resubmitting the PR.
 
-          It may help to set your fork's default branch to `bugfix-2.0.x`.
+          It may help to set your fork's default branch to `bugfix-2.1.x`.
 
           See [this page](http://marlinfw.org/docs/development/getting_started_pull_requests.html) for full instructions.

.github/workflows/test-builds.yml

@@ -8,7 +8,7 @@ name: CI
 on:
   pull_request:
     branches:
-    - bugfix-2.0.x
+    - bugfix-2.1.x
     paths-ignore:
     - config/**
     - data/**
@@ -16,7 +16,7 @@ on:
     - '**/*.md'
   push:
     branches:
-    - bugfix-2.0.x
+    - bugfix-2.1.x
     paths-ignore:
     - config/**
     - data/**

Marlin/Version.h

@@ -28,7 +28,7 @@
 /**
  * Marlin release version identifier
  */
-//#define SHORT_BUILD_VERSION "bugfix-2.0.x"
+//#define SHORT_BUILD_VERSION "bugfix-2.1.x"
 
 /**
  * Verbose version identifier which should contain a reference to the location

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 "bugfix-2.1.x"
 #endif
 
 /**

Marlin/src/lcd/e3v2/README.md

@@ -1,6 +1,6 @@
 # DWIN for Creality Ender 3 v2
 
-Marlin's Ender 3 v2 support requires the `DWIN_SET` included with the Ender 3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.0.x/config/examples/Creality/Ender-3%20V2).
+Marlin's Ender 3 v2 support requires the `DWIN_SET` included with the Ender 3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x/config/examples/Creality/Ender-3%20V2).
 
 ## Easy Install
 

Marlin/src/lcd/e3v2/jyersui/README.md

@@ -1,6 +1,6 @@
 # DWIN for Creality Ender 3 v2
 
-Marlin's Ender 3 v2 support requires the `DWIN_SET` included with the Ender 3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.0.x/config/examples/Creality/Ender-3%20V2).
+Marlin's Ender 3 v2 support requires the `DWIN_SET` included with the Ender 3 V2 [example configuration](https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x/config/examples/Creality/Ender-3%20V2).
 
 ## Easy Install
 

Marlin/src/pins/stm32f4/pins_ANET_ET4.h

@@ -64,7 +64,7 @@
 // Z Probe
 //
 #if ENABLED(BLTOUCH)
-  #error "You will need to use 24V to 5V converter and remove one resistor and capacitor from the motherboard. See https://github.com/davidtgbe/Marlin/blob/bugfix-2.0.x/docs/Tutorials/bltouch-en.md for more information. Comment out this line to proceed at your own risk."
+  #error "You will need to use 24V to 5V converter and remove one resistor and capacitor from the motherboard. See https://bit.ly/3xg9cXO for more information. Comment out this line to proceed at your own risk."
   #define SERVO0_PIN                        PC3
 #elif !defined(Z_MIN_PROBE_PIN)
   #define Z_MIN_PROBE_PIN                   PC3

README.md

@@ -59,7 +59,7 @@ Marlin 2.0 introduces a layer of abstraction so that all the existing high-level
 
 ## 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.
+Proposed patches should be submitted as a Pull Request against the ([bugfix-2.1.x](https://github.com/MarlinFirmware/Marlin/tree/bugfix-2.1.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](https://marlinfw.org/docs/development/coding_standards.html) to gain points with the maintainers.

buildroot/bin/use_example_configs

@@ -2,7 +2,7 @@
 
 IFS=: read -r PART1 PART2 <<< "$@"
 [ -n "${PART2}" ] && { REPO="$PART1" ; RDIR="${PART2// /%20}" ; } \
-                  || { REPO=bugfix-2.0.x   ; RDIR="${PART1// /%20}" ; }
+                  || { REPO=bugfix-2.1.x   ; RDIR="${PART1// /%20}" ; }
 EXAMPLES="https://raw.githubusercontent.com/MarlinFirmware/Configurations/$REPO/config/examples"
 
 which curl >/dev/null && TOOL='curl -L -s -S -f -o wgot'

buildroot/share/git/mfconfig

@@ -35,7 +35,7 @@ COMMIT_STEPS=0
 
 ACTION=${1:-init}
 IMPORT=${2:-"import-2.0.x"}
-EXPORT=${3:-"bugfix-2.0.x"}
+EXPORT=${3:-"bugfix-2.1.x"}
 
 echo -n "Doing grhh ... " ; grhh ; echo
 
@@ -52,7 +52,7 @@ if [[ $ACTION == "manual" ]]; then
   git checkout $IMPORT || exit
 
   # Reset from the latest complete state
-  #git reset --hard bugfix-2.0.x
+  #git reset --hard bugfix-2.1.x
 
   cp "$MARLINREPO/Marlin/"Configuration*.h "$CDEF/"
   #git add . && git commit -m "Changes from Marlin ($(date '+%Y-%m-%d %H:%M'))."

buildroot/share/git/mffp

@@ -3,7 +3,7 @@
 # mffp [1|2] [ref]
 #
 # Push the given commit (or HEAD) upstream immediately.
-# By default: `git push upstream HEAD:bugfix-2.0.x`
+# By default: `git push upstream HEAD:bugfix-2.1.x`
 #
 
 usage() { echo "usage: `basename $0` [1|2] [ref]" 1>&2 ; }

buildroot/share/git/mfinfo

@@ -7,13 +7,13 @@
 #   - Remote (upstream) Org name (MarlinFirmware)
 #   - Remote (origin) Org name (your Github username)
 #   - Repo Name (Marlin, MarlinDocumentation)
-#   - PR Target branch (e.g., bugfix-2.0.x)
+#   - PR Target branch (e.g., bugfix-2.1.x)
 #   - Branch Arg (the branch argument or current branch)
 #   - Current Branch
 #
 # Example output
 #   > mfinfo -q ongoing
-#   MarlinFirmware john.doe Marlin bugfix-2.0.x ongoing bugfix-2.0.x -q
+#   MarlinFirmware john.doe Marlin bugfix-2.1.x ongoing bugfix-2.1.x -q
 #
 
 CURR=$(git branch 2>/dev/null | grep ^* | sed 's/\* //g')
@@ -55,7 +55,7 @@ while [[ $# -gt 0 ]]; do
 done
 
 case "$REPO" in
-  Marlin              ) TARG=bugfix-2.0.x ; ((INDEX == 1)) && TARG=bugfix-1.1.x ; [[ $BRANCH =~ ^[12]$ ]] && USAGE=1 ;;
+  Marlin              ) TARG=bugfix-2.1.x ; ((INDEX == 1)) && TARG=bugfix-1.1.x ; [[ $BRANCH =~ ^[12]$ ]] && USAGE=1 ;;
   Configurations      ) TARG=import-2.0.x ;;
   MarlinDocumentation ) TARG=master ;;
   AutoBuildMarlin     ) TARG=master ;;

buildroot/share/git/mfprep

@@ -2,11 +2,11 @@
 #
 # mfprep tag1 [tag2]
 #
-# Find commits in bugfix-2.0.x that are not yet in 2.0.x.
+# Find commits in bugfix-2.1.x that are not yet in 2.0.x.
 #
 # Specify a version tag to start from, and optional version tag to end at.
-# For bugfix-2.0.x the tag will be prefixed by bf- to distinguish it from the version tag,
-# so at every release be sure to create a bf- tag and publish it to origin.
+# For bugfix-2.1.x the tag will be prefixed by dev- to distinguish it from the version tag,
+# so at every release be sure to create a dev- tag and publish it to origin.
 #
 
 SED=$(which gsed sed | head -n1)
@@ -22,12 +22,12 @@ DEST=2.1.x
 
 # Validate that the required tags exist
 
-MTAG=`git tag | grep -e "^bf-$TAG1\$"`
-[[ -n "$MTAG" ]] || { echo "Can't find tag bf-$TAG1" ; exit 1 ; }
+MTAG=`git tag | grep -e "^dev-$TAG1\$"`
+[[ -n "$MTAG" ]] || { echo "Can't find tag dev-$TAG1" ; exit 1 ; }
 MTAG=`git tag | grep -e "^$TAG1\$"`
 [[ -n "$MTAG" ]] || { echo "Can't find tag $TAG1" ; exit 1 ; }
 
-# Generate log of recent commits for bugfix-2.0.x and DEST
+# Generate log of recent commits for bugfix-2.1.x and DEST
 
 TMPDIR=`mktemp -d`
 LOGB="$TMPDIR/log-bf.txt"
@@ -35,11 +35,11 @@ LOG2="$TMPDIR/log-2x.txt"
 TMPF="$TMPDIR/tmp.txt"
 SCRF="$TMPDIR/update-$DEST.sh"
 
-git checkout bugfix-2.0.x
-git log --pretty="[%h] %s" bf-$TAG1..$TAG2 | grep -v '\[cron\]' | $SED '1!G;h;$!d' >"$LOGB"
+git checkout bugfix-2.1.x
+git log --pretty="[%h] %s" dev-$TAG1..$TAG2 | grep -v '\[cron\]' | $SED '1!G;h;$!d' >"$LOGB"
 
 git checkout $DEST
-git log --pretty="[%h] %s" $TAG1..$TAG2 | $SED '1!G;h;$!d' >"$LOG2" || { echo "Can't find tag bf-$TAG1" ; exit 1 ; }
+git log --pretty="[%h] %s" $TAG1..$TAG2 | $SED '1!G;h;$!d' >"$LOG2" || { echo "Can't find tag dev-$TAG1" ; exit 1 ; }
 
 # Go through commit text from DEST removing all matches from the bugfix log
 

config/README.md

@@ -2,8 +2,8 @@
 
 Marlin configurations for specific machines are now maintained in their own repository at:
 
-## https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.0.x
+## https://github.com/MarlinFirmware/Configurations/tree/bugfix-2.1.x
 
-Configuration files for use with the nightly `bugfix-2.0.x` branch can be downloaded from:
+Configuration files for use with the nightly `bugfix-2.1.x` branch can be downloaded from:
 
-## https://github.com/MarlinFirmware/Configurations/archive/bugfix-2.0.x.zip
+## https://github.com/MarlinFirmware/Configurations/archive/bugfix-2.1.x.zip