Friendly layout for Arduino IDE

.travis.yml

@@ -41,10 +41,8 @@ before_script:
   #
 script:
   #
-  # Backup Configuration.h, Configuration_adv.h, and pins_RAMPS.h
+  # Backup pins_RAMPS.h
   #
-  - cp Marlin/src/config/Configuration.h Marlin/src/config/Configuration.h.backup
-  - cp Marlin/src/config/Configuration_adv.h Marlin/src/config/Configuration_adv.h.backup
   - cp Marlin/src/pins/pins_RAMPS.h Marlin/src/pins/pins_RAMPS.h.backup
   #
   # Build with the default configurations
@@ -335,8 +333,8 @@ script:
   - export TEST_PLATFORM="-e teensy35"
   - restore_configs
   - opt_set MOTHERBOARD BOARD_TEENSY35_36
-  - cp Marlin/src/config/Configuration.h Marlin/src/config/Configuration.h.backup
-  - cp Marlin/src/config/Configuration_adv.h Marlin/src/config/Configuration_adv.h.backup
+  - cp Marlin/Configuration.h Marlin/src/config/default/Configuration.h
+  - cp Marlin/Configuration_adv.h Marlin/src/config/default/Configuration_adv.h
   - cp Marlin/src/pins/pins_RAMPS.h Marlin/src/pins/pins_RAMPS.h.backup
   #
   # Test Teensy3.5 with default config

Marlin/src/inc/MarlinConfig.h

@@ -26,9 +26,9 @@
 #include "../core/boards.h"
 #include "../core/macros.h"
 #include "Version.h"
-#include "../config/Configuration.h"
+#include "../../Configuration.h"
 #include "Conditionals_LCD.h"
-#include "../config/Configuration_adv.h"
+#include "../../Configuration_adv.h"
 #include "../HAL/HAL.h"
 #include "../pins/pins.h"
 #if defined(ARDUINO_ARCH_AVR) && !defined(USBCON)

buildroot/bin/opt_disable

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 for opt in "$@" ; do
-  eval "sed -i 's/\([[:blank:]]*\)\(#define \b${opt}\b\)/\1\/\/\2/g' Marlin/src/config/Configuration.h"
+  eval "sed -i 's/\([[:blank:]]*\)\(#define \b${opt}\b\)/\1\/\/\2/g' Marlin/Configuration.h"
 done

buildroot/bin/opt_disable_adv

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 for opt in "$@" ; do
-  eval "sed -i 's/\([[:blank:]]*\)\(#define \b${opt}\b\)/\1\/\/\2/g' Marlin/src/config/Configuration_adv.h"
+  eval "sed -i 's/\([[:blank:]]*\)\(#define \b${opt}\b\)/\1\/\/\2/g' Marlin/Configuration_adv.h"
 done

buildroot/bin/opt_enable

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 for opt in "$@" ; do
-  eval "sed -i 's/\/\/[[:blank:]]*\(#define \b${opt}\b\)/\1/g' Marlin/src/config/Configuration.h"
+  eval "sed -i 's/\/\/[[:blank:]]*\(#define \b${opt}\b\)/\1/g' Marlin/Configuration.h"
 done

buildroot/bin/opt_enable_adv

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
 for opt in "$@" ; do
-  eval "sed -i 's/\/\/[[:blank:]]*\(#define \b${opt}\b\)/\1/g' Marlin/src/config/Configuration_adv.h"
+  eval "sed -i 's/\/\/[[:blank:]]*\(#define \b${opt}\b\)/\1/g' Marlin/Configuration_adv.h"
 done

buildroot/bin/opt_set

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-eval "sed -i 's/\(#define \b${1}\b\).*$/\1 ${2}/g' Marlin/src/config/Configuration.h"
+eval "sed -i 's/\(#define \b${1}\b\).*$/\1 ${2}/g' Marlin/Configuration.h"

buildroot/bin/opt_set_adv

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-eval "sed -i 's/\(#define \b${1}\b\).*$/\1 ${2}/g' Marlin/src/config/Configuration_adv.h"
+eval "sed -i 's/\(#define \b${1}\b\).*$/\1 ${2}/g' Marlin/Configuration_adv.h"

buildroot/bin/restore_configs

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-cp Marlin/src/config/Configuration.h.backup      Marlin/src/config/Configuration.h
-cp Marlin/src/config/Configuration_adv.h.backup  Marlin/src/config/Configuration_adv.h
+cp Marlin/src/config/default/Configuration.h     Marlin/Configuration.h
+cp Marlin/src/config/default/Configuration_adv.h Marlin/Configuration_adv.h
 cp Marlin/src/pins/pins_RAMPS.h.backup           Marlin/src/pins/pins_RAMPS.h
 
 if [ -f Marlin/src/config/_Bootscreen.h ]; then

buildroot/bin/use_example_configs

@@ -2,7 +2,7 @@
 
 restore_configs
 
-eval "cp Marlin/src/config/examples/${1}/Configuration* Marlin/src/config/"
+eval "cp Marlin/src/config/examples/${1}/Configuration* Marlin/"
 
 if [ -f "Marlin/src/config/examples/${1}/_Bootscreen.h" ]; then
   cp "Marlin/src/config/examples/${1}/_Bootscreen.h" Marlin/src/config/