CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Friendly layout for Arduino IDE

Browse Source
This commit is contained in:
Scott Lahteine 2017-09-18 17:20:22 -05:00
parent 06a02dd200
commit f37ed314e0
14 changed files with 3081 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

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

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

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

1657
Marlin/src/config/default/Configuration.h Normal file
View File

File diff suppressed because it is too large Load Diff

1409
Marlin/src/config/default/Configuration_adv.h Normal file
View File

File diff suppressed because it is too large Load Diff

4
Marlin/src/inc/MarlinConfig.h
View File

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

2
buildroot/bin/opt_disable
View File

@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
for opt in "$@" ; do 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 done

2
buildroot/bin/opt_disable_adv
View File

@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
for opt in "$@" ; do 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 done

2
buildroot/bin/opt_enable
View File

@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
for opt in "$@" ; do 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 done

2
buildroot/bin/opt_enable_adv
View File

@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
for opt in "$@" ; do 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 done

2
buildroot/bin/opt_set
View File

@ -1,3 +1,3 @@
#!/usr/bin/env bash #!/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"

2
buildroot/bin/opt_set_adv
View File

@ -1,3 +1,3 @@
#!/usr/bin/env bash #!/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"

6
buildroot/bin/restore_configs
View File

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

2
buildroot/bin/use_example_configs
View File

@ -2,7 +2,7 @@
restore_configs 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 if [ -f "Marlin/src/config/examples/${1}/_Bootscreen.h" ]; then
cp "Marlin/src/config/examples/${1}/_Bootscreen.h" Marlin/src/config/ cp "Marlin/src/config/examples/${1}/_Bootscreen.h" Marlin/src/config/