Commit Graph

1870 Commits

Author SHA1 Message Date
PavelSindler
d1de9fff60 mmu_loop: missing return added 2018-10-22 20:38:32 +02:00
PavelSindler
d005005e22 Merge remote-tracking branch 'upstream/3_4_2' into 3_4_2_branch_merging 2018-10-22 20:33:38 +02:00
XPila
be9f921153
Merge pull request #1268 from PavelSindler/3_4_2
MK2.5 MMU sw reset at setup function
2018-10-19 18:03:03 +02:00
PavelSindler
bc247ca02c MK2.5 sw reset at setup function 2018-10-19 17:54:48 +02:00
XPila
483b0ee144
Merge pull request #1262 from PavelSindler/3_4_2
MK2.5 printers MMU support
2018-10-18 13:46:55 +02:00
PavelSindler
b8f92fdfa9 MK2.5 printers set mmu to stealth mode (using Mx code), required mmu2 buildnr can be different for MK2.5 and MK3 printers 2018-10-18 02:44:16 +02:00
mkbel
0d9b502937
Merge pull request #1246 from PavelSindler/variants_max
MK3: default max feedrate for x and y changed to 100mm/s
2018-10-10 16:46:34 +02:00
PavelSindler
bbd4f70f41
Merge pull request #1221 from XPila/MK3
Update fsensor in Manage_inactivity instead of main loop.
2018-10-10 13:12:12 +02:00
PavelSindler
809ae5a5f0 default max feedrate for x and y changed to 100mm/s 2018-10-09 20:03:28 +02:00
PavelSindler
c91c878408
Merge pull request #1202 from MRprusa3d/PFW-573
preHeatError
2018-10-08 16:12:33 +02:00
mkbel
7bd90c0d01
Update README.md 2018-10-05 17:50:01 +02:00
mkbel
8f0ed9752b
Update README.md 2018-10-05 17:47:02 +02:00
PavelSindler
27a4081362
Merge pull request #1224 from PavelSindler/MK3_for_merging
changed version
2018-10-04 17:41:19 +02:00
PavelSindler
436f5b5728 changed version 2018-10-04 17:40:38 +02:00
Robert Pelnar
9960c80bf7 Additional check always with enabled oq_meassure
+ variant files
2018-10-04 16:12:41 +02:00
Robert Pelnar
f9d8c46802 Enable/disable optical quality meassurement in settings menu 2018-10-04 15:48:28 +02:00
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
362797d40b
Merge pull request #1206 from PavelSindler/MK3_for_merging
version change
2018-09-27 21:13:57 +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
MRprusa3d
0184f06dcf preHeatError
correction of preHeatError detection
2018-09-27 04:23:00 +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
c50db2ed7a
Merge pull request #1197 from mkbel/disable_fil_q_det
Disable filament sensor response quality check.
2018-09-25 20:00:29 +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
mkbel
2144f0e5a4
Merge pull request #1191 from PavelSindler/start_msg_duplicity
remove "start" duplicity
2018-09-24 16:14:58 +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
PavelSindler
e5ede602b8
Merge pull request #1176 from mkbel/fix_print_time_overflow
Fix print time overflow
2018-09-19 18:29:12 +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