Merge pull request prusa3d#3531 from wavexx/mk311_sync

Synchronize MK3 with MK3_3.11.1

Author: wavexx

.editorconfig

@@ -15,4 +15,3 @@ max_line_length             = 100
 
 [lang/po/*.po]
 end_of_line                 = crlf
-trim_trailing_whitespace    = false

.gitignore

@@ -1,58 +1,25 @@
-.settings
-.project
-.cproject
-.vscode
-Debug
+# IDE data
+/.settings
+/.project
+/.cproject
+/.vscode
+
+# Temporary configuration
+/Firmware/Configuration_prusa.h
+
+# Temporary language files
+/lang/po/*.mo
+/lang/tmp/
+/lang/Firmware-intl.hex
+/lang/Firmware-intl-en_*.hex
+
+# Temporary files and directories
+*[~#]
+*.tmp
+*.bak
+.DS_Store
 __pycache__
-Firmware/Configuration_prusa.h
-Firmware/Doc
-/Firmware/.vs/Firmware/v14
-/Firmware/__vm
-/Firmware/Firmware.sln
-/Firmware/Firmware.vcxproj
-/Firmware/Firmware.vcxproj.filters
-/Firmware/Firmware - Shortcut.lnk
-/Firmware/variants/1_75mm_MK3-MMU-EINSy10a-E3Dv6full.h.bak
-/Firmware/Marlin_main.cpp~RF12cfae7.TMP
-/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h.bak
-/html
-/latex
-/Doxyfile
-/Firmware/builds/1_75mm_MK3-EINY04-E3Dv6full
-/Firmware/Configuration_prusa.h.bak
-/Firmware/Configuration_prusa_backup.h
-/Firmware/ultralcd_implementation_hitachi_HD44780.h.bak
-/Firmware/ultralcd.cpp.bak
-/Firmware/temperature.cpp.bak
-/Firmware/pins.h.bak
-/Firmware/Marlin_main.cpp.bak
-/Firmware/language_pl.h.bak
-/Firmware/language_it.h.bak
-/Firmware/language_es.h.bak
-/Firmware/language_en.h.bak
-/Firmware/language_de.h.bak
-/Firmware/language_cz.h.bak
-/Firmware/variants/1_75mm_MK2-MultiMaterial-RAMBo13a-E3Dv6full.h
-/Firmware/variants/1_75mm_MK2-MultiMaterial-RAMBo10a-E3Dv6full.h
-/Firmware/variants/1_75mm_MK2-EINY01-E3Dv6full.h.bak
-/Firmware/variants/1_75mm_MK1-RAMBo13a-E3Dv6full.h
-/Firmware/variants/1_75mm_MK1-RAMBo10a-E3Dv6full.h
-/lang/*.bin
-/lang/*.hex
-/lang/*.dat
-/lang/*.tmp
-/lang/*.out
-/lang/not_tran*.txt
-/lang/not_used*.txt
-/lang/progmem1.chr
-/lang/progmem1.lss
-/lang/progmem1.txt
-/lang/progmem1.var
-/lang/text.sym
-/lang/textaddr.txt
+
+# Generated files
 /build-env/
-/Firmware/Firmware.vcxproj
-/Firmware/Configuration_prusa_bckp.h
-/Firmware/variants/printers.h
-Configuration.tmp
-config.tmp
+/Firmware/Doc/

.travis.yml

@@ -1,6 +1,6 @@
 dist: focal
 before_install:
-  - sudo apt-get install -y ninja-build
+  - sudo apt-get install -y ninja-build python3-polib python3-pyelftools
   # Arduino IDE adds a lot of noise caused by network traffic, trying to firewall it off
   - sudo iptables -P INPUT DROP
   - sudo iptables -P FORWARD DROP

Firmware/Configuration.h

@@ -17,7 +17,7 @@ extern PGM_P sPrinterName;
 
 // Firmware version
 #define FW_MAJOR 3
-#define FW_MINOR 10
+#define FW_MINOR 11
 #define FW_REVISION 1
 //#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.
@@ -27,7 +27,7 @@ extern PGM_P sPrinterName;
     #define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION)
 #endif
 
-#define FW_COMMIT_NR 4697
+#define FW_COMMIT_NR 4987
 
 // FW_VERSION_UNKNOWN means this is an unofficial build.
 // The firmware should only be checked into github with this symbol.

Firmware/Marlin.h

@@ -504,6 +504,7 @@ void raise_z_above(float target, bool plan=true);
 
 extern "C" void softReset();
 void stack_error();
+void pullup_error(bool fromTempISR);
 
 extern uint32_t IP_address;