Browse Source

Friendly layout for Arduino IDE

Scott Lahteine 7 years ago
parent
commit
f37ed314e0

+ 3
- 5
.travis.yml View File

41
   #
41
   #
42
 script:
42
 script:
43
   #
43
   #
44
-  # Backup Configuration.h, Configuration_adv.h, and pins_RAMPS.h
44
+  # Backup pins_RAMPS.h
45
   #
45
   #
46
-  - cp Marlin/src/config/Configuration.h Marlin/src/config/Configuration.h.backup
47
-  - cp Marlin/src/config/Configuration_adv.h Marlin/src/config/Configuration_adv.h.backup
48
   - cp Marlin/src/pins/pins_RAMPS.h Marlin/src/pins/pins_RAMPS.h.backup
46
   - cp Marlin/src/pins/pins_RAMPS.h Marlin/src/pins/pins_RAMPS.h.backup
49
   #
47
   #
50
   # Build with the default configurations
48
   # Build with the default configurations
335
   - export TEST_PLATFORM="-e teensy35"
333
   - export TEST_PLATFORM="-e teensy35"
336
   - restore_configs
334
   - restore_configs
337
   - opt_set MOTHERBOARD BOARD_TEENSY35_36
335
   - opt_set MOTHERBOARD BOARD_TEENSY35_36
338
-  - cp Marlin/src/config/Configuration.h Marlin/src/config/Configuration.h.backup
339
-  - cp Marlin/src/config/Configuration_adv.h Marlin/src/config/Configuration_adv.h.backup
336
+  - cp Marlin/Configuration.h Marlin/src/config/default/Configuration.h
337
+  - cp Marlin/Configuration_adv.h Marlin/src/config/default/Configuration_adv.h
340
   - cp Marlin/src/pins/pins_RAMPS.h Marlin/src/pins/pins_RAMPS.h.backup
338
   - cp Marlin/src/pins/pins_RAMPS.h Marlin/src/pins/pins_RAMPS.h.backup
341
   #
339
   #
342
   # Test Teensy3.5 with default config
340
   # Test Teensy3.5 with default config

Marlin/src/config/Configuration.h → Marlin/Configuration.h View File


Marlin/src/config/Configuration_adv.h → Marlin/Configuration_adv.h View File


+ 1657
- 0
Marlin/src/config/default/Configuration.h
File diff suppressed because it is too large
View File


+ 1409
- 0
Marlin/src/config/default/Configuration_adv.h
File diff suppressed because it is too large
View File


+ 2
- 2
Marlin/src/inc/MarlinConfig.h View File

26
 #include "../core/boards.h"
26
 #include "../core/boards.h"
27
 #include "../core/macros.h"
27
 #include "../core/macros.h"
28
 #include "Version.h"
28
 #include "Version.h"
29
-#include "../config/Configuration.h"
29
+#include "../../Configuration.h"
30
 #include "Conditionals_LCD.h"
30
 #include "Conditionals_LCD.h"
31
-#include "../config/Configuration_adv.h"
31
+#include "../../Configuration_adv.h"
32
 #include "../HAL/HAL.h"
32
 #include "../HAL/HAL.h"
33
 #include "../pins/pins.h"
33
 #include "../pins/pins.h"
34
 #if defined(ARDUINO_ARCH_AVR) && !defined(USBCON)
34
 #if defined(ARDUINO_ARCH_AVR) && !defined(USBCON)

+ 1
- 1
buildroot/bin/opt_disable View File

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

+ 1
- 1
buildroot/bin/opt_disable_adv View File

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

+ 1
- 1
buildroot/bin/opt_enable View File

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

+ 1
- 1
buildroot/bin/opt_enable_adv View File

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

+ 1
- 1
buildroot/bin/opt_set View File

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

+ 1
- 1
buildroot/bin/opt_set_adv View File

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

+ 3
- 3
buildroot/bin/restore_configs View File

1
 #!/usr/bin/env bash
1
 #!/usr/bin/env bash
2
 
2
 
3
-cp Marlin/src/config/Configuration.h.backup      Marlin/src/config/Configuration.h
4
-cp Marlin/src/config/Configuration_adv.h.backup  Marlin/src/config/Configuration_adv.h
5
-cp Marlin/src/pins/pins_RAMPS.h.backup        	 Marlin/src/pins/pins_RAMPS.h
3
+cp Marlin/src/config/default/Configuration.h     Marlin/Configuration.h
4
+cp Marlin/src/config/default/Configuration_adv.h Marlin/Configuration_adv.h
5
+cp Marlin/src/pins/pins_RAMPS.h.backup           Marlin/src/pins/pins_RAMPS.h
6
 
6
 
7
 if [ -f Marlin/src/config/_Bootscreen.h ]; then
7
 if [ -f Marlin/src/config/_Bootscreen.h ]; then
8
   rm Marlin/src/config/_Bootscreen.h
8
   rm Marlin/src/config/_Bootscreen.h

+ 1
- 1
buildroot/bin/use_example_configs View File

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

Loading…
Cancel
Save