Merge upstream changes from Marlin 2.1.2.2

buildroot/bin/build_all_examples

@@ -14,7 +14,9 @@
 # build_all_examples [...] branch [resume-from]
 #
 
-. mfutil
+HERE=`dirname $0`
+
+. "$HERE/mfutil"
 
 GITREPO=https://github.com/MarlinFirmware/Configurations.git
 STAT_FILE=./.pio/.buildall
@@ -123,7 +125,7 @@ CONF_TREE=$( ls -d "$TMP"/config/examples/*/ "$TMP"/config/examples/*/*/ "$TMP"/
 for CONF in $CONF_TREE ; do
 
   # Get a config's directory name
-  DIR=$( echo $CONF | sed "s|$TMP/config/examples/||" )
+  DIR=$( echo $CONF | "$SED" "s|$TMP/config/examples/||" )
 
   # If looking for a config, skip others
   [[ $FIRST_CONF ]] && [[ $FIRST_CONF != $DIR && "$FIRST_CONF/" != $DIR ]] && continue

buildroot/bin/build_example

@@ -5,7 +5,9 @@
 # Usage: build_example internal config-home config-folder
 #
 
-. mfutil
+HERE=`dirname $0`
+
+. "$HERE/mfutil"
 
 # Require 'internal' as the first argument
 [[ "$1" == "internal" ]] || { echo "Don't call this script directly, use build_all_examples instead." ; exit 1 ; }
@@ -32,7 +34,10 @@ $SED -i~ -e "20,30{/#error/d}" Marlin/Configuration.h
 rm Marlin/Configuration.h~
 unset IFS; set +f
 
+# Suppress fatal warnings
+echo -e "\n#define NO_CONTROLLER_CUSTOM_WIRING_WARNING" >> Marlin/Configuration.h
+
 echo "Building the firmware now..."
-$HERE/mftest -s -a -n1 || { echo "Failed"; exit 1; }
+"$HERE/mftest" -s -a -n1 || { echo "Failed"; exit 1; }
 
 echo "Success"

buildroot/bin/mftest

@@ -8,6 +8,8 @@
 
 [[ -d Marlin/src ]] || { echo "Please 'cd' to the Marlin repo root." ; exit 1 ; }
 
+which pio || { echo "Make sure 'pio' is in your execution PATH." ; exit 1 ;  }
+
 perror() { echo -e "$0: \033[0;31m$1 -- $2\033[0m" ; }
 errout() { echo -e "\033[0;31m$1\033[0m" ; }
 bugout() { ((DEBUG)) && echo -e "\033[0;32m$1\033[0m" ; }

buildroot/bin/mfutil

@@ -7,13 +7,12 @@
 which curl 1>/dev/null 2>&1 || { echo "curl not found! Please install it."; exit ; }
 which git 1>/dev/null 2>&1 || { echo "git not found! Please install it."; exit ; }
 
-SED=$(command -v gsed 2>/dev/null || command -v sed 2>/dev/null)
+SED=$(which gsed sed | head -n1)
 [[ -z "$SED" ]] && { echo "No sed found, please install sed" ; exit 1 ; }
 
 OPEN=$( which gnome-open xdg-open open | head -n1 )
 
 SELF=`basename "$0"`
-HERE=`dirname "$0"`
 
 # Check if called in the right location
 [[ -e "Marlin/src" ]] || { echo -e "This script must be called from a Marlin working copy with:\n ./buildroot/bin/$SELF $1" ; exit ; }

buildroot/bin/pins_set

@@ -9,7 +9,8 @@ SED=$(which gsed sed | head -n1)
 shift
 while [[ $# > 1 ]]; do
   PIN=$1 ; VAL=$2
-  eval "${SED} -i '/^[[:blank:]]*\(\/\/\)*[[:blank:]]*\(#define \+${PIN}\b\).*$/{s//\2 ${VAL}/;h};\${x;/./{x;q0};x;q9}' Marlin/src/pins/$DIR/pins_${NAM}.h" ||
-  (echo "ERROR: pins_set Can't find ${PIN}" >&2 && exit 9)
+  FOUT="${DIR}/pins_${NAM}.h"
+  eval "${SED} -i '/^[[:blank:]]*\(\/\/\)*[[:blank:]]*\(#define \+${PIN}\b\).*$/{s//\2 ${VAL}/;h};\${x;/./{x;q0};x;q9}' Marlin/src/pins/${FOUT}" ||
+  (echo "ERROR: pins_set Can't find ${PIN} in ${FOUT}" >&2 && exit 9)
   shift 2
 done

buildroot/bin/uncrust

@@ -4,9 +4,10 @@
 #
 
 TMPDIR=`mktemp -d`
+HERE=`dirname "$0"`
 
 # Reformat a single file to tmp/
-if uncrustify -l CPP -c ./buildroot/share/extras/uncrustify.cfg -f "$1" >$TMPDIR/uncrustify.out ; then
+if uncrustify -l CPP -c "$HERE/../share/extras/uncrustify.cfg" -f "$1" >$TMPDIR/uncrustify.out ; then
   cp "$TMPDIR/uncrustify.out" "$1"  ; # Replace the original file
 else
   echo "Something went wrong with uncrustify."

buildroot/bin/use_example_configs

@@ -8,28 +8,37 @@
 #   use_example_configs release-2.0.9.4:Creality/CR-10/CrealityV1
 #
 # If a configpath has spaces (or quotes) escape them or enquote the path
+# If no branch: prefix is given use configs based on the current branch name.
+# e.g., For `latest-2.1.x` name the working branch something like "my_work-2.1.x."
+#       The branch or tag must first exist at MarlinFirmware/Configurations.
+#       The fallback branch is bugfix-2.1.x.
 #
 
 which curl >/dev/null && TOOL='curl -L -s -S -f -o wgot'
 which wget >/dev/null && TOOL='wget -q -O wgot'
 
 CURR=$(git branch 2>/dev/null | grep ^* | sed 's/\* //g')
-[[ $CURR == "bugfix-2.0.x" ]] && BRANCH=bugfix-2.0.x || BRANCH=bugfix-2.1.x
-
-REPO=$BRANCH
+case "$CURR" in
+   bugfix-2.*.x ) BRANCH=$CURR ;;
+  *-2.1.x|2.1.x ) BRANCH=latest-2.1.x ;;
+  *-2.0.x|2.0.x ) BRANCH=latest-2.0.x ;;
+  *-1.1.x|1.1.x ) BRANCH=latest-1.1.x ;;
+  *-1.0.x|1.0.x ) BRANCH=latest-1.0.x ;;
+              * ) BRANCH=bugfix-2.1.x ;;
+esac
 
 if [[ $# > 0 ]]; then
   IFS=: read -r PART1 PART2 <<< "$@"
-  [[ -n $PART2 ]] && { UDIR="$PART2" ; REPO="$PART1" ; } \
+  [[ -n $PART2 ]] && { UDIR="$PART2" ; BRANCH="$PART1" ; } \
                   || { UDIR="$PART1" ; }
   RDIR="${UDIR// /%20}"
-  echo "Fetching $UDIR configurations from $REPO..."
+  echo "Fetching $UDIR configurations from $BRANCH..."
   EXAMPLES="examples/$RDIR"
 else
   EXAMPLES="default"
 fi
 
-CONFIGS="https://raw.githubusercontent.com/MarlinFirmware/Configurations/$REPO/config/${EXAMPLES}"
+CONFIGS="https://raw.githubusercontent.com/MarlinFirmware/Configurations/$BRANCH/config/${EXAMPLES}"
 
 restore_configs