From 8289fcf2434014bfbfa60853618fbc3467f64332 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Tue, 28 Apr 2020 13:39:06 +0200 Subject: [PATCH 1/3] Added RC3 detection in PF-build.sh As we we got a RC3 version I have updated also `PF-build.sh` to detect it correctly. --- PF-build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PF-build.sh b/PF-build.sh index 8f1fa247..4244dc16 100755 --- a/PF-build.sh +++ b/PF-build.sh @@ -56,7 +56,7 @@ # Some may argue that this is only used by a script, BUT as soon someone accidentally or on purpose starts Arduino IDE # it will use the default Arduino IDE folders and so can corrupt the build environment. # -# Version: 1.0.6-Build_13 +# Version: 1.0.6-Build_14 # Change log: # 12 Jan 2019, 3d-gussner, Fixed "compiler.c.elf.flags=-w -Os -Wl,-u,vfprintf -lprintf_flt -lm -Wl,--gc-sections" in 'platform.txt' # 16 Jan 2019, 3d-gussner, Build_2, Added development check to modify 'Configuration.h' to prevent unwanted LCD messages that Firmware is unknown @@ -118,6 +118,7 @@ # 15 Dec 2019, 3d-gussner, Prepare for switch to Prusa3d/PF-build-env repository # 15 Dec 2019, 3d-gussner, Fix Audrino user preferences for the chosen board. # 17 Dec 2019, 3d-gussner, Fix "timer0_fract = 0" warning by using Arduino_boards v1.0.3 +# 28 Apr 2020, 3d-gussner, Added RC3 detection #### Start check if OSTYPE is supported OS_FOUND=$( command -v uname) @@ -527,7 +528,7 @@ do # Check development status DEV_CHECK=$(grep --max-count=1 "\bFW_VERSION\b" $SCRIPT_PATH/Firmware/Configuration.h | sed -e's/ */ /g'|cut -d '"' -f2|sed 's/\.//g'|cut -d '-' -f2) if [ -z "$DEV_STATUS_SELECTED" ] ; then - if [[ "$DEV_CHECK" == "RC1" || "$DEV_CHECK" == "RC2" ]] ; then + if [[ "$DEV_CHECK" == "RC1" || "$DEV_CHECK" == "RC2" || "$DEV_CHECK" == "RC3" ]] ; then DEV_STATUS="RC" elif [[ "$DEV_CHECK" == "ALPHA" ]]; then DEV_STATUS="ALPHA" From ad4e9482a008ce83ad4d001fe5b9b8105fbfbbc2 Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Sun, 3 May 2020 14:19:38 +0200 Subject: [PATCH 2/3] Accecpt all RCx as RC versions Thanks to @deliopoulos --- PF-build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PF-build.sh b/PF-build.sh index 4244dc16..15bc4335 100755 --- a/PF-build.sh +++ b/PF-build.sh @@ -56,7 +56,7 @@ # Some may argue that this is only used by a script, BUT as soon someone accidentally or on purpose starts Arduino IDE # it will use the default Arduino IDE folders and so can corrupt the build environment. # -# Version: 1.0.6-Build_14 +# Version: 1.0.6-Build_15 # Change log: # 12 Jan 2019, 3d-gussner, Fixed "compiler.c.elf.flags=-w -Os -Wl,-u,vfprintf -lprintf_flt -lm -Wl,--gc-sections" in 'platform.txt' # 16 Jan 2019, 3d-gussner, Build_2, Added development check to modify 'Configuration.h' to prevent unwanted LCD messages that Firmware is unknown @@ -119,6 +119,7 @@ # 15 Dec 2019, 3d-gussner, Fix Audrino user preferences for the chosen board. # 17 Dec 2019, 3d-gussner, Fix "timer0_fract = 0" warning by using Arduino_boards v1.0.3 # 28 Apr 2020, 3d-gussner, Added RC3 detection +# 03 May 2020, deliopoulos, Accept all RCx as RC versions #### Start check if OSTYPE is supported OS_FOUND=$( command -v uname) @@ -528,7 +529,7 @@ do # Check development status DEV_CHECK=$(grep --max-count=1 "\bFW_VERSION\b" $SCRIPT_PATH/Firmware/Configuration.h | sed -e's/ */ /g'|cut -d '"' -f2|sed 's/\.//g'|cut -d '-' -f2) if [ -z "$DEV_STATUS_SELECTED" ] ; then - if [[ "$DEV_CHECK" == "RC1" || "$DEV_CHECK" == "RC2" || "$DEV_CHECK" == "RC3" ]] ; then + if [[ "$DEV_CHECK" == *"RC"* ]] ; then DEV_STATUS="RC" elif [[ "$DEV_CHECK" == "ALPHA" ]]; then DEV_STATUS="ALPHA" From 943ea988f903677ce4a5319a4caf34a73f5cf62a Mon Sep 17 00:00:00 2001 From: 3d-gussner <3d.gussner@gmail.com> Date: Wed, 6 May 2020 10:54:16 +0200 Subject: [PATCH 3/3] Adding copy of `not_tran.txt` and `not_used.txt` to make it easier to find not translated and unused messages. This will hopfully improve the translation process. --- PF-build.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/PF-build.sh b/PF-build.sh index 15bc4335..c318c464 100755 --- a/PF-build.sh +++ b/PF-build.sh @@ -56,7 +56,7 @@ # Some may argue that this is only used by a script, BUT as soon someone accidentally or on purpose starts Arduino IDE # it will use the default Arduino IDE folders and so can corrupt the build environment. # -# Version: 1.0.6-Build_15 +# Version: 1.0.6-Build_16 # Change log: # 12 Jan 2019, 3d-gussner, Fixed "compiler.c.elf.flags=-w -Os -Wl,-u,vfprintf -lprintf_flt -lm -Wl,--gc-sections" in 'platform.txt' # 16 Jan 2019, 3d-gussner, Build_2, Added development check to modify 'Configuration.h' to prevent unwanted LCD messages that Firmware is unknown @@ -120,6 +120,8 @@ # 17 Dec 2019, 3d-gussner, Fix "timer0_fract = 0" warning by using Arduino_boards v1.0.3 # 28 Apr 2020, 3d-gussner, Added RC3 detection # 03 May 2020, deliopoulos, Accept all RCx as RC versions +# 05 May 2020, 3d-gussner, Make a copy of `not_tran.txt`and `not_used.txt` as `not_tran_$VARIANT.txt`and `not_used_$VARIANT.txt` +# After compiling All multilanguage vairants it makes it easier to find missing or unused transltions. #### Start check if OSTYPE is supported OS_FOUND=$( command -v uname) @@ -684,6 +686,8 @@ do ./lang-build.sh || exit 32 # Combine compiled firmware with languages ./fw-build.sh || exit 33 + cp not_tran.txt not_tran_$VARIANT.txt + cp not_used.txt not_used_$VARIANT.txt echo "$(tput sgr 0)" # Check if the motherboard is an EINSY and if so only one hex file will generated MOTHERBOARD=$(grep --max-count=1 "\bMOTHERBOARD\b" $SCRIPT_PATH/Firmware/variants/$VARIANT.h | sed -e's/ */ /g' |cut -d ' ' -f3)