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

Merge branch 'MK3_3.11.0' into MK3_3.11.0

Browse Source
This commit is contained in:
Alex Voinea 2022-02-12 23:01:02 +01:00 committed by GitHub
commit 480c30221e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Firmware/Configuration.h
View File

@ -17,17 +17,17 @@ extern PGM_P sPrinterName;
// Firmware version // Firmware version
#define FW_MAJOR 3 #define FW_MAJOR 3
#define FW_MINOR 10 #define FW_MINOR 11
#define FW_REVISION 1 #define FW_REVISION 0
//#define FW_FLAVOR RC //uncomment if DEBUG, DEVEL, APLHA, BETA or RC #define FW_FLAVOR RC //uncomment if DEBUG, DEVEL, APLHA, BETA or RC
//#define FW_FLAVERSION 1 //uncomment if FW_FLAVOR is defined and versioning is needed. #define FW_FLAVERSION 1 //uncomment if FW_FLAVOR is defined and versioning is needed.
#ifndef FW_FLAVOR #ifndef FW_FLAVOR
#define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION)
#else #else
#define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION) #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION)
#endif #endif
#define FW_COMMIT_NR 4697 #define FW_COMMIT_NR 4842
// FW_VERSION_UNKNOWN means this is an unofficial build. // FW_VERSION_UNKNOWN means this is an unofficial build.
// The firmware should only be checked into github with this symbol. // The firmware should only be checked into github with this symbol.

2
Firmware/Marlin_main.cpp
View File

@ -4550,7 +4550,7 @@ void process_commands()
#elif defined(BOOTAPP) //this is a safety precaution. This is because the new bootloader turns off the heaters, but the old one doesn't. The watchdog should be used most of the time. #elif defined(BOOTAPP) //this is a safety precaution. This is because the new bootloader turns off the heaters, but the old one doesn't. The watchdog should be used most of the time.
asm volatile("jmp 0x3E000"); asm volatile("jmp 0x3E000");
#endif #endif
}else if (code_seen_P("fv")) { // PRUSA fv } else if (code_seen_P(PSTR("fv"))) { // PRUSA fv
// get file version // get file version
#ifdef SDSUPPORT #ifdef SDSUPPORT
card.openFileReadFilteredGcode(strchr_pointer + 3,true); card.openFileReadFilteredGcode(strchr_pointer + 3,true);

5
lang/lang-build.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# #
# Version 1.0.2 Build 27 # Version 1.0.2 Build 28
# #
# lang-build.sh - multi-language support script # lang-build.sh - multi-language support script
# generate lang_xx.bin (language binary file) # generate lang_xx.bin (language binary file)
@ -57,6 +57,7 @@
# 25 Jan. 2022, 3d-gussner, Fix check # 25 Jan. 2022, 3d-gussner, Fix check
# Update documentation # Update documentation
# 10 Feb. 2022, 3d-gussner, Use SRCDIR for compatibility with build server # 10 Feb. 2022, 3d-gussner, Use SRCDIR for compatibility with build server
# 11 Feb. 2022, 3d-gussner, Change to python3
############################################################################# #############################################################################
# #
# Config: # Config:
@ -162,7 +163,7 @@ generate_binary()
rm -f lang_$1.dat rm -f lang_$1.dat
LNG=$1 LNG=$1
#check lang dictionary #check lang dictionary
./lang-check.py $1 #--no-warning python3 lang-check.py $1 #--no-warning
#create lang_xx.tmp - different processing for 'en' language #create lang_xx.tmp - different processing for 'en' language
if [[ "$1" = "en" || ! -f "lang_en.max" ]]; then if [[ "$1" = "en" || ! -f "lang_en.max" ]]; then
#remove comments and empty lines #remove comments and empty lines

7
lang/lang-import.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# #
# Version 1.0.1 Build 24 # Version 1.0.1 Build 25
# #
# lang-import.sh - multi-language support script # lang-import.sh - multi-language support script
# for importing translated xx.po # for importing translated xx.po
@ -34,6 +34,7 @@
# translations # translations
# new argruments `--information` `--import-check` # new argruments `--information` `--import-check`
# 11 Jan. 2022, ingbrzy, Add Slovak letters # 11 Jan. 2022, ingbrzy, Add Slovak letters
# 11 Feb. 2022, 3d-gussner, Change to python3
############################################################################# #############################################################################
# Config: # Config:
if [ -z "$CONFIG_OK" ]; then eval "$(cat config.sh)"; fi if [ -z "$CONFIG_OK" ]; then eval "$(cat config.sh)"; fi
@ -467,8 +468,8 @@ sed -i 's/""/"\\x00"/g' lang_en_$LNG.txt
#remove CR #remove CR
sed -i "s/\r//g" lang_en_$LNG.txt sed -i "s/\r//g" lang_en_$LNG.txt
#check new lang #check new lang
./../../lang-check.py $LNG --warn-empty python3 ../../lang-check.py $LNG --warn-empty
./../../lang-check.py $LNG --information >$LNG-output.txt python3 ../../lang-check.py $LNG --information >$LNG-output.txt
echo >&2 echo >&2
echo "$(tput setaf 2)lang-import.sh finished$(tput sgr 0)">&2 echo "$(tput setaf 2)lang-import.sh finished$(tput sgr 0)">&2