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 |
|
MRprusa3d
|
6804f54094
|
Merge pull request #1124 from PavelSindler/fix_wizard
wizard hotfix
|
2018-09-10 20:02:36 +00: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 |
|
PavelSindler
|
bad112c8e1
|
Merge pull request #1116 from mkbel/pick_mmu_1stLay_unload
Do not unload filament from nozzle when touching bed in the end of fi…
|
2018-09-07 11:34:21 +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 |
|
mkbel
|
00225bafdc
|
Merge pull request #1113 from PavelSindler/time_remaining_fix
time remaining fix (PFW-554)
|
2018-09-07 09:03:56 +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
|
e2d92a8c4e
|
Merge pull request #1109 from mkbel/pick_ramming
Add filament ramming when unloading filament with MMU.
|
2018-09-06 21:01:54 +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
|
1543a1b45a
|
Merge pull request #1057 from MRprusa3d/MK3
ShippingPrepare & M600
|
2018-09-05 00:06:58 +02:00 |
|
PavelSindler
|
40679dcb3a
|
Merge branch 'MK3' into MK3
|
2018-09-05 00:06:48 +02:00 |
|
PavelSindler
|
ae823c3c43
|
Merge pull request #1102 from MRprusa3d/PFW-525
Time info
|
2018-09-04 15:20:14 +02:00 |
|
MRprusa3d
|
35cf3f3a61
|
Time info
suffix for doubt time estimation (i.e. if feed rate changed)
|
2018-09-04 14:39:46 +02:00 |
|
PavelSindler
|
c24f673399
|
Merge pull request #1092 from mkbel/fix_fil_change_reset
Fix printer reset when changing filament during print over USB.
|
2018-08-30 16:53:01 +02:00 |
|
Marek Bel
|
12b1769531
|
Fix printer reset when changing filament during print over USB.
|
2018-08-30 16:02:13 +02:00 |
|
PavelSindler
|
e9a8d03c65
|
Merge pull request #1091 from PavelSindler/M600_change_extruder
version changed
|
2018-08-30 11:35:51 +02:00 |
|
PavelSindler
|
ed49e5187b
|
version changed
|
2018-08-30 11:35:06 +02:00 |
|
PavelSindler
|
0e06269fd7
|
Merge pull request #1090 from PavelSindler/M600_change_extruder
linearity correction define added (menu readded)
|
2018-08-30 11:28:52 +02:00 |
|
PavelSindler
|
d96b0d5f32
|
linearity correction define added (menu readded)
|
2018-08-30 11:28:12 +02:00 |
|
PavelSindler
|
4555d96e50
|
Merge pull request #1089 from MRprusa3d/PFW-524
1-st Layer Calibration correction
|
2018-08-30 09:21:07 +02:00 |
|
MRprusa3d
|
25a22120fb
|
1-st Layer Calibration correction
filament loading improvement
|
2018-08-30 03:32:33 +02:00 |
|
PavelSindler
|
ef289bf9bb
|
Merge pull request #1088 from PavelSindler/M600_change_extruder
M600 change extruder
|
2018-08-29 14:43:02 +02:00 |
|
PavelSindler
|
b2c94f36cc
|
removed unused "out of range" function
|
2018-08-29 14:41:39 +02:00 |
|
PavelSindler
|
8a453e65f8
|
eject filament allowed only when nozzle is hot (there can be filament loaded in printer nozzle)
|
2018-08-29 13:16:17 +02:00 |
|
PavelSindler
|
b284c70d9b
|
auto deplete: dont eject filament
|
2018-08-29 13:08:09 +02:00 |
|
PavelSindler
|
8de767c1fa
|
Merge pull request #1086 from PavelSindler/M600_change_extruder
Multimaterial v2: Eject filament feature, M600 modified
|
2018-08-29 02:00:07 +02:00 |
|
PavelSindler
|
515e78cfd1
|
Eject filament feature in menu, M600: if it was envoked by FINDA, eject filament
|
2018-08-29 01:58:28 +02:00 |
|
PavelSindler
|
b9808354c4
|
Merge remote-tracking branch 'upstream/MK3' into M600_change_extruder
|
2018-08-28 23:53:35 +02:00 |
|
PavelSindler
|
d290543d7d
|
Merge pull request #1085 from mkbel/fix_active_filament
Fix active filament PFW-528
|
2018-08-28 23:50:57 +02:00 |
|
PavelSindler
|
705f098b1c
|
eject filament: initial version
|
2018-08-28 23:50:31 +02:00 |
|
Marek Bel
|
2cd8691376
|
Do not use global variable tmp_extruder when setting temperature.
|
2018-08-28 20:26:33 +02:00 |
|
PavelSindler
|
8986226904
|
Merge pull request #1084 from MRprusa3d/PFW-439
Z-move correction
|
2018-08-28 20:07:10 +02:00 |
|
MRprusa3d
|
0695f3f345
|
Z-move correction
Z-move inhibition after FactoryReset
|
2018-08-28 19:58:03 +02:00 |
|
Marek Bel
|
8aeb7e04f1
|
Fix bound check for T0 .. T4 command. Document mmu_load_to_nozzle().
|
2018-08-28 18:52:16 +02:00 |
|
Marek Bel
|
55eaa1de83
|
Fix code indentation.
|
2018-08-28 18:26:10 +02:00 |
|
Marek Bel
|
9fb68fb724
|
Remove usage of global variable tmp_extruder in M200.
|
2018-08-28 18:08:21 +02:00 |
|
mkbel
|
5ad2fdaaaa
|
Merge pull request #1080 from PavelSindler/M600_change_extruder
removed redundant code
|
2018-08-28 17:36:50 +02:00 |
|
PavelSindler
|
d60cdfb3eb
|
Merge pull request #1081 from MRprusa3d/PFW-410
Z-endstop @ MK3
|
2018-08-28 17:07:35 +02:00 |
|
MRprusa3d
|
d3869bd857
|
Z-endstop @ MK3
add show P.I.N.D.A. state menu item @ CalibrationMenu
|
2018-08-28 16:12:59 +02:00 |
|
PavelSindler
|
27bd31e255
|
removed redundant code
|
2018-08-28 11:26:35 +02:00 |
|
PavelSindler
|
7a88fc9ef7
|
Merge pull request #1078 from mkbel/auto_deplete_2
Auto deplete 2
|
2018-08-28 11:10:04 +02:00 |
|