josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change atmega404 board flash argument to y 

Use newer version of MK404-build.sh instead start the program
Added _RAM-<value> and _FLASH-<value> as OUTPUT_FILE_SUFFIX if someone builds an atmega404 firmware
Added some logic if IDE 1.8.13 is used
Added some logic if Arduino_boards 1.0.4 is used
Fixed typo
Restore original `Configuration.h` and `config.h` in case of cannceled script or failed compiling during next start of this script.
use function
Improve MK404 usage
This commit is contained in:
3d-gussner 2021-06-23 20:14:30 +02:00
parent 2b29e52d53
commit 9f9203b280
3 changed files with 501 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -52,3 +52,5 @@ Firmware/Doc
/Firmware/Firmware.vcxproj /Firmware/Firmware.vcxproj
/Firmware/Configuration_prusa_bckp.h /Firmware/Configuration_prusa_bckp.h
/Firmware/variants/printers.h /Firmware/variants/printers.h
Configuration.tmp
config.tmp

20
MK404-build.sh
View File

@ -10,7 +10,7 @@
# 3. Install latest updates with 'sudo apt-get upgrade' # 3. Install latest updates with 'sudo apt-get upgrade'
# #
# #
# Version: 1.0.0-Build_9 # Version: 1.0.0-Build_11
# Change log: # Change log:
# 11 Feb 2021, 3d-gussner, Inital # 11 Feb 2021, 3d-gussner, Inital
# 11 Feb 2021, 3d-gussner, Optional flags to check for updates # 11 Feb 2021, 3d-gussner, Optional flags to check for updates
@ -28,7 +28,7 @@ while getopts c:f:g:m:n:p:u:x:y:?h flag
case "${flag}" in case "${flag}" in
c) check_flag=${OPTARG};; c) check_flag=${OPTARG};;
f) firmware_version_flag=${OPTARG};; f) firmware_version_flag=${OPTARG};;
g) graphics_flag=${OPTARG};; g) mk404_graphics_flag=${OPTARG};;
h) help_flag=1;; h) help_flag=1;;
m) mk404_flag=${OPTARG};; m) mk404_flag=${OPTARG};;
n) new_build_flag=${OPTARG};; n) new_build_flag=${OPTARG};;
@ -42,7 +42,7 @@ while getopts c:f:g:m:n:p:u:x:y:?h flag
#Debug echos #Debug echos
#echo "c: $check_flag" #echo "c: $check_flag"
#echo "f: $firmware_version_flag" #echo "f: $firmware_version_flag"
#echo "g: $graphics_flag" #echo "g: $mk404_graphics_flag"
#echo "m: $mk404_flag" #echo "m: $mk404_flag"
#echo "n: $new_build_flag" #echo "n: $new_build_flag"
#echo "p: $mk404_printer_flag" #echo "p: $mk404_printer_flag"
@ -53,7 +53,7 @@ while getopts c:f:g:m:n:p:u:x:y:?h flag
# '?' 'h' argument usage and help # '?' 'h' argument usage and help
if [ "$help_flag" == "1" ] ; then if [ "$help_flag" == "1" ] ; then
echo "***************************************" echo "***************************************"
echo "* MK404-build.sh Version: 1.0.0-Build_9 *" echo "* MK404-build.sh Version: 1.0.0-Build_11 *"
echo "***************************************" echo "***************************************"
echo "Arguments:" echo "Arguments:"
echo "$(tput setaf 2)-c$(tput sgr0) Check for update" echo "$(tput setaf 2)-c$(tput sgr0) Check for update"
@ -396,7 +396,7 @@ fi
if [[ "$MK404_PRINTER" == "MK25" || "$MK404_PRINTER" == "MK25S" ]]; then if [[ "$MK404_PRINTER" == "MK25" || "$MK404_PRINTER" == "MK25S" ]]; then
MK404_PRINTER="${MK404_PRINTER}_mR13" MK404_PRINTER="${MK404_PRINTER}_mR13"
else else
if [[ "$mk404_flag" == "2" || "$mk404_flag" == "MMU2" || "$mk404_flag" == "MMU2S" ]]; then # Check if MMU2 is selected only for MK3/S if [ "$mk404_flag" == "2" ]; then # Check if MMU2 is selected only for MK3/S
MK404_PRINTER="${MK404_PRINTER}MMU2" MK404_PRINTER="${MK404_PRINTER}MMU2"
fi fi
fi fi
@ -410,20 +410,20 @@ fi
fi fi
# Run MK404 with graphics # Run MK404 with graphics
if [ ! -z "$graphics_flag" ]; then if [ ! -z "$mk404_graphics_flag" ]; then
if [ ! -z "$MK404_options" ]; then if [ ! -z "$MK404_options" ]; then
MK404_options="${MK404_options} -g " MK404_options="${MK404_options} -g "
else else
MK404_options=" -g " MK404_options=" -g "
fi fi
if [[ "$graphics_flag" == "1" || "$graphics_flag" == "lite" || "$graphics_flag" == "3" ]]; then if [[ "$mk404_graphics_flag" == "1" || "$mk404_graphics_flag" == "lite" || "$mk404_graphics_flag" == "3" ]]; then
MK404_options="${MK404_options}lite" MK404_options="${MK404_options}lite"
elif [[ "$graphics_flag" == "2" || "$graphics_flag" == "fancy" || "$graphics_flag" == "4" ]]; then elif [[ "$mk404_graphics_flag" == "2" || "$mk404_graphics_flag" == "fancy" || "$mk404_graphics_flag" == "4" ]]; then
MK404_options="${MK404_options}fancy" MK404_options="${MK404_options}fancy"
else else
echo "$(tput setaf 1)Unsupported MK404 graphics option $graphics_flag$(tput sgr 0)" echo "$(tput setaf 1)Unsupported MK404 graphics option $mk404_graphics_flag$(tput sgr 0)"
fi fi
if [[ "$graphics_flag" == "3" || "$graphics_flag" == "4" ]]; then if [[ "$mk404_graphics_flag" == "3" || "$mk404_graphics_flag" == "4" ]]; then
MK404_options="${MK404_options} --colour-extrusion --extrusion Quad_HR" MK404_options="${MK404_options} --colour-extrusion --extrusion Quad_HR"
else else
MK404_options="${MK404_options} --extrusion Line" MK404_options="${MK404_options} --extrusion Line"

652
PF-build.sh
View File

File diff suppressed because it is too large Load Diff