Skip to content

Commit 0e7f2b3

Browse files
authored
Merge pull request prusa3d#3531 from wavexx/mk311_sync
Synchronize MK3 with MK3_3.11.1
2 parents fd702c8 + e37435b commit 0e7f2b3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+39433
-35811
lines changed

.editorconfig

-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,3 @@ max_line_length = 100
1515

1616
[lang/po/*.po]
1717
end_of_line = crlf
18-
trim_trailing_whitespace = false

.gitignore

+23-56
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,25 @@
1-
.settings
2-
.project
3-
.cproject
4-
.vscode
5-
Debug
1+
# IDE data
2+
/.settings
3+
/.project
4+
/.cproject
5+
/.vscode
6+
7+
# Temporary configuration
8+
/Firmware/Configuration_prusa.h
9+
10+
# Temporary language files
11+
/lang/po/*.mo
12+
/lang/tmp/
13+
/lang/Firmware-intl.hex
14+
/lang/Firmware-intl-en_*.hex
15+
16+
# Temporary files and directories
17+
*[~#]
18+
*.tmp
19+
*.bak
20+
.DS_Store
621
__pycache__
7-
Firmware/Configuration_prusa.h
8-
Firmware/Doc
9-
/Firmware/.vs/Firmware/v14
10-
/Firmware/__vm
11-
/Firmware/Firmware.sln
12-
/Firmware/Firmware.vcxproj
13-
/Firmware/Firmware.vcxproj.filters
14-
/Firmware/Firmware - Shortcut.lnk
15-
/Firmware/variants/1_75mm_MK3-MMU-EINSy10a-E3Dv6full.h.bak
16-
/Firmware/Marlin_main.cpp~RF12cfae7.TMP
17-
/Firmware/variants/1_75mm_MK3-EINSy10a-E3Dv6full.h.bak
18-
/html
19-
/latex
20-
/Doxyfile
21-
/Firmware/builds/1_75mm_MK3-EINY04-E3Dv6full
22-
/Firmware/Configuration_prusa.h.bak
23-
/Firmware/Configuration_prusa_backup.h
24-
/Firmware/ultralcd_implementation_hitachi_HD44780.h.bak
25-
/Firmware/ultralcd.cpp.bak
26-
/Firmware/temperature.cpp.bak
27-
/Firmware/pins.h.bak
28-
/Firmware/Marlin_main.cpp.bak
29-
/Firmware/language_pl.h.bak
30-
/Firmware/language_it.h.bak
31-
/Firmware/language_es.h.bak
32-
/Firmware/language_en.h.bak
33-
/Firmware/language_de.h.bak
34-
/Firmware/language_cz.h.bak
35-
/Firmware/variants/1_75mm_MK2-MultiMaterial-RAMBo13a-E3Dv6full.h
36-
/Firmware/variants/1_75mm_MK2-MultiMaterial-RAMBo10a-E3Dv6full.h
37-
/Firmware/variants/1_75mm_MK2-EINY01-E3Dv6full.h.bak
38-
/Firmware/variants/1_75mm_MK1-RAMBo13a-E3Dv6full.h
39-
/Firmware/variants/1_75mm_MK1-RAMBo10a-E3Dv6full.h
40-
/lang/*.bin
41-
/lang/*.hex
42-
/lang/*.dat
43-
/lang/*.tmp
44-
/lang/*.out
45-
/lang/not_tran*.txt
46-
/lang/not_used*.txt
47-
/lang/progmem1.chr
48-
/lang/progmem1.lss
49-
/lang/progmem1.txt
50-
/lang/progmem1.var
51-
/lang/text.sym
52-
/lang/textaddr.txt
22+
23+
# Generated files
5324
/build-env/
54-
/Firmware/Firmware.vcxproj
55-
/Firmware/Configuration_prusa_bckp.h
56-
/Firmware/variants/printers.h
57-
Configuration.tmp
58-
config.tmp
25+
/Firmware/Doc/

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dist: focal
22
before_install:
3-
- sudo apt-get install -y ninja-build
3+
- sudo apt-get install -y ninja-build python3-polib python3-pyelftools
44
# Arduino IDE adds a lot of noise caused by network traffic, trying to firewall it off
55
- sudo iptables -P INPUT DROP
66
- sudo iptables -P FORWARD DROP

Firmware/Configuration.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ extern PGM_P sPrinterName;
1717

1818
// Firmware version
1919
#define FW_MAJOR 3
20-
#define FW_MINOR 10
20+
#define FW_MINOR 11
2121
#define FW_REVISION 1
2222
//#define FW_FLAVOR RC //uncomment if DEBUG, DEVEL, APLHA, BETA or RC
2323
//#define FW_FLAVERSION 1 //uncomment if FW_FLAVOR is defined and versioning is needed.
@@ -27,7 +27,7 @@ extern PGM_P sPrinterName;
2727
#define FW_VERSION STR(FW_MAJOR) "." STR(FW_MINOR) "." STR(FW_REVISION) "-" STR(FW_FLAVOR) "" STR(FW_FLAVERSION)
2828
#endif
2929

30-
#define FW_COMMIT_NR 4697
30+
#define FW_COMMIT_NR 4987
3131

3232
// FW_VERSION_UNKNOWN means this is an unofficial build.
3333
// The firmware should only be checked into github with this symbol.

Firmware/Marlin.h

+1
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,7 @@ void raise_z_above(float target, bool plan=true);
504504

505505
extern "C" void softReset();
506506
void stack_error();
507+
void pullup_error(bool fromTempISR);
507508

508509
extern uint32_t IP_address;
509510

0 commit comments

Comments
 (0)