3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,261 Commits 3 Branches 78 Tags 40 MiB
ed2f87f4f5
Commit Graph

421 Commits

Author SHA1 Message Date
XPila
79b9f736aa
Merge pull request #657 from PavelSindler/temp_cal_update 
Temp calibration update
 2018-04-24 15:16:13 +02:00
PavelSindler
8efe66ef99 remove tab 2018-04-24 14:34:49 +02:00
PavelSindler
ffe93b2ca9 whitespace correction 2018-04-24 14:33:48 +02:00
PavelSindler
cc74edfa13 whitespace 2018-04-24 14:23:52 +02:00
PavelSindler
010ceceff9 add another homing after steel sheet is removed; added timeout for pinda cooling; if PINDA doesn't trigger before reaching Z = -1mm, temp. calibration fails 2018-04-24 13:43:51 +02:00
Marek Bel
9bd4d580d7 Use right calibration point. This change is only formal, as both original and new point have same coordinates. 2018-04-23 20:33:25 +02:00
Marek Bel
cccd8246ab Fix world2machine(const float &x, const float &y, float &out_x, float &out_y) not using input parameters if only WORLD2MACHINE_CORRECTION_SHIFT is applied. 2018-04-23 20:33:14 +02:00
PavelSindler
043c8c66be waiting for pinda probe cooling 2018-04-19 16:55:00 +02:00
PavelSindler
5791d9f0d8 EEPROM address conflict fix; forcing selftest can happen only in case that we have TMC2130 drivers 2018-04-18 14:17:28 +02:00
Marek Bel
c88f0108af Fix safety timer. 
Constant parameter greater than 16 bits must by stated as unsigned long.
 2018-04-13 19:30:08 +02:00
PavelSindler
b1bb6841c9
Merge pull request #617 from mkbel/fix_farm_reset_1 
Fix farm reset
 2018-04-13 10:02:54 +02:00
Marek Bel
388d6eea36 Fix printer resets in farm mode if command "PRUSA SN" is received and 32U2 processor is not responding. 2018-04-12 18:44:33 +02:00
Marek Bel
08740356b8 Move "PRUSA SN" gcode to separate function. 2018-04-12 18:41:11 +02:00
XPila
6b5835fd9f
Merge pull request #612 from PavelSindler/M861_gcode 
M861 gcode, temp cal is automaticly activated after calibration process
 2018-04-11 18:45:57 +02:00
PavelSindler
45d1dbbfe0 temp cal. active set to false 2018-04-11 18:37:07 +02:00
PavelSindler
ce66699340 dont use default temp table for new printers and dont automaticly activate temp. cal. (new pinda probes have different characteristics) 2018-04-11 18:36:38 +02:00
PavelSindler
47eab97d2d temp. calibration is automaticly activated after calibration process 2018-04-11 18:16:16 +02:00
PavelSindler
0ba7850146 pinda temp table changed back 2018-04-11 17:40:04 +02:00
XPila
c69524c3fb
Merge pull request #611 from XPila/MK3-V3_2 
removed Configuration_prusa.h
 2018-04-11 17:33:37 +02:00
Robert Pelnar
89efcb84b1 removed Configuration_prusa.h 
fixed - compilation for MK25
 2018-04-11 17:32:31 +02:00
PavelSindler
919fba531a wait for PINDA gcode changed 2018-04-11 16:48:47 +02:00
PavelSindler
f70685a92d
Merge pull request #542 from stahlfabrik/MK3_PINDA_TEMP_WAIT_GCODE 
MK3 Add Gcode to wait for minimum PINDA temp
 2018-04-11 16:40:21 +02:00
Robert Pelnar
92997204a1 Linearity correction - TMC codes for calibration object, variable stored as uint8, range from 1.03 to 1.20 2018-04-03 12:30:35 +02:00
Robert Pelnar
baade7db61 Removed unused files (ST7565R-dogm, digipot) 
renamed functions digipot_init and digipot_current
fixed cond. trans. (menus)
fixed variant files - MK25, MK3
 2018-03-29 23:01:13 +02:00
Robert Pelnar
363a9d24b3 LiquidCrystal class renamed to LiquidCrystal_Prusa 2018-03-29 17:50:43 +02:00
Robert Pelnar
186e630299 New SPI (do not use Arduino SPI class) 
saved ~300bytes flash, 4bytes ram
 2018-03-29 17:42:41 +02:00
