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

2082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PavelSindler
dbdb8ad650
Merge pull request #1098 from mkbel/add_ramming 
Add ramming
 2018-09-05 16:50:17 +02:00
PavelSindler
74113ecf67
Merge pull request #1093 from mkbel/MK3_dev 
Mk3 dev
 2018-09-05 16:47:53 +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
Marek Bel
a5db084b70 Move resuming nozzle temperature to restore_print_from_ram_and_continue(). 
Known limitations: Unused code not removed. Unload filament moves extruder to print position.
 2018-09-04 14:56:20 +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
Marek Bel
2abd2a6cab Resume print fan. 
Known limitations: Unused code not removed. Unload filament moves extruder to print position.
 2018-09-04 11:13:51 +02:00
Marek Bel
acef0578a5 Don't move before reaching nozzle temperature when resuming the print. 
Known limitations: Doesn't resume print fan. Unused code not removed. Unload filament moves extruder to print position.
 2018-09-04 10:07:52 +02:00
Marek Bel
d54e629950 Retract, lift Z, move away in XY, disable fan and nozzle heating. Resume nozzle heating. 
Known limitations: Doesn't wait for nozzle temperature reaching set temperature before moving to print area. Doesn't resume print fan. Unused code not removed.
 2018-09-04 08:53:27 +02:00
Marek Bel
af08e16426 Use stop_and_save_print_to_ram() and restore_print_from_ram_and_continue() pair to pause print from menu. Move declaration of those functions to marlin.h. Move declaration of FSensorStateMenu to ultralcd.h. 
Known limitations: Filament is not retracted, extruder is not lifted in Z and moved to rear left corner in XY. Nozzle heating is not turned off nor restored. Unused code is not removed.
 2018-09-04 08:13:56 +02:00
Marek Bel
63a215b0c3 Remove unused variable chars. 2018-09-03 20:48:03 +02:00
Marek Bel
cbf633cfd4 Remove unused variable chars. 2018-09-03 20:47:12 +02:00
Marek Bel
c95b463e0b Remove unused variable yes. Remove redundant tmp_extruder assignment. 2018-09-03 20:44:40 +02:00
Marek Bel
517fbb66bf Save 1K flash memory. 2018-09-03 20:00:46 +02:00
Marek Bel
d796df3f14 PFW-543 Add filament ramming when unloading filament with MMU. 2018-09-03 17:32:42 +02:00
Marek Bel
e5c0e26601 Merge branch 'MK3' into MK3_dev 2018-08-30 19:05:24 +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
PavelSindler
9cf29f5c76
Merge pull request #1082 from mkbel/MK3_dev 
Merge branch MK3 into Mk3 dev
 2018-08-28 18:25:07 +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
Marek Bel
adde0d3944 Merge branch 'prusa3d_MK3' into MK3_dev 2018-08-28 17:31:12 +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
Marek Bel
9a14daab06 Revert "Split settings menu into separate functions." 
Original commit wont work, as intended as MENU_ITEM_* macros contain return statement.
 2018-08-28 16:03:07 +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
PavelSindler
3e2cb72695
Merge branch 'MK3' into auto_deplete_2 2018-08-28 11:01:30 +02:00
PavelSindler
bb21cd6fec
Merge pull request #1079 from mkbel/fix_unable_to_compile 
Fix unable to compile
 2018-08-28 10:57:50 +02:00