jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update branch from Devel

Browse Source
This commit is contained in:
InsanityAutomation
2020-06-15 09:33:18 -04:00
parent f1649d7846
commit 366ad20dfe
1321 changed files with 34363 additions and 22873 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildroot/bin/generate_version
+1 -1
View File
@@ -47,7 +47,7 @@ WEBSITE_URL=$(awk -F'"' \
cat > "${DIR}/Version.h" <<EOF
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
buildroot/bin/opt_set
+2 -1
View File
@@ -8,4 +8,5 @@ SED=$(which gsed || which sed)
# Logic for returning nonzero based on answer here: https://stackoverflow.com/a/15966279/104648
eval "${SED} -i '/\(\/\/\)*\([[:blank:]]*\)\(#define \b${1}\b\).*$/{s//\2\3 ${2}/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration.h" ||
eval "${SED} -i '/\(\/\/\)*\([[:blank:]]*\)\(#define \b${1}\b\).*$/{s//\2\3 ${2}/;h};\${x;/./{x;q0};x;q9}' Marlin/Configuration_adv.h" ||
(echo "ERROR: opt_set Can't find ${1}" >&2 && exit 9)
eval "echo '#define ${@}' >>Marlin/Configuration_adv.h" ||
(echo "ERROR: opt_set Can't set or add ${1}" >&2 && exit 9)
buildroot/bin/use_example_configs
+1 -1
View File
@@ -2,7 +2,7 @@
restore_configs
EXAMPLES="https://raw.githubusercontent.com/MarlinFirmware/Configurations/master/config/examples"
EXAMPLES="https://raw.githubusercontent.com/MarlinFirmware/Configurations/bugfix-2.0.x/config/examples"
cd Marlin