XPila
06d5ec5659
Merge pull request #586 from mkbel/ustep_linearity_2 
Ustep linearity
 2018-03-28 19:38:34 +02:00
XPila
ffdd11e960
Merge pull request #587 from XPila/MK3-V3_2 
Mk3 v3 2
 2018-03-28 19:38:20 +02:00
Robert Pelnar
bde097cad1 bugfix - PFW233 - first homing in silent mode Y crash. 2018-03-28 19:22:20 +02:00
Marek Bel
9cb036fbcb Merge remote-tracking branch 'prusa3d/MK3' into ustep_linearity_2 2018-03-28 19:11:02 +02:00
Marek Bel
40a064ffbc Add extruder linearity correction to settings menu. 2018-03-28 18:53:37 +02:00
Marek Bel
678cd17e7b Increase size of EEPROM_TMC2130_WAVE_*_FAC to 16 bits. 2018-03-28 16:13:16 +02:00
Robert Pelnar
cf43b85de9 XYZ calibration - accuracy improvement 2018-03-27 17:27:41 +02:00
PavelSindler
e5faba7226 serial port set back (was previously changed for debugging purposes) 2018-03-15 14:42:03 +01:00
PavelSindler
08ec920d33 merge with upstream 2018-03-15 14:25:17 +01:00
Robert Pelnar
67e90b576a Disabled force selftest 
XYZ calibration tunning
 2018-03-14 16:25:32 +01:00
PavelSindler
863fe1f054 show message that printer is not connected to monitoring on printer start 2018-03-14 15:35:39 +01:00
Robert Pelnar
81cd96b8fe Variant file for MK25 + cond. translation 2018-03-13 23:02:46 +01:00
Robert Pelnar
ac1a56b493 Merge branch 'MK25' into MK3 2018-03-13 20:43:19 +01:00
PavelSindler
f45f206faf sorting files disabled in farm mode, start printer status needs reponse from monitoring 2018-03-13 18:50:11 +01:00
PavelSindler
ddeb7b8c84 statistics improved, initial version of function which forces user to connect printer to monitoring 2018-03-13 18:43:42 +01:00
Robert Pelnar
16f9f35451 static_assert replaced with error directive 2018-03-13 16:47:38 +01:00
PavelSindler
0c97f46f25
Merge pull request #551 from XPila/MK3-new_xyz_cal 
New XYZ calibration with image processing
 2018-03-13 16:17:50 +01:00
Robert Pelnar
65a91b366d New XYZ calibration with image processing 2018-03-13 12:55:35 +01:00
Marek Bel
6b08cdeaf1 Safety timer (disable heaters after 15min idle) 2018-03-12 23:45:10 +01:00
Marek Bel
262e800db7 Safety timer (disable heaters after 15min idle) 2018-03-12 23:35:50 +01:00
Christoph Stahl
1df91e5656 MK3 Add Gcode to wait for minimum PINDA temp 
The PINDA temperature compensation is defined for values above 35C. To achieve an optimal first layer consistently it is vital to start the print with a temperature of >= 35C on the pinda probe.
When doing a manual pinda temperature calibration it is necessary to begin homing and mesh bed leveling at an exact temperature. This gcode is perfect for this.

Example startup code:

G28 W ; home all without mesh bed level
G0 Z50 ; raise Z to not heat PINDA before bed is warm
M104 S215 ; set extruder temp
M140 S60 ; set bed temp
M190 S60 ; wait for bed temp
M109 S215 ; wait for extruder temp
G0 X50 Y50 Z0.15 ; this is a good PINDA heating position
M666 S35 ; the new code - wait until PINDA is >= 35C
G28 W ; home all without mesh bed level
G80 ; mesh bed leveling

See my forum post later for more explaination on my manual temperature calibration procedure. I will link it then.
 2018-03-09 20:46:07 +01:00
Robert Pelnar
976e5a6a19 Temperature calibration - remove steel 2018-03-07 21:45:55 +01:00
Robert Pelnar
e3967e444b SafetyTimer disabled 
Watchdog disabled
watchdog.cpp and watchdog.h source code removed (using directly <avr/wdt.h>)
 2018-03-07 14:13:34 +01:00
