From 78fc5acca99f1717033d09f0358d9564857d1f09 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 16 Jul 2022 16:11:33 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20Add=20mftest=20--default=20flag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/bin/mftest              | 12 +++++++++++-
 buildroot/bin/use_example_configs | 32 +++++++++++++++++++------------
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/buildroot/bin/mftest b/buildroot/bin/mftest
index 9aa5e12732..edb4068546 100755
--- a/buildroot/bin/mftest
+++ b/buildroot/bin/mftest
@@ -30,6 +30,7 @@ OPTIONS
   -u --autoupload  PIO Upload using the MOTHERBOARD environment.
   -v --verbose     Extra output for debugging.
   -s --silent      Silence build output from PlatformIO.
+  -d --default     Restore to defaults before applying configs.
 
 env shortcuts: tree due esp lin lp8|lpc8 lp9|lpc9 m128 m256|mega stm|f1 f4 f7 s6 teensy|t31|t32 t35|t36 t40|t41
 "
@@ -44,6 +45,7 @@ shopt -s extglob nocasematch
 
 # Matching patterns
 ISNUM='^[0-9]+$'
+ISRST='^(restore)_'
 ISCMD='^(restore|opt|exec|use|pins|env)_'
 ISEXEC='^exec_'
 ISCONT='\\ *$'
@@ -53,9 +55,10 @@ TESTENV='-'
 CHOICE=0
 DEBUG=0
 
-while getopts 'abhmrsuvyn:t:-:' OFLAG; do
+while getopts 'abdhmrsuvyn:t:-:' OFLAG; do
   case "${OFLAG}" in
     a) AUTO_BUILD=1 ; bugout "Auto-Build target..." ;;
+    d) DL_DEFAULTS=1 ; bugout "Restore to defaults..." ;;
     h) EXIT_USAGE=1 ;;
     m) USE_MAKE=1 ; bugout "Using make with Docker..." ;;
     n) case "$OPTARG" in
@@ -88,6 +91,7 @@ while getopts 'abhmrsuvyn:t:-:' OFLAG; do
        silent) SILENT_FLAG="-s" ;;
          make) USE_MAKE=1 ; bugout "Using make with Docker..." ;;
 debug|verbose) DEBUG=1    ; bugout "Debug ON" ;;
+      default) DL_DEFAULTS=1 ; bugout "Restore to defaults..." ;;
         build) case "$OVAL" in
                  ''|y|yes) BUILD_YES='Y' ;;
                      n|no) BUILD_YES='N' ;;
@@ -282,6 +286,11 @@ if [[ $CHOICE == 0 ]]; then
   fi
 fi
 
+#
+# Restore to defaults if requested
+#
+((DL_DEFAULTS)) && use_example_configs
+
 #
 # Run the specified test lines
 #
@@ -303,6 +312,7 @@ echo "$OUT" | {
         }
         ((IND == CHOICE)) && {
           GOTX=1
+          [[ -n $DL_DEFAULTS && $LINE =~ $ISRST ]] && LINE="use_example_configs"
           [[ $CMD == "" ]] && CMD="$LINE" || CMD=$( echo -e "$CMD$LINE" | $SED -e 's/\\//g' | $SED -E 's/ +/ /g' )
           [[ $LINE =~ $ISCONT ]] || { echo "$CMD" ; eval "$CMD" ; CMD="" ; }
         }
diff --git a/buildroot/bin/use_example_configs b/buildroot/bin/use_example_configs
index bfd4aa612f..de2edc2468 100755
--- a/buildroot/bin/use_example_configs
+++ b/buildroot/bin/use_example_configs
@@ -9,27 +9,35 @@
 # If a configpath has spaces (or quotes) escape them or enquote the path
 #
 
+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
 
-IFS=: read -r PART1 PART2 <<< "$@"
-[[ -n $PART2 ]] && { REPO="$PART1" ; RDIR="${PART2// /%20}" ; } \
-                || { REPO=$BRANCH  ; RDIR="${PART1// /%20}" ; }
-EXAMPLES="https://raw.githubusercontent.com/MarlinFirmware/Configurations/$REPO/config/examples"
+REPO=$BRANCH
 
-which curl >/dev/null && TOOL='curl -L -s -S -f -o wgot'
-which wget >/dev/null && TOOL='wget -q -O wgot'
+if [[ $# > 0 ]]; then
+  IFS=: read -r PART1 PART2 <<< "$@"
+  [[ -n $PART2 ]] && { UDIR="$PART2" ; REPO="$PART1" ; } \
+                  || { UDIR="$PART1" ; }
+  RDIR="${UDIR// /%20}"
+  echo "Fetching $UDIR configurations from $REPO..."
+  EXAMPLES="examples/$RDIR"
+else
+  EXAMPLES="default"
+fi
+
+CONFIGS="https://raw.githubusercontent.com/MarlinFirmware/Configurations/$REPO/config/${EXAMPLES}"
 
 restore_configs
 
 cd Marlin
 
-echo "Fetching $RDIR configurations from $REPO..."
-
-$TOOL "$EXAMPLES/$RDIR/Configuration.h"     >/dev/null 2>&1 && mv wgot Configuration.h
-$TOOL "$EXAMPLES/$RDIR/Configuration_adv.h" >/dev/null 2>&1 && mv wgot Configuration_adv.h
-$TOOL "$EXAMPLES/$RDIR/_Bootscreen.h"       >/dev/null 2>&1 && mv wgot _Bootscreen.h
-$TOOL "$EXAMPLES/$RDIR/_Statusscreen.h"     >/dev/null 2>&1 && mv wgot _Statusscreen.h
+$TOOL "$CONFIGS/Configuration.h"     >/dev/null 2>&1 && mv wgot Configuration.h
+$TOOL "$CONFIGS/Configuration_adv.h" >/dev/null 2>&1 && mv wgot Configuration_adv.h
+$TOOL "$CONFIGS/_Bootscreen.h"       >/dev/null 2>&1 && mv wgot _Bootscreen.h
+$TOOL "$CONFIGS/_Statusscreen.h"     >/dev/null 2>&1 && mv wgot _Statusscreen.h
 
 rm -f wgot
 cd - >/dev/null