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

2813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PavelSindler
9dde8c4732
Merge pull request #1591 from MRprusa3d/PFW-795c 
better autoLoad
 2019-03-04 15:31:04 +01:00
PavelSindler
1051b7c39f
Merge pull request #1583 from mkbel/fix_cut 
Fix unable to cut filament, if nozzle is already preheated.
 2019-03-04 15:29:54 +01:00
PavelSindler
e832f0f2ee
Merge pull request #1582 from mkbel/remove_unused_code 
Remove commented out code, fix formatting.
 2019-03-04 15:29:36 +01:00
PavelSindler
bb683f0ba1
Merge pull request #1584 from mkbel/fix_compiler__warning 
Fix compiler warnings
 2019-03-04 15:29:05 +01:00
Marek Bel
8812d40546 Revert "Fix compiler warning: variable 'kill_message' set but not used" 
This reverts commit a964f996fa.
 2019-03-04 15:05:14 +01:00
MRprusa3d
b02ca18c93 better autoLoad 
autoLoad inhibit if Support::ExtruderInfo-menu is selected
 2019-03-04 12:52:35 +01:00
Marek Bel
9e38b1e101 Add missing message "Preheating to cut". 2019-03-01 18:17:08 +01:00
Marek Bel
6437d44991 Fix unable to cut filament, if nozzle is already preheated. 2019-03-01 18:10:06 +01:00
Marek Bel
83e07b5cdf Fix compiler warnings: 
sketch/ultralcd.cpp: In function 'void mFilamentPrompt()':
sketch/ultralcd.cpp:2335:7: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
 switch(eFilamentAction)
       ^
sketch/ultralcd.cpp:2335:7: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
      switch(eFilamentAction)
            ^
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuLoad' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuUnLoad' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuEject' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
sketch/ultralcd.cpp: In function 'void mFilamentItem(uint16_t, uint16_t)':
sketch/ultralcd.cpp:2513:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
      switch(eFilamentAction)
            ^
sketch/ultralcd.cpp:2513:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2562:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
      switch(eFilamentAction)
            ^
sketch/ultralcd.cpp:2562:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
 2019-03-01 18:07:19 +01:00
Marek Bel
824d11e4b0 Remove "Press the knob to eject filament" message, as it is never shown. 2019-03-01 17:43:28 +01:00
Marek Bel
57cf7ee171 Fix compiler warning: 'lcd_selftest_fsensor' defined but not used 2019-03-01 17:21:13 +01:00
Marek Bel
4c2d4fcf77 Fix compiler warning ultralcd.cpp:4038:10: warning: unused variable 'chars 2019-03-01 17:18:05 +01:00
Marek Bel
a964f996fa Fix compiler warning: variable 'kill_message' set but not used 
kill_message is unused since:

Author:      MRprusa3d <martin.remis@prusa3d.cz>
Date:        4 months ago (11/2/2018 11:03:14 PM)
Commit hash: 73794b56cf

MeshBed Leveling Fail

Z-leveling after MeshBed leveling failing
 2019-03-01 17:08:36 +01:00
Marek Bel
8e51b37d91 Suppress warning: unused parameter. 2019-03-01 16:57:20 +01:00
Marek Bel
22500970ba Remove commented out code, fix formatting. 2019-03-01 16:18:16 +01:00
PavelSindler
6fda306eab
Merge pull request #1578 from mkbel/bad_load_cut 
Bad load cut
 2019-03-01 14:56:01 +01:00
PavelSindler
85c208f9f4
Merge branch 'MK3' into bad_load_cut 2019-03-01 14:55:55 +01:00
PavelSindler
22c0d6e230
Merge pull request #1577 from mkbel/add_cut 
Add MMU cut filament
 2019-03-01 14:53:12 +01:00
PavelSindler
e14e4be94e
Merge pull request #1575 from mkbel/add_ramming_eject 
Add filament ramming to eject filament.
 2019-03-01 14:21:23 +01:00
PavelSindler
0db721b244
Merge pull request #1559 from mkbel/detect_bad_load 
Move extruder forth and back after filament detected by sensor to det…
 2019-03-01 14:21:04 +01:00