XPila
55065cf124
Merge pull request #530 from PavelSindler/temp_cal_fix 
steps per unit changed to 0.95%; changed temp cal. warnings, changed …
 2018-03-06 18:26:37 +01:00
PavelSindler
27659ae69e steps per unit changed to 0.95%; changed temp cal. warnings, changed pin for PINDA probe 2018-03-06 16:48:39 +01:00
Robert Pelnar
a6f900fd3c Merge remote-tracking branch 'upstream/MK25' into MK25 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2018-03-06 15:11:50 +01:00
bubnikv
2b7e50e45b Fix of calculate_extrusion_multipliers(). 
This is a fix of a bug made in the previous commit.
 2018-03-06 13:03:38 +01:00
Marek Bel
67fd467ebe Add fail statistics menu item for MK25. 
As there is only filament sensor and no crash and power interruption detection, squash everything into single screen.
 2018-03-05 21:42:04 +01:00
bubnikv
fc3af0533a Fix of calculate_extrusion_multipliers(). 
This is a fix of a bug made in the previous commit.
 2018-03-05 21:31:31 +01:00
PavelSindler
0f082fa1f7
Merge pull request #518 from PavelSindler/auto_power_2 
Auto power mode for MK25
 2018-03-05 11:42:00 +01:00
PavelSindler
917689b5ce tune menu 2018-03-05 01:23:18 +01:00
PavelSindler
1033bd3cf9 info on serial not used 2018-03-05 00:48:10 +01:00
PavelSindler
ca3ba55ca7 initial version 2018-03-05 00:46:24 +01:00
PavelSindler
f1410a37f2 samle z after xyz cal. added, find_point_xy: initial z coordinate after first hit lowered 2018-03-04 23:49:54 +01:00
PavelSindler
8800793dd1 removing debug code 2018-03-04 20:49:34 +01:00
PavelSindler
ad702c6d1f improved algorithm for first hit, improving sensor point changed, just one calibration round for 4point heatbed (no second run for improving measured coordinates) 2018-03-04 20:21:31 +01:00
PavelSindler
85bc19b77c force selftest if user upgraded from 3.1.2-RC1 or older fw version 2018-02-27 17:52:13 +01:00
PavelSindler
e249e854da dev version: print m114 coordinates when z endstop was triggered 2018-02-26 18:25:47 +01:00
Robert Pelnar
73b0349898 fix - Z movement speed in selftest 
conditional translation for linearity correction and variable resolution
 2018-02-23 16:31:24 +01:00
Robert Pelnar
49832d4d3b Safety timer (disable heaters after 15min idle) 2018-02-22 16:46:17 +01:00
bubnikv
cff7b9b396 Unified the volumetric_multiplier with extrusion_multiply to improve 
numeric accuracy and to reduce compuatitonal load. With this commit,
the numeric rounding is fixed not only for the M221 G-code
(as implemented by the preceding commit), but also for the volumetric
extrusion in general.

Removed the old FILAMENT_SENSOR code, which served the purpose
to modulate the volumetric multiplayer in real time depending
on the measured filament diameter. This feature will certainly not be
used by Prusa Research in the near future as we know of no sensor,
which would offer sufficient accuracy for a reasonable price.
 2018-02-22 14:53:10 +01:00
bubnikv
4e3ea41ba4 Fix of a loss in precission when the extruder multiplier is set 
with M221. For 50um layers, the precision loss leads to holes
in the print.
 2018-02-22 14:52:36 +01:00
PavelSindler
d020f48791
Merge pull request #485 from bubnikv/M221_fix 
Unified the volumetric_multiplier with extrusion_multiply to improve
 2018-02-22 14:17:09 +01:00
PavelSindler
03a1bef4ee
Merge pull request #489 from PavelSindler/xyz_corrections_3 
typo fixed
 2018-02-22 13:41:22 +01:00
PavelSindler
819f2fd2b3 typo fixed 2018-02-22 13:40:31 +01:00
XPila
30bb84a7a7
Merge pull request #487 from PavelSindler/eeprom_printer_versions 
Eeprom hw versions
 2018-02-22 11:48:26 +01:00
XPila
ad33d3efd1
Merge pull request #488 from PavelSindler/xyz_corrections_3 
Xyz corrections
 2018-02-22 11:48:06 +01:00
