Robert Pelnar
|
ced74b7ec2
|
Merge remote-tracking branch 'upstream/MK3' into MK3
|
2018-10-04 13:53:00 +02:00 |
|
Robert Pelnar
|
7882b3c975
|
Update fsensor in Manage_inactivity instead of main loop.
|
2018-10-03 17:29:24 +02:00 |
|
PavelSindler
|
bba1ffdb65
|
version change
|
2018-09-27 21:13:06 +02:00 |
|
PavelSindler
|
aefb4e5c09
|
Merge pull request #1200 from XPila/MK3
Filament sensor - fix invalid calculation of fsensor_counter in LA st…
|
2018-09-27 21:05:33 +02:00 |
|
Robert Pelnar
|
e50025cc7d
|
static_assert - portable solution compatible with C++98
|
2018-09-27 19:59:29 +02:00 |
|
PavelSindler
|
7e9220ada2
|
Merge pull request #1198 from PavelSindler/communication_timeouts
communication timeouts fix
|
2018-09-27 11:23:58 +02:00 |
|
Robert Pelnar
|
c2f535b619
|
Filament sensor - fix invalid calculation of fsensor_counter in LA stepper.
+decreased additional check sensitivity/sctrictness
|
2018-09-26 18:59:07 +02:00 |
|
PavelSindler
|
e6a00b8f53
|
send busy messages when checking for filament presence
|
2018-09-25 19:14:57 +02:00 |
|
Marek Bel
|
d80fcab66c
|
Disable filament sensor response quality check.
|
2018-09-25 15:50:50 +02:00 |
|
Marek Bel
|
19c1ba6274
|
Remove duplicate condition. This condition was already in if(mmu_enabled) {} else branch.
|
2018-09-25 14:25:03 +02:00 |
|
mkbel
|
0e7afc67ca
|
Merge pull request #1175 from PavelSindler/eeprom_version
M500 EEPROM version update and M500 EEPROM block size check
|
2018-09-24 16:19:55 +02:00 |
|
PavelSindler
|
cd438c5c00
|
whitespace
|
2018-09-24 16:01:31 +02:00 |
|
PavelSindler
|
740e922b87
|
EEPROM M500 block size check for reading stored data added
|
2018-09-24 16:00:23 +02:00 |
|
PavelSindler
|
053b94b711
|
remove "start" duplicity in setup
|
2018-09-24 14:57:46 +02:00 |
|
PavelSindler
|
d8dc2eef7a
|
if max_feedrate_silent and max_acceleration_units_per_sq_second_silent were never stored to eeprom, use default values; eeprom_version changed back to V2
|
2018-09-21 15:42:28 +02:00 |
|
PavelSindler
|
1c33b673c0
|
comment update
|
2018-09-19 18:43:27 +02:00 |
|
PavelSindler
|
3d57d504ba
|
Merge pull request #1174 from mkbel/fix_runout_resume
Fix runout resume
|
2018-09-19 18:29:32 +02:00 |
|
Marek Bel
|
2607a0c4ed
|
Update documentation.
|
2018-09-19 17:22:06 +02:00 |
|
Marek Bel
|
b92b307ee8
|
Make variables constant.
|
2018-09-19 17:21:45 +02:00 |
|
Marek Bel
|
cce8131070
|
Add missing s for seconds of print time.
|
2018-09-19 17:20:41 +02:00 |
|
Marek Bel
|
b5bb40474d
|
Fix print time overflow.
|
2018-09-19 17:17:32 +02:00 |
|
PavelSindler
|
0a5394a20e
|
defines moved to eeprom.h
|
2018-09-19 15:10:10 +02:00 |
|
PavelSindler
|
752aec37fb
|
M500 EEPROM version changed; if EEPROM_M500_SIZE is not updated, data are not stored
|
2018-09-19 14:36:26 +02:00 |
|
Marek Bel
|
9868dd766e
|
Fix print not recovered when filament sensor is disabled during filament change initiated by filament run out.
|
2018-09-19 14:22:08 +02:00 |
|
Marek Bel
|
a5a7b1f1d6
|
Move functions definitions behind variable definitions. (No change in functionality.)
|
2018-09-19 14:08:31 +02:00 |
|
PavelSindler
|
0d4f4fe933
|
Merge pull request #1143 from PavelSindler/lang2
lang fix
|
2018-09-12 09:38:18 +02:00 |
|
PavelSindler
|
45066ebddc
|
lang fix
|
2018-09-12 09:37:16 +02:00 |
|
PavelSindler
|
30d54be9de
|
Merge pull request #1142 from PavelSindler/lang2
changed version
|
2018-09-12 09:20:32 +02:00 |
|
PavelSindler
|
298950e601
|
changed version
|
2018-09-12 09:19:23 +02:00 |
|
Robert Pelnar
|
3e84bf6341
|
Lang update (translation + increased reserved space)
|
2018-09-12 02:45:13 +02:00 |
|
PavelSindler
|
96aada9061
|
load filament messages, czech language missing translation readded
|
2018-09-11 18:25:38 +02:00 |
|
PavelSindler
|
d9a2fe70ec
|
missing declaration fix
|
2018-09-11 11:06:37 +02:00 |
|
PavelSindler
|
c023fb12d5
|
add choose filament messages
|
2018-09-11 09:50:50 +02:00 |
|
PavelSindler
|
90e3ae5464
|
Merge pull request #1127 from XPila/MK3
Lang update, french translation
|
2018-09-11 09:44:02 +02:00 |
|
Robert Pelnar
|
4ca300bc39
|
Lang update, french translation
+resized reserved space
|
2018-09-11 03:43:05 +02:00 |
|
PavelSindler
|
25a46557d1
|
merge with upstream
|
2018-09-10 22:11:32 +02:00 |
|
PavelSindler
|
8a9f066c1b
|
choose_extruder_menu: extruder -> filament
|
2018-09-10 22:09:37 +02:00 |
|
PavelSindler
|
1bb9e9ed92
|
MMU_DEBUG
|
2018-09-10 20:39:28 +02:00 |
|
PavelSindler
|
6fa798aa83
|
init
|
2018-09-10 20:08:13 +02:00 |
|
PavelSindler
|
1253fb338a
|
wizard hotfix
|
2018-09-10 18:02:54 +02:00 |
|
Marek Bel
|
5a6ef00cfc
|
Do not unload filament from nozzle when touching bed in the end of first layer calibration. Unload it after reaching home position.
|
2018-09-07 10:50:23 +02:00 |
|
mkbel
|
cbc506c379
|
Merge pull request #1110 from PavelSindler/lcd_clicked_error_fix
lcd_clicked() fix (PFW-534 and PFW-546)
|
2018-09-07 09:07:03 +02:00 |
|
Marek Bel
|
001680bbdc
|
Merge branch 'MK3' into time_remaining_fix
# Conflicts:
# Firmware/Marlin_main.cpp
|
2018-09-07 08:21:36 +02:00 |
|
mkbel
|
801f8e93e8
|
Merge pull request #1112 from PavelSindler/MK25_time_remaining
MK25: always show "normal mode" remaining time (PFW-553)
|
2018-09-07 08:05:16 +02:00 |
|
PavelSindler
|
2f02828273
|
time remaining fix
|
2018-09-07 02:02:35 +02:00 |
|
PavelSindler
|
66305b3e04
|
MK25: always show "normal mode" remaining time
|
2018-09-06 23:05:36 +02:00 |
|
PavelSindler
|
48f5da9cb8
|
lcd_clicked fix
|
2018-09-06 20:54:51 +02:00 |
|
Marek Bel
|
0e50c388af
|
Save 1K flash memory.
|
2018-09-06 15:06:46 +02:00 |
|
Marek Bel
|
0d99dc0a3f
|
PFW-543 Add filament ramming when unloading filament with MMU.
|
2018-09-06 15:06:33 +02:00 |
|
PavelSindler
|
40679dcb3a
|
Merge branch 'MK3' into MK3
|
2018-09-05 00:06:48 +02:00 |
|