sv/Marlin
1
1
Fork 0
Code Issues Pull Requests Wiki Activity

Merge remote-tracking branch 'upstream/bugfix-2.0.x' into release_202

Browse Source
This commit is contained in:
Scott Lahteine
2020-01-27 05:32:36 -06:00
parent ccdeb3f2cd e2eef1256a
commit ae2a0036eb
379 changed files with 65624 additions and 4220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
buildroot/bin/restore_configs
View File

@@ -1,11 +1,5 @@
#!/usr/bin/env bash
cp config/default/Configuration*.h Marlin
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
git checkout Marlin/Configuration*.h 2>/dev/null
git checkout Marlin/src/pins/ramps/pins_RAMPS.h 2>/dev/null
rm -f Marlin/_Bootscreen.h Marlin/_Statusscreen.h

20
buildroot/bin/use_example_configs
View File

@@ -2,18 +2,14 @@
restore_configs
if [ -f "config/examples/$@/Configuration.h" ]; then
cp "config/examples/$@/Configuration.h" Marlin/
fi
EXAMPLES="https://raw.githubusercontent.com/MarlinFirmware/Configurations/master/config/examples"
if [ -f "config/examples/$@/Configuration_adv.h" ]; then
cp "config/examples/$@/Configuration_adv.h" Marlin/
fi
cd Marlin
if [ -f "config/examples/$@/_Bootscreen.h" ]; then
cp "config/examples/$@/_Bootscreen.h" Marlin/
fi
wget -q "$EXAMPLES/$@/Configuration.h" -O wgot && mv wgot Configuration.h
wget -q "$EXAMPLES/$@/Configuration_adv.h" -O wgot && mv wgot Configuration_adv.h
wget -q "$EXAMPLES/$@/_Bootscreen.h" -O wgot && mv wgot _Bootscreen.h
wget -q "$EXAMPLES/$@/_Statusscreen.h" -O wgot && mv wgot _Statusscreen.h
rm -f wgot
if [ -f "config/examples/$@/_Statusscreen.h" ]; then
cp "config/examples/$@/_Statusscreen.h" Marlin/
fi
cd - >/dev/null