PavelSindler
a4b3389dfa M45 verbosity, steel sheet define, minor modifications in xyz cal 2018-02-22 10:38:46 +01:00
PavelSindler
0323af531d printer types and motherboard types added to eeprom; min extrude temp lowered because of woodfil 2018-02-22 00:09:12 +01:00
Robert Pelnar
c5175e97ec Pinout, conditional translation and variant file for MK2 2018-02-21 15:19:34 +01:00
bubnikv
ba49c21f17 Unified the volumetric_multiplier with extrusion_multiply to improve 
numeric accuracy and to reduce compuatitonal load. With this commit,
the numeric rounding is fixed not only for the M221 G-code
(as implemented by the preceding commit), but also for the volumetric
extrusion in general.

Removed the old FILAMENT_SENSOR code, which served the purpose
to modulate the volumetric multiplayer in real time depending
on the measured filament diameter. This feature will certainly not be
used by Prusa Research in the near future as we know of no sensor,
which would offer sufficient accuracy for a reasonable price.
 2018-02-21 11:25:21 +01:00
XPila
74e6ff67d3
Merge pull request #482 from bubnikv/M221_fix 
M221 fix
 2018-02-20 19:10:07 +01:00
Robert Pelnar
e2e48bfd71 SD speed test (DEBUG) 
homeaxis - fix set_destination_to_current
 2018-02-20 18:50:20 +01:00
bubnikv
ee5949c56e Fix of a loss in precission when the extruder multiplier is set 
with M221. For 50um layers, the precision loss leads to holes
in the print.
 2018-02-20 15:30:18 +01:00
Robert Pelnar
57499dc6a0 M350 for E axis (8, 16, 32, 64, 128 microsteps) 2018-02-15 15:40:49 +01:00
Robert Pelnar
79caf3d9c6 tmc2130 optimalization, accurate homing and microstep linearity correction 
dcode D12 removed (no longer needed)
homeaxis optimized + xy home calibration support
new eeprom variables
new lcd menu edit types (byte3, mres, wfac), new menu "Experimental"
currents adjusted
 2018-02-15 04:17:58 +01:00
PavelSindler
08c59419da
Merge pull request #468 from PavelSindler/M600_currents 
M600 unload current
 2018-02-12 09:41:13 +01:00
Robert Pelnar
b08636c554 fix - conditional translation for DEBUG build 2018-02-08 18:56:15 +01:00
PavelSindler
a719ae1b01 whitespace 2018-02-08 16:33:43 +01:00
PavelSindler
ebe1c10423 lower current for unload 2018-02-08 16:32:27 +01:00
PavelSindler
9c4ce3623d M600 unload current 2018-02-08 16:11:51 +01:00
PavelSindler
29978c4126 TACH_1 must be defined to enable print fan error 2018-02-07 11:10:04 +01:00
PavelSindler
abf956b86f init 2018-02-06 09:19:27 +01:00
PavelSindler
df754a322b MK25 merge Xpila's changes 2018-02-06 08:33:26 +01:00
PavelSindler
3bd892135a erase eeprom section which belongs to M500 gcode in case that version was changed and default settings are used 2018-02-05 16:49:06 +01:00
Robert Pelnar
4d8807e924 bugfix - failstats (total counters) reset to zero for empty eeprom (0xff) 2018-02-02 15:59:37 +01:00
PavelSindler
2dd2c971e2 whitespace 2018-02-01 20:25:19 +01:00
Robert Pelnar
8562235440 MK2.5 port - compilable version 2018-02-01 20:08:11 +01:00
PavelSindler
d92f6292aa unload with lowered current 2018-02-01 17:43:03 +01:00
PavelSindler
9d8191323b
Merge pull request #440 from XPila/3.1.1-RC6 
Extruder stealthChop and constant-off-time mode.
 2018-01-31 20:21:02 +01:00
XPila
822dd8ff9c
Merge pull request #448 from PavelSindler/eeprom_versions 
EEPROM version change: inform user on LCD that default settings were loaded
 2018-01-31 20:06:19 +01:00
Robert Pelnar
adc69eda18 PINDA temp. calibration warning messages. 2018-01-31 17:03:33 +01:00
Robert Pelnar
4c5618c371 failstats - reset "last print" counters 
card - new member variable "paused" (bool)
 2018-01-31 15:09:36 +01:00
