Move pins files to subfolders #14573

buildroot/bin/backup_ramps

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+PINS="Marlin/src/pins"
+RAMPS="$PINS/ramps/pins_RAMPS.h"
+BKUP="$PINS/ramps/pins_RAMPS.backup.h"
+
+[[ -f $RAMPS ]] && cp "$RAMPS" "$BKUP"

buildroot/bin/pins_set

@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
-SED=$(which gsed || which sed)
+IFS='/' read -r -a PINPATH <<< "$1"
+DIR=${PINPATH[0]}
+NAM=${PINPATH[1]}
+PIN=$2
+VAL=$3
 
-eval "${SED} -E -i 's/(\/\/)?(#define \b${2}\b).*$/\2 ${3}/g' Marlin/src/pins/pins_${1}.h"
+SED=$(which gsed || which sed)
+eval "${SED} -E -i 's/(\/\/)?(#define +${PIN}\b).*$/\2 ${VAL}/g' Marlin/src/pins/$DIR/pins_${NAM}.h"

buildroot/bin/restore_configs

@@ -2,8 +2,10 @@
 
 cp config/default/Configuration*.h Marlin
 
-[ -f Marlin/src/pins/pins_RAMPS.h.backup ] && cp Marlin/src/pins/pins_RAMPS.h.backup Marlin/src/pins/pins_RAMPS.h
-rm -f Marlin/src/pins/pins_RAMPS.h.backup
+PINS="Marlin/src/pins"
+RAMPS="$PINS/ramps/pins_RAMPS.h"
+BKUP="$PINS/ramps/pins_RAMPS.backup.h"
+[ -f $BKUP ] && { cp "$BKUP" "$RAMPS" ; rm -f $BKUP ; }
 
 rm -f Marlin/_Bootscreen.h
 rm -f Marlin/_Statusscreen.h

buildroot/share/tests/DUE-tests

@@ -6,6 +6,8 @@
 # exit on first failure
 set -e
 
+backup_ramps
+
 restore_configs
 opt_set MOTHERBOARD BOARD_RAMPS4DUE_EFB EXTENSIBLE_UI EXTUI_EXAMPLE
 opt_enable S_CURVE_ACCELERATION EEPROM_SETTINGS GCODE_MACROS
@@ -19,8 +21,8 @@ opt_enable USE_XMAX_PLUG USE_YMAX_PLUG BLTOUCH AUTO_BED_LEVELING_BILINEAR \
            Z_TRIPLE_STEPPER_DRIVERS Z_TRIPLE_ENDSTOPS Z_STEPPER_AUTO_ALIGN ENDSTOPPULLUPS
 opt_add Z2_MAX_ENDSTOP_INVERTING false
 opt_add Z3_MAX_ENDSTOP_INVERTING false
-pins_set RAMPS X_MAX_PIN -1
-pins_set RAMPS Y_MAX_PIN -1
+pins_set ramps/RAMPS X_MAX_PIN -1
+pins_set ramps/RAMPS Y_MAX_PIN -1
 opt_add Z2_MAX_PIN 2
 opt_add Z3_MAX_PIN 3
 exec_test $1 $2 "RADDS with Z_TRIPLE_STEPPER_DRIVERS and Z_STEPPER_AUTO_ALIGN"

buildroot/share/tests/megaatmega2560-tests

@@ -6,11 +6,6 @@
 # exit on first failure
 set -e
 
-#
-# Backup pins_RAMPS.h
-#
-cp Marlin/src/pins/pins_RAMPS.h Marlin/src/pins/pins_RAMPS.h.backup
-
 #
 # Build with the default configurations
 #
@@ -265,16 +260,19 @@ exec_test $1 $2 "Many less common options"
 #
 use_example_configs Creality/CR-10S
 exec_test $1 $2 "Full-featured CR-10S config"
+
 #
 # BQ Hephestos 2
 #restore_configs
 #use_example_configs Hephestos_2
 #exec_test $1 $2 "Stuff"
+
 #
 # Delta Config (generic) + ABL bilinear + BLTOUCH
 use_example_configs delta/generic
 opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR BLTOUCH BLTOUCH_FORCE_5V_MODE
 exec_test $1 $2 "Delta Config (generic) + ABL bilinear + BLTOUCH"
+
 #
 # Delta Config (generic) + UBL + ALLEN_KEY + OLED_PANEL_TINYBOY2 + EEPROM_SETTINGS
 #
@@ -282,16 +280,19 @@ use_example_configs delta/generic
 opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 Z_PROBE_ALLEN_KEY EEPROM_SETTINGS EEPROM_CHITCHAT \
            OLED_PANEL_TINYBOY2 MESH_EDIT_GFX_OVERLAY
 exec_test $1 $2 "Delta Config (generic) + UBL + ALLEN_KEY + OLED_PANEL_TINYBOY2 + EEPROM_SETTINGS"
+
 #
 # Delta Config (FLSUN AC because it's complex)
 #
 use_example_configs delta/FLSUN/auto_calibrate
 exec_test $1 $2 "Delta Config (FLSUN AC because it's complex)"
+
 #
 # Makibox Config  need to check board type for Teensy++ 2.0
 #
 #use_example_configs makibox
 #exec_test $1 $2 "Stuff"
+
 #
 # SCARA with TMC2130
 #
@@ -305,6 +306,7 @@ opt_set Y_DRIVER_TYPE TMC2130
 opt_set Z_DRIVER_TYPE TMC2130
 opt_set E0_DRIVER_TYPE TMC2660
 exec_test $1 $2 "SCARA with TMC2130, TMC2209, and TMC2660"
+
 #
 # Test mixed TMC config
 #
@@ -317,13 +319,12 @@ opt_set X_MIN_ENDSTOP_INVERTING true
 opt_set Y_MIN_ENDSTOP_INVERTING true
 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER MONITOR_DRIVER_STATUS STEALTHCHOP_XY STEALTHCHOP_Z STEALTHCHOP_E HYBRID_THRESHOLD USE_ZMIN_PLUG SENSORLESS_HOMING TMC_DEBUG
 exec_test $1 $2 "Mixed TMC configuration"
+
 #
 # tvrrug Config need to check board type for sanguino atmega644p
 #
 #use_example_configs tvrrug/Round2
 #exec_test $1 $2 "Stuff"
-#
-#
 
 # clean up
 restore_configs

buildroot/share/tests/teensy35-tests

@@ -6,9 +6,10 @@
 # exit on first failure
 set -e
 
+backup_ramps
+
 restore_configs
 opt_set MOTHERBOARD BOARD_TEENSY35_36
-cp Marlin/src/pins/pins_RAMPS.h Marlin/src/pins/pins_RAMPS.h.backup
 exec_test $1 $2 "Teensy3.5 with default config"
 
 #
@@ -106,7 +107,7 @@ exec_test $1 $2 "COREXZ"
 restore_configs
 opt_set MOTHERBOARD BOARD_TEENSY35_36
 opt_enable Z_DUAL_STEPPER_DRIVERS Z_DUAL_ENDSTOPS
-pins_set RAMPS X_MAX_PIN -1
+pins_set ramps/RAMPS X_MAX_PIN -1
 opt_add Z2_MAX_PIN 2
 opt_enable USE_XMAX_PLUG
 exec_test $1 $2 "Z_DUAL_STEPPER_DRIVERS, Z_DUAL_ENDSTOPS"