Commit Graph

703 Commits

Author SHA1 Message Date
PavelSindler 98bb2b7acf merge debug gcodes for bed analysis 2019-03-06 20:45:23 +01:00
PavelSindler 2a71dbefb8
Merge pull request #1597 from mkbel/fix_compiler__warning
Fix compiler  warning
2019-03-06 19:55:18 +01:00
MRprusa3d 6217329d50 SD card menu enhancement 2019-03-06 19:51:26 +01:00
PavelSindler 101453b674 mbl submenu 2019-03-06 13:27:31 +01:00
Marek Bel 1eab058ad4 Fix uninitialized variable used. 2019-03-05 18:08:35 +01:00
Marek Bel 7fcecabd5f Fix compiler warning: variable 'previous_millis_cmd' set but not used 2019-03-05 18:04:58 +01:00
Marek Bel 484259cbb2 Fix compiler warning: 'lcd_settings_linearity_correction_menu_save' defined but not used 2019-03-05 18:00:16 +01:00
PavelSindler f1031d2302 new farm statuses for pause (14) and wait for user (15) 2019-03-05 16:00:50 +01:00
MRprusa3d 7e48d633cb mode switching
info-message viewing during mode switching
2019-03-04 21:30:36 +01:00
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
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
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 e27fdafcec menu switch - initial 2019-02-28 19:42:09 +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
Marek Bel 4a4eb9962c Cut filament when cutter is enabled and MMU load fails. 2019-02-27 10:42:26 +01:00
Marek Bel 49b1d1cb93 Move prototype to header file. 2019-02-26 18:50:15 +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 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
MRprusa3d be0ed46335 preHeat @ filament management
another funcionality III
2019-02-22 03:09:50 +01:00
MRprusa3d 323071f50a preHeat @ filament management
another funcionality II
2019-02-21 13:20:29 +01:00
MRprusa3d a54c68b874 preHeat @ filament management
another funcionality II
2019-02-21 04:45:44 +01:00
MRprusa3d da0867cfc5 preHeat @ filament management
another funcionality
2019-02-20 03:01:33 +01:00
PavelSindler 11d19879fc
Merge pull request #1533 from MRprusa3d/PFW-210
preHeat @ filament load / unload / autoLoad / MMU
2019-02-15 17:45:38 +01:00
MRprusa3d 0c1f9b5100 preHeat @ filament management
target temperature keeping
2019-02-15 02:25:44 +01:00
MRprusa3d 80c3420a12
Merge branch 'MK3' into PFW-210 2019-02-14 00:05:50 +01:00
MRprusa3d ef1f82627e preHeat @ filament load / unload / autoLoad / MMU
MMU options added
2019-02-13 23:53:00 +01:00
Marek Bel 9e873ac0f7 Use enum for mmu_cmd instead of plain integer type. 2019-02-13 01:51:39 +01:00
PavelSindler e432e258dc extr fan RPM measuring fix 2019-02-06 22:56:10 +01:00
PavelSindler 22217a42f7 message change 2019-02-06 21:37:39 +01:00
PavelSindler 726d5aa3c3 typo fixed 2019-02-06 16:29:10 +01:00
PavelSindler 2fe8e0670a MK2 build fail fixed 2019-02-06 16:15:19 +01:00
PavelSindler ef86c78f25 menu item text changed 2019-02-06 14:24:47 +01:00
PavelSindler 1ba046395e fan measurements fix: keep fanSpeedSoftPwm = 255 during measurements, selftest changes 2019-02-06 12:37:18 +01:00
PavelSindler 860e6f9994 Merge remote-tracking branch 'upstream/MK3' into variants 2019-02-06 09:19:38 +01:00
PavelSindler fcb7dd90cf
Merge pull request #1505 from MRprusa3d/PFW-210
preHeat @ filament load / unload / autoLoad
2019-02-06 09:14:03 +01:00
MRprusa3d a53d150903 preHeat @ filament load / unload / autoLoad
autoLoad option added
2019-02-06 01:58:05 +01:00
PavelSindler f9298b37b8 fan check hotfix (selftest, measuring RPM, fan errors) 2019-02-05 04:02:38 +01:00
PavelSindler 9a51a7be29 Merge branch 'bed_correction_fix' into variants 2019-02-04 12:47:06 +01:00
PavelSindler 0853ef5d06 Merge remote-tracking branch 'upstream/MK3' into variants 2019-02-04 12:45:28 +01:00
PavelSindler b4f2dc3b5e Merge remote-tracking branch 'robert/MK3-variants' into variants 2019-02-04 12:41:08 +01:00
PavelSindler 6d5a2ae816
Merge pull request #1499 from MRprusa3d/PFW-210
preHeat @ filament load / unload
2019-02-04 12:37:42 +01:00
Robert Pelnar d2a4cb4c49 Use _delay_ms instead of delay (fix - fast scrolling in sd card menu - temporary solution) 2019-02-04 12:20:07 +01:00
MRprusa3d fff8fc8a48 preHeat @ filament load / unload
filament-list correction (PET missing)
2019-02-04 12:12:35 +01:00
Robert Pelnar 3244c37435 Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control 2019-02-04 01:32:04 +01:00
PavelSindler 5324181bf7 maximum bed level correction value enlarged from 50um to 100um and is now used in menus and mesh bed leveling itself 2019-02-03 20:56:14 +01:00
PavelSindler 4444b155f1 M600: prevention of blob; massage changed when autoload is active 2019-02-01 21:08:34 +01:00
PavelSindler 97aaf919a3 Merge remote-tracking branch 'upstream/MK3' into dev 2019-02-01 18:12:59 +01:00
Robert Pelnar 79449a8eaf Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control 2019-02-01 13:29:50 +01:00
PavelSindler 4f67a9569c dont show filament sensor in extruder info menu 2019-01-31 18:03:56 +01:00
PavelSindler 6342b6032c Merge remote-tracking branch 'upstream/MK3' into variants 2019-01-31 10:18:41 +01:00
PavelSindler 491dbf5ebd
Merge pull request #1493 from MRprusa3d/PFW-210
preHeat @ filament load / unload
2019-01-31 10:15:59 +01:00
MRprusa3d 921b6993ee preHeat @ filament load / unload 2019-01-31 05:21:53 +01:00
PavelSindler 9926468c91 Merge remote-tracking branch 'upstream/MK3' into variants 2019-01-30 17:26:45 +01:00
MRprusa3d 19fd05bb46
Merge pull request #1490 from PavelSindler/menu_update
menu update
2019-01-29 13:29:27 +01:00
PavelSindler 1fa9913029 include printers.h 2019-01-28 21:54:44 +01:00
PavelSindler 220437316b
Merge pull request #1485 from XPila/MK3-bed_fast_pwm
Mk3 bed fast pwm
2019-01-28 21:14:01 +01:00
PavelSindler 29e156b26d printer types updated 2019-01-28 19:48:46 +01:00
PavelSindler 25d54d43aa menu update 2019-01-28 19:41:02 +01:00
PavelSindler dd4d8e1277 calibrate z endstop update 2019-01-28 19:23:19 +01:00
PavelSindler 0514306bed selftest fixed 2019-01-28 11:09:41 +01:00
PavelSindler 7889305702 merging changes from upstream 2019-01-28 11:00:42 +01:00
PavelSindler c6e6df404c
Merge pull request #1482 from mkbel/IR_fsens_selftest
Ir fsens selftest
2019-01-28 10:39:12 +01:00
Robert Pelnar eea755496b Conditional translation for SYSTEM_TIMER_2 because we want to have posibility to switch between old/new implementation.
Timing functions (millis, micros and delay) replaced in whole source, defined in Marlin.h.
This commit enables original implementation (SYSTEM_TIMER_2 undefined)
Verified with passed complete wizard process.
2019-01-27 22:48:51 +01:00
Robert Pelnar 434a723151 Timing functions 'micros' and 'delay' replaced in whole source with 'micros2' and 'delay2' 2019-01-27 17:37:27 +01:00
Marek Bel aaa2670ef8 Remove redundant enum numbering. 2019-01-25 20:14:29 +01:00
Marek Bel b167896c6d Convert lcd_selftest_screen parameter int _step to enum class testScreen screen. 2019-01-25 20:00:12 +01:00
Marek Bel 6d1256eaad Internationalize "Calibrating home". 2019-01-25 18:06:30 +01:00
PavelSindler 6b6a3d7d5f MMU_IR_SENSOR_PIN -> IR_SENSOR_PIN 2019-01-25 18:01:17 +01:00
PavelSindler 7e3a1c7d45 merge changes from upstream 2019-01-25 17:57:24 +01:00
PavelSindler 0d1a7a1774
Merge pull request #1479 from MRprusa3d/PFW-749
SD card menu
2019-01-25 14:32:12 +01:00
Marek Bel edc412697c Increase selftest_irsensor() filament nozzle unload temperature to ABS.
Resume nozzle temperature immediately after unload.
2019-01-24 21:24:46 +01:00
Marek Bel 68ffa95aa9 Fix axis self-test progress visualization. 2019-01-24 21:06:03 +01:00
Marek Bel 1c4f3259ea Increase heater check minimum expected temperature rises.
Bed increased from 3 to 10 K.
Nozzle increased from 10 to 30 K.

Measured rises with my MK3 printer:
Bed 26K,
Nozzle 73K.
2019-01-24 21:02:04 +01:00
Marek Bel 305598d7f6 Fix bed / nozzle test order and progress bar.
Known limitation:
Z progress shown in bed progress.
2019-01-24 20:03:37 +01:00
Marek Bel 22859800f0 Rearrange tests. Move hot end test to the end, to spare time in IR sensor test.
Known problems, hot end and bed is swapped. Bed progress indicator is painted to X axis test.
2019-01-24 19:22:36 +01:00
MRprusa3d b2b65475df SD card menu
SDcard-menu after card insertion
2019-01-24 17:32:57 +01:00
PavelSindler ad65024147 selftest: filament sensor check change 2019-01-24 13:57:52 +01:00
PavelSindler e0c1e4a02d version which should on all printer versions: autoload, selftest, filament detection, filament sensors initialization, filament menus 2019-01-24 01:12:30 +01:00
Marek Bel 1d71c1a5d1 Update IR sensor selftest progress bar more frequently. 2019-01-22 19:02:42 +01:00
Marek Bel 97a4623800 Fix lcd_selftest_screen for small _progress_scale. 2019-01-22 19:01:55 +01:00
Marek Bel 9cda0b69b8 Update IR sensor selftest progress bar. 2019-01-22 18:23:00 +01:00
Marek Bel 3ff8a7c740 Unload filament by MMU unit in selftest_irsensor().
Known limitation:
If filament was not loaded to nozzle it is sticked completely out of MMU. To be fixed in MMU, as this problem can be reproduced also from printer menu - unload filament.
2019-01-22 14:54:06 +01:00
Marek Bel c371a5ea65 Document. 2019-01-22 14:05:08 +01:00
Marek Bel a92d9c782b Add IR sensor test. 2019-01-22 11:29:55 +01:00
Marek Bel f292a6ca7a Refactor filament sensor selftest call. 2019-01-21 21:39:38 +01:00
PavelSindler e36e58f385 show sensor on/off temporarily changed to unlocalized strings 2018-12-21 21:28:57 +01:00
PavelSindler ba57986b72 merge changes from upstream 2018-12-21 20:58:38 +01:00
PavelSindler 5462d451e1 show power failures in fail stats menu, shorter load to nozzle if idler sensor detected 2018-12-21 20:56:45 +01:00
PavelSindler d292e877df load to nozzle shortened, sensor menu moved to support 2018-12-21 18:51:13 +01:00