josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,128 Commits 31 Branches 140 Tags 71 MiB
Commit Graph

198 Commits

Author SHA1 Message Date
Marek Bel e53734895f Make MMU load failed blocking to workaround lack of resume print menu item. 
The same workaround used as for USB print (Octoprint).
 2019-08-16 20:20:17 +02:00
Marek Bel 0aed59c947 Fix unsigned char overflow cause invalid filament load. 2019-07-30 19:06:57 +02:00
Marek Bel 3b396fb8bf Merge branch 'MK3' into fix_missing_mmu_attention 2019-07-25 19:10:07 +02:00
Marek Bel a9e9a9857b Fix "MMU needs attention screen is missing in case of failed unload filament". 2019-07-25 19:09:52 +02:00
Marek Běl d3dd0ad271
Merge pull request #1952 from NotaRobotexe/sound 
new sound
 2019-07-10 18:06:32 +02:00
Marek Bel e0f46f128d Fix indentation. 2019-07-10 17:39:24 +02:00
MRprusa3d 98bae7af9f
Merge branch 'MK3' into PFW-873 2019-07-10 16:50:14 +02:00
MRprusa3d 8229a45187 pre-production version ;-) 2019-07-09 12:16:51 +02:00
Marek Bel 8b6629ad58 Fix comment grammar. 2019-06-18 20:00:02 +02:00
Marek Bel ae9ae95187 MMU: Filter IR sensor signal when detecting whether filament tip passes to heat break. Increase number of tries when loading filament to 3. 2019-06-18 19:15:16 +02:00
KDanielK 6cb85a455f Update mmu.cpp 2019-06-18 15:08:47 +02:00
Marek Bel 24cec4091b Merge branch 'MK3' into sound 2019-06-17 17:28:19 +02:00
Marek Bel 1390d4e5b9 Use first letter capital camel case for enum class members. Change underlying type to uint_least8_t. 2019-06-12 19:11:41 +02:00
Marek Bel 5fcf760954 Use first letter capital camel case for enum class members. Rename CustomMsgTypes to CustomMsg. Remove unnecessary maping to numbers. Change underlying type to uint_least8_t. 2019-06-12 18:54:43 +02:00
Marek Bel e393d91b12 Use first letter capital camel case for enum class members. 2019-06-12 16:20:21 +02:00
DRracer c7e1e73880 another almost 200B down by proper usage of smaller data types and enum 
classes
 2019-06-12 15:41:55 +02:00
NotaRobotexe bb980e2fca sound edit, delete mute mode, add blind mode 2019-06-10 15:03:52 +02:00
Marek Bel dad2065da6 Merge branch 'MK3' into rise_z 2019-05-15 16:37:17 +02:00
Marek Bel 1f3877b221 Extract duplicate code into function. Saves 4B of flash. 2019-05-15 16:31:10 +02:00
Marek Bel 89fc9e7f92 sketch/menu.h:90:115: warning: invalid conversion from 'void (*)(int)' to 'void (*)(uint8_t) {aka void (*)(unsigned char)}' [-fpermissive] 
#define MENU_ITEM_FUNCTION_NR_P(str, number, func, fn_par) do { if (menu_item_function_P(str, number, func, fn_par)) return; } while (0)
                                                                                                                   ^
sketch/ultralcd.cpp:5926:5: note: in expansion of macro 'MENU_ITEM_FUNCTION_NR_P'
     MENU_ITEM_FUNCTION_NR_P(_T(MSG_LOAD_FILAMENT), '1', extr_adj, 0); ////MSG_LOAD_FILAMENT_1 c=16
 2019-05-14 18:25:43 +02:00
Marek Bel 66d20f0297 Fix code formatting (indentation). 2019-05-14 16:45:15 +02:00
Marek Bel 150787efbd Generate menu item texts Cut filament <nr.> during runtime to conserve flash. 2019-05-14 16:25:29 +02:00
Marek Bel 7c4f66181f Generate menu item texts Load filament <nr.> and Eject filament <nr.> during runtime to conserve flash. 2019-05-14 15:47:25 +02:00
NotaRobotexe f16bea26e5 raise the Z axis before filament loading to nozzle on MMU2S 2019-04-25 17:39:09 +02:00
Marek Bel c7d403733a Allow load filament retry after button push unlimited times in case mmu_continue_loading() is in blocking mode. 2019-04-09 20:50:29 +02:00
Marek Bel bf57a59147 Extract duplicate code into function. Saves 106B flash. 2019-04-05 15:12:35 +02:00
Marek Bel 4bfa3d7e0b Reporty busy: paused for user in case MMU is not responding. 2019-04-04 19:04:15 +02:00
Marek Bel bf1a55ab02 Add mmu_continue_loading blocking variant and use it for usb printing, so that "ok" is not returned to the controller in case MMU load failed. 
Known limitation: MMU load failed is not handled properly if it happens again after user clicked printer button to continue print.
 2019-04-04 18:15:37 +02:00
PavelSindler fbe68cb287 variables scope changed 2019-03-21 19:37:34 +01:00
PavelSindler c05561d6b1
Merge pull request #1607 from PavelSindler/7x7 
7x7 mbl and switching mmu modes
 2019-03-15 19:55:15 +01:00
Marek Bel ffe45bdef3 Disable mmu filament cutter feature. 2019-03-15 03:38:37 +01:00
PavelSindler 80ef2686ae mmu mode switching fix 2019-03-14 18:17:40 +01:00
PavelSindler b20d9171b6 Merge remote-tracking branch 'upstream/MK3' into 7x7 2019-03-12 11:47:17 +01:00
PavelSindler c9cff11732
Merge pull request #1593 from MRprusa3d/PFW-647 
mode switching, G-code unification
 2019-03-12 11:40:43 +01:00
PavelSindler 819a91ab1e switching stealth/normal mode for mmu in settings menu and tune menu 2019-03-11 12:33:22 +01:00
PavelSindler 141b78c048 number of Z-probes defualt value changed from 4 to 3, mmu stealth mode switch in settings menu 2019-03-10 16:03:46 +01:00
MRprusa3d 20a03d703d G-code unification 
"FSENSOR_RECOVER" ->-> "PRUSA fsensor_recover"
 2019-03-05 13:36:13 +01:00
Marek Bel f161d3ade4 Change formatting. 2019-03-04 22:17:43 +01:00
Marek Bel b2255c8be9 Preheat nozzle before loading filament in M600 (change filament) gcode. 
This fixes problem of not heating the nozzle when retrying load after MMU load failed.
 2019-03-04 22:00:24 +01:00
mkbel 27f69bb761
Merge pull request #1570 from PavelSindler/mmu_stealth_mode 
mmu stealth mode
 2019-03-04 17:09:11 +01:00
PavelSindler 7f92d73a40 MMU_STEALTH_MODE -> MMU_FORCE_STEALTH_MODE; activate_stealth_mode() function update 2019-03-04 17:04:22 +01:00
Marek Bel 22500970ba Remove commented out code, fix formatting. 2019-03-01 16:18:16 +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
Marek Bel 02a692c5d9 Store cutter enable state in EEPROM. 2019-02-27 17:34:03 +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 a67645fda6 Merge branch 'add_cut' into bad_load_cut 2019-02-26 18:35:55 +01:00