PavelSindler
3cbcbba738
Merge pull request #1510 from mkbel/fix_menu_stack_third_time 
Fix menu stack overrun.
 2019-03-01 14:20:22 +01:00
PavelSindler
250a448d05
Merge pull request #1549 from mionut/7MBL 
7x7 mesh bed leveling with power failure save + pinda temperature filter
 2019-03-01 14:19:52 +01:00
PavelSindler
6a1bc3c345
Merge pull request #1581 from PavelSindler/MK3_for_merging 
Mk3 for merging
 2019-03-01 13:57:04 +01:00
PavelSindler
488497df2c version change 2019-03-01 13:56:03 +01:00
PavelSindler
ca88010018 Revert "version change" 
This reverts commit f14733f2dd.
 2019-03-01 13:54:25 +01:00
PavelSindler
f14733f2dd version change 2019-03-01 13:53:18 +01:00
PavelSindler
e27fdafcec menu switch - initial 2019-02-28 19:42:09 +01:00
PavelSindler
482f8ef01a Merge remote-tracking branch 'mionut/7MBL' into 7x7 2019-02-28 15:54:49 +01:00
Marek Bel
2a005caf42 Add cutter enable to tune menu. 2019-02-27 17:47:51 +01:00
Marek Bel
02a692c5d9 Store cutter enable state in EEPROM. 2019-02-27 17:34:03 +01:00
PavelSindler
ff6eb0b1af
Merge pull request #1568 from MRprusa3d/PFW-795 
preHeat @ filament management
 2019-02-27 13:15:39 +01:00
Marek Bel
4a4eb9962c Cut filament when cutter is enabled and MMU load fails. 2019-02-27 10:42:26 +01:00
MRprusa3d
2f1e968563 "lcd_update_enable()" replacement 2019-02-26 23:17:52 +01:00
Marek Bel
49b1d1cb93 Move prototype to header file. 2019-02-26 18:50:15 +01:00
Marek Bel
a67645fda6 Merge branch 'add_cut' into bad_load_cut 2019-02-26 18:35:55 +01:00
Marek Bel
815231bc26 Add MMU cut filament menu. 2019-02-26 17:58:00 +01:00
MRprusa3d
ff35119ef3 preHeat @ filament management 
another funcionality III / autoLoad
 2019-02-26 17:33:37 +01:00
Marek Bel
5a5a482a59 Rename preprocessor macro K1 to PID_K1 to avoid future conflict with MMU command. 2019-02-26 13:59:44 +01:00
Marek Bel
6c9dd4f272 Add filament ramming to eject filament. 2019-02-26 13:41:28 +01:00
Marek Bel
7a1b47c340 Convert functions mmu_eject_fil_0 to mmu_eject_fil_4 to template function. 2019-02-26 11:11:05 +01:00
Marek Bel
34e2495487 Convert mmu_load_to_nozzle_0 to mmu_load_to_nozzle_4 to template. 2019-02-26 10:32:10 +01:00
Marek Bel
d5c5ed55eb Change formatting. 2019-02-25 11:12:39 +01:00
Marek Bel
8f5fbe569c Merge branch 'MK3' into detect_bad_load 2019-02-25 10:41:26 +01:00
PavelSindler
8e3d52ee6d fix compilation error for MK2.5, make code more readable 2019-02-22 17:15:40 +01:00
PavelSindler
26cab2911f mmu stealth mode 2019-02-22 16:30:54 +01:00
Laurentiu
51827c578f MESH_MEAS_NUM_X_POINTS constant correction to MESH_MEAS_NUM_Y_POINTS 2019-02-22 15:05:06 +02:00
Laurentiu
62875f2e95 MESH_MEAS_NUM_X_POINTS constant correction to MESH_MEAS_NUM_Y_POINTS 2019-02-22 14:35:48 +02:00
MRprusa3d
c0a8d87e9e Merge remote-tracking branch 'my_remote/PFW-795' into PFW-795 2019-02-22 03:16:23 +01:00
MRprusa3d
be0ed46335 preHeat @ filament management 
another funcionality III
 2019-02-22 03:09:50 +01:00
PavelSindler
730e370e78
Merge pull request #1565 from PavelSindler/MK3_for_merging 
version change
 2019-02-21 19:17:03 +01:00