Robert Pelnar
daaac2fb88 fail stats 2018-01-30 19:49:40 +01:00
Robert Pelnar
210b97d16d New fail stats (global, last print), crashdetection X and Y separated 2018-01-30 13:10:36 +01:00
PavelSindler
88f248cb77 Inform user that hardcoded default settings were loaded (EEPROM version change) 2018-01-30 11:31:44 +01:00
PavelSindler
cbcfcee48f PID cal. is not sending OK periodically, print fan error pauses print in octoprint (not disconnecting), initialize serial line when swithing in settings menu 2018-01-25 15:23:11 +01:00
XPila
556205d993
Merge pull request #432 from PavelSindler/invalid_gcodes 
invalid / unknown gcodes reported on serial
 2018-01-24 00:12:47 +01:00
XPila
975ed14cb6
Merge pull request #431 from PavelSindler/fan_error_resume 
SD card long pause update
 2018-01-24 00:12:33 +01:00
XPila
b2ba72ffcd
Merge pull request #411 from PavelSindler/typo_fixed 
typo fixed
 2018-01-24 00:10:28 +01:00
XPila
777dcf072b
Merge pull request #430 from bubnikv/MK3_fsensor_fullrate 
Optimization of the filament sensor.
 2018-01-24 00:10:00 +01:00
PavelSindler
70ff22571f minor change 2018-01-23 20:04:18 +01:00
PavelSindler
3adedb558b invalid / unknown codes reported on serial 2018-01-23 20:01:02 +01:00
PavelSindler
64a709c097 removed temporary debuging code 2018-01-23 19:14:52 +01:00
PavelSindler
05e0abbd9d startFileprint delayed 2018-01-23 19:11:04 +01:00
bubnikv
44dc12005f Optimization of the filament sensor. 2018-01-23 16:47:42 +01:00
PavelSindler
c38458eb67 init 2018-01-23 16:21:43 +01:00
XPila
09e0c566e8
Merge pull request #420 from bubnikv/MK3_stepper_blocking 
Mk3 stepper blocking
 2018-01-23 13:15:59 +01:00
bubnikv
69f97e0ec3 Separated the "Unknown" build from the "Development" build. 
Documented purpose of the various build types.
 2018-01-22 17:41:05 +01:00
bubnikv
a94e266cf1 Documented CPU load and frequency of the following interrupts: 
9.  ISR(INT7_vect) 			- Fan signal interrupt
26. ISR(M_USARTx_RX_vect)	- USB to serial RX
37. ISR(USART1_RX_vect)		- R-PI serial RX
 2018-01-20 16:20:51 +01:00
bubnikv
815dfcb14b Implemented a stepper timer reset after a long blocking cli() 
or DISABLE_STEPPER_DRIVER_INTERRUPT().
If this is not done, the stepper interrupt would likely overflow,
leading to a maximum 32ms delay before the stepper interrupt wakes up.
In addition, the stepper timer overflow error would be reported
by the debug builds.
 2018-01-20 15:39:21 +01:00
bubnikv
9e534c1990 Minimize risk of stepper routine interrupt blocking by reorganizing 
the routine to move the G-code line length from the command queue
to the planner queue.
 2018-01-20 14:37:22 +01:00
bubnikv
330f1576fc Support for debug builds: 
A build version and repository is displayed on the welcome screen,
D-codes, stack overflow check and stepper timer overflow check
are enabled in the debug mode.
 2018-01-18 16:24:25 +01:00
PavelSindler
b5f8b1d97c
Merge pull request #412 from PavelSindler/debug_version 
initial message for debugging fw version
 2018-01-18 13:18:16 +01:00
PavelSindler
e60cb2a79e unload filament sequence same as in M600 2018-01-17 21:54:34 +01:00
PavelSindler
4843f2c48e initial message not shown on release candidate versions 2018-01-17 17:38:34 +01:00
PavelSindler
bfa675c1a4 initial message for debugging fw version 2018-01-17 16:00:19 +01:00
PavelSindler
b73520bcea successfull -> successful 2018-01-17 14:40:37 +01:00
PavelSindler
fbf947b75c maiden eeprom: tmc2130_mode is set to normal 2018-01-16 16:56:58 +01:00
XPila
026f68fd6f
Merge pull request #404 from PavelSindler/xyz_fixes 
xyz homing hotfix, xyz cal. status changed
 2018-01-16 01:39:57 +01:00
XPila
9efa1d3a03
Merge pull request #403 from PavelSindler/M600_update 
timeout fix and unload message shortened
 2018-01-16 01:39:18 +01:00
PavelSindler
06c6cc119b xyz homing hotfix, xyz cal. status changed 2018-01-16 01:00:09 +01:00
PavelSindler
d8117eab66 timeout fix and MSG_UNLOAD_SUCCESSFULL message shortened 2018-01-15 17:39:42 +01:00
Robert Pelnar
981a681e52 Temperature ISR synchronization, M600 - faster unload 2018-01-15 17:29:07 +01:00
XPila
87ffb0b193
Merge pull request #400 from PavelSindler/M600_update 
M600 update
 2018-01-15 15:27:41 +01:00
PavelSindler
9e7686b77f unload changes reverted back 2018-01-15 11:35:49 +01:00
PavelSindler
c36af887b7 M600 has timeout for nozzle, different procedure for unload 2018-01-15 11:30:28 +01:00
Robert Pelnar
9aedaa8fe7 build 146 
hard limits
fsensor overflow fix
 2018-01-14 23:59:43 +01:00
PavelSindler
8bd84ba4fd
Merge pull request #396 from XPila/MK3 
Mk3
 2018-01-12 22:08:50 +01:00
bubnikv
82304a2268 Slight optimization of the fan speed interrupt routine by accessing 
the Arduino millis() without locking interrupts.
 2018-01-12 21:16:29 +01:00
Robert Pelnar
ebf6d08fae Crash detection - message on lcd (PFW-115) 2018-01-12 21:02:49 +01:00
PavelSindler
1fbed53200 initial 2018-01-12 20:01:22 +01:00
bubnikv
cfae8f859d
Merge branch 'MK3' into fw_versions 2018-01-11 16:58:47 +01:00
PavelSindler
087532085f development fw versions has initial message for warning 2018-01-11 15:50:26 +01:00
Robert Pelnar
0d269261e4 PFW-110 - load filament - beep when loading finished. 2018-01-10 18:50:16 +01:00
Robert Pelnar
43010b30b4 Build 143f 
Crashdetection improoved, blocking temperature ISR fixed, limits for silent mode adjusted.
 2018-01-09 19:54:07 +01:00
Robert Pelnar
0a2087c1cb build 143e 
Linear advance disabled
Max feedrate reduced to 200mm/s
Silent max accel reduced to 984mm/s^2
some debug logs removed, tmc_init - log message fixed
 2018-01-04 18:08:22 +01:00
Robert Pelnar
8a5ba89a9c Missing serial characters debuging 
disabled fan ISR
disabled fsensor ISR
disabled linear advance
build 143b
 2018-01-02 20:55:33 +01:00
Michal Průša
734639c1da Unload filament tweak 
unload filament now has longer and faster slow retract.
 2017-12-29 17:53:12 +01:00
Phil Dubach
7fb1234855 Turn off bed heater after temp calibration 
After finishing the temperature calibration, turn off the bed heater
right away, before waiting for the user to acknowledge completion.
 2017-12-28 23:47:27 -08:00
Michal Průša
f71f133e80 power panic polished 
Retraction set correctly to have minimum missing line
Z motor current not lowered that drascialy
Extruder motor turning off instantly
Beeping added to the end
 2017-12-28 23:26:06 +01:00
Michal Průša
f1c741d027 Filament autoloading improved and minor tweaks 
Filament autoloading now acts like normal loading (Error message pops out if nozzle too cold, Printer asks if should extrude more when done loading)

Autoloading now unable to turn on when filament sensor is turned off or not responding

Color not right changed to color not correct to avoid slight confusion
 2017-12-28 18:59:57 +01:00
Robert Pelnar
bd58718d9d dummy "ok" response 
build 139 (RC4)
 2017-12-28 02:45:05 +01:00
Robert Pelnar
e064133a04 Merge remote-tracking branch 'upstream/MK3' into MK3 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2017-12-28 01:37:13 +01:00