f431d24762
Merge branch 'MK3' of https://github.com/DRracer/Prusa-Firmware into MK3
2019-05-07 16:17:14 +02:00
0124fbf9ee
Fix: display target extruder temperature on the main screen when doing
...
PID calibration
2019-05-07 16:15:42 +02:00
b7fe43bf68
Deleted bad cols/rows definitions for translation.
2019-05-07 12:52:23 +02:00
1a0370e1c7
Make macro ON_MENU_LEAVE() usage similar to macros MENU_ITEM_BACK_P() and MENU_ITEM_FUNCTION_P().
2019-05-06 17:39:00 +02:00
ffbdb43881
Remove commented code
2019-05-06 17:26:42 +02:00
0794430208
Fix for linearity correction not being stored to EEPROM when doing MENU-
...
UP
2019-05-06 15:33:13 +02:00
b93f37ee02
"stop" immediately after "pause" patch
2019-04-29 14:39:19 +02:00
32f3471862
print parameters checking
...
prusa_stat_diameter()
2019-04-09 15:22:08 +02:00
fd96bde69f
Merge pull request #1667 from mkbel/Add_IR_sensor_fail_message
...
Add ir sensor fail message
2019-04-02 14:55:27 +02:00
ae11c1e26f
rename function
2019-03-28 16:39:56 +01:00
97594c83bb
function misleading names changed
2019-03-28 14:58:58 +01:00
1dd486d86d
max length of menu item strings added
2019-03-28 13:18:28 +01:00
d22793f276
Z-probe nr. states reduced to 1; 3; 5
2019-03-28 12:02:46 +01:00
02faadf0b9
MMU mode renamed
2019-03-28 09:49:08 +01:00
baeee5817e
Make lcd_selftest_error() calls safer, as nullptr parameter is not handled. It is hard to believe, but it actually saves 4B flash.
2019-03-22 00:24:22 +01:00
966e772702
Fix compile error for non TMC2130 endstops check.
2019-03-22 00:14:29 +01:00
89f1a3bacf
Fix compile error for non TMC2130 pulley check.
2019-03-22 00:11:02 +01:00
8582babddb
Fix compile error for manual fan check.
2019-03-22 00:08:44 +01:00
d1c5c03907
Fix compile error for manual fan check.
2019-03-22 00:03:14 +01:00
c45a7f8641
Fix 1_75mm_MK3-EINSy10a-E3Dv6full variant build error.
2019-03-21 23:50:01 +01:00
91779a5d04
Add filament sensor false triggering message.
2019-03-21 23:36:59 +01:00
ba23b1b2c5
Remove unused.
2019-03-21 22:50:46 +01:00
6c28ed6349
Convert lcd_selftest_error() first parameter to enum class.
2019-03-21 22:48:57 +01:00
7d98177716
farmMode updates
2019-03-19 19:48:40 +01:00
c05561d6b1
Merge pull request #1607 from PavelSindler/7x7
...
7x7 mbl and switching mmu modes
2019-03-15 19:55:15 +01:00
ffe45bdef3
Disable mmu filament cutter feature.
2019-03-15 03:38:37 +01:00
9e0e4198c5
Mesh by 3d-gussner, fixed difference between mbl points coordinates and coordinates used in planner for corrections, mbl settings menu update
2019-03-14 01:52:44 +01:00
1f131f66e0
print parameters checking
...
nozzle diameter
2019-03-14 00:36:56 +01:00
32138ea09a
menu item alignment
2019-03-13 15:08:09 +01:00
b20d9171b6
Merge remote-tracking branch 'upstream/MK3' into 7x7
2019-03-12 11:47:17 +01:00
42036270cf
Merge pull request #1619 from MRprusa3d/PFW-795d
...
better autoLoad II
2019-03-12 11:44:30 +01:00
c55f42965d
Merge pull request #1601 from MRprusa3d/PFW-749
...
SD card menu enhancement
2019-03-12 11:42:53 +01:00
c9cff11732
Merge pull request #1593 from MRprusa3d/PFW-647
...
mode switching, G-code unification
2019-03-12 11:40:43 +01:00
3388444b6c
better autoLoad II
...
autoLoad inhibit if Support::ExtruderInfo(@MKx)/SensorInfo(@MKxS)-menu is selected
2019-03-11 20:43:07 +01:00
698f81abe0
fix compile error
2019-03-11 15:55:48 +01:00
819a91ab1e
switching stealth/normal mode for mmu in settings menu and tune menu
2019-03-11 12:33:22 +01:00
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
091934462d
menu correction
2019-03-08 20:06:30 +01:00
315959c13a
menu update
2019-03-08 20:03:23 +01:00
6a864ffbab
G80 parameters configurable via settings menu
2019-03-08 15:43:37 +01:00
98bb2b7acf
merge debug gcodes for bed analysis
2019-03-06 20:45:23 +01:00
2a71dbefb8
Merge pull request #1597 from mkbel/fix_compiler__warning
...
Fix compiler warning
2019-03-06 19:55:18 +01:00
6217329d50
SD card menu enhancement
2019-03-06 19:51:26 +01:00
101453b674
mbl submenu
2019-03-06 13:27:31 +01:00
1eab058ad4
Fix uninitialized variable used.
2019-03-05 18:08:35 +01:00
7fcecabd5f
Fix compiler warning: variable 'previous_millis_cmd' set but not used
2019-03-05 18:04:58 +01:00
484259cbb2
Fix compiler warning: 'lcd_settings_linearity_correction_menu_save' defined but not used
2019-03-05 18:00:16 +01:00
f1031d2302
new farm statuses for pause (14) and wait for user (15)
2019-03-05 16:00:50 +01:00
7e48d633cb
mode switching
...
info-message viewing during mode switching
2019-03-04 21:30:36 +01:00
9dde8c4732
Merge pull request #1591 from MRprusa3d/PFW-795c
...
better autoLoad
2019-03-04 15:31:04 +01:00
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
b02ca18c93
better autoLoad
...
autoLoad inhibit if Support::ExtruderInfo-menu is selected
2019-03-04 12:52:35 +01:00
9e38b1e101
Add missing message "Preheating to cut".
2019-03-01 18:17:08 +01:00
6437d44991
Fix unable to cut filament, if nozzle is already preheated.
2019-03-01 18:10:06 +01:00
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
824d11e4b0
Remove "Press the knob to eject filament" message, as it is never shown.
2019-03-01 17:43:28 +01:00
57cf7ee171
Fix compiler warning: 'lcd_selftest_fsensor' defined but not used
2019-03-01 17:21:13 +01:00
4c2d4fcf77
Fix compiler warning ultralcd.cpp:4038:10: warning: unused variable 'chars
2019-03-01 17:18:05 +01:00
85c208f9f4
Merge branch 'MK3' into bad_load_cut
2019-03-01 14:55:55 +01:00
22c0d6e230
Merge pull request #1577 from mkbel/add_cut
...
Add MMU cut filament
2019-03-01 14:53:12 +01:00
e27fdafcec
menu switch - initial
2019-02-28 19:42:09 +01:00
2a005caf42
Add cutter enable to tune menu.
2019-02-27 17:47:51 +01:00
02a692c5d9
Store cutter enable state in EEPROM.
2019-02-27 17:34:03 +01:00
4a4eb9962c
Cut filament when cutter is enabled and MMU load fails.
2019-02-27 10:42:26 +01:00
49b1d1cb93
Move prototype to header file.
2019-02-26 18:50:15 +01:00
815231bc26
Add MMU cut filament menu.
2019-02-26 17:58:00 +01:00
ff35119ef3
preHeat @ filament management
...
another funcionality III / autoLoad
2019-02-26 17:33:37 +01:00
7a1b47c340
Convert functions mmu_eject_fil_0 to mmu_eject_fil_4 to template function.
2019-02-26 11:11:05 +01:00
34e2495487
Convert mmu_load_to_nozzle_0 to mmu_load_to_nozzle_4 to template.
2019-02-26 10:32:10 +01:00
be0ed46335
preHeat @ filament management
...
another funcionality III
2019-02-22 03:09:50 +01:00
323071f50a
preHeat @ filament management
...
another funcionality II
2019-02-21 13:20:29 +01:00
a54c68b874
preHeat @ filament management
...
another funcionality II
2019-02-21 04:45:44 +01:00
da0867cfc5
preHeat @ filament management
...
another funcionality
2019-02-20 03:01:33 +01:00
11d19879fc
Merge pull request #1533 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad / MMU
2019-02-15 17:45:38 +01:00
0c1f9b5100
preHeat @ filament management
...
target temperature keeping
2019-02-15 02:25:44 +01:00
80c3420a12
Merge branch 'MK3' into PFW-210
2019-02-14 00:05:50 +01:00
ef1f82627e
preHeat @ filament load / unload / autoLoad / MMU
...
MMU options added
2019-02-13 23:53:00 +01:00
9e873ac0f7
Use enum for mmu_cmd instead of plain integer type.
2019-02-13 01:51:39 +01:00
e432e258dc
extr fan RPM measuring fix
2019-02-06 22:56:10 +01:00
22217a42f7
message change
2019-02-06 21:37:39 +01:00
726d5aa3c3
typo fixed
2019-02-06 16:29:10 +01:00
2fe8e0670a
MK2 build fail fixed
2019-02-06 16:15:19 +01:00
ef86c78f25
menu item text changed
2019-02-06 14:24:47 +01:00
1ba046395e
fan measurements fix: keep fanSpeedSoftPwm = 255 during measurements, selftest changes
2019-02-06 12:37:18 +01:00
860e6f9994
Merge remote-tracking branch 'upstream/MK3' into variants
2019-02-06 09:19:38 +01:00
fcb7dd90cf
Merge pull request #1505 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad
2019-02-06 09:14:03 +01:00
a53d150903
preHeat @ filament load / unload / autoLoad
...
autoLoad option added
2019-02-06 01:58:05 +01:00
f9298b37b8
fan check hotfix (selftest, measuring RPM, fan errors)
2019-02-05 04:02:38 +01:00
9a51a7be29
Merge branch 'bed_correction_fix' into variants
2019-02-04 12:47:06 +01:00
0853ef5d06
Merge remote-tracking branch 'upstream/MK3' into variants
2019-02-04 12:45:28 +01:00
b4f2dc3b5e
Merge remote-tracking branch 'robert/MK3-variants' into variants
2019-02-04 12:41:08 +01:00
6d5a2ae816
Merge pull request #1499 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload
2019-02-04 12:37:42 +01:00
d2a4cb4c49
Use _delay_ms instead of delay (fix - fast scrolling in sd card menu - temporary solution)
2019-02-04 12:20:07 +01:00
fff8fc8a48
preHeat @ filament load / unload
...
filament-list correction (PET missing)
2019-02-04 12:12:35 +01:00
3244c37435
Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control
2019-02-04 01:32:04 +01:00
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
4444b155f1
M600: prevention of blob; massage changed when autoload is active
2019-02-01 21:08:34 +01:00
97aaf919a3
Merge remote-tracking branch 'upstream/MK3' into dev
2019-02-01 18:12:59 +01:00
79449a8eaf
Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control
2019-02-01 13:29:50 +01:00
4f67a9569c
dont show filament sensor in extruder info menu
2019-01-31 18:03:56 +01:00
6342b6032c
Merge remote-tracking branch 'upstream/MK3' into variants
2019-01-31 10:18:41 +01:00
491dbf5ebd
Merge pull request #1493 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload
2019-01-31 10:15:59 +01:00
921b6993ee
preHeat @ filament load / unload
2019-01-31 05:21:53 +01:00
9926468c91
Merge remote-tracking branch 'upstream/MK3' into variants
2019-01-30 17:26:45 +01:00
19fd05bb46
Merge pull request #1490 from PavelSindler/menu_update
...
menu update
2019-01-29 13:29:27 +01:00
1fa9913029
include printers.h
2019-01-28 21:54:44 +01:00
220437316b
Merge pull request #1485 from XPila/MK3-bed_fast_pwm
...
Mk3 bed fast pwm
2019-01-28 21:14:01 +01:00
29e156b26d
printer types updated
2019-01-28 19:48:46 +01:00
25d54d43aa
menu update
2019-01-28 19:41:02 +01:00
dd4d8e1277
calibrate z endstop update
2019-01-28 19:23:19 +01:00
0514306bed
selftest fixed
2019-01-28 11:09:41 +01:00
7889305702
merging changes from upstream
2019-01-28 11:00:42 +01:00
c6e6df404c
Merge pull request #1482 from mkbel/IR_fsens_selftest
...
Ir fsens selftest
2019-01-28 10:39:12 +01:00
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
434a723151
Timing functions 'micros' and 'delay' replaced in whole source with 'micros2' and 'delay2'
2019-01-27 17:37:27 +01:00
aaa2670ef8
Remove redundant enum numbering.
2019-01-25 20:14:29 +01:00
b167896c6d
Convert lcd_selftest_screen parameter int _step to enum class testScreen screen.
2019-01-25 20:00:12 +01:00
6d1256eaad
Internationalize "Calibrating home".
2019-01-25 18:06:30 +01:00
6b6a3d7d5f
MMU_IR_SENSOR_PIN -> IR_SENSOR_PIN
2019-01-25 18:01:17 +01:00
7e3a1c7d45
merge changes from upstream
2019-01-25 17:57:24 +01:00
0d1a7a1774
Merge pull request #1479 from MRprusa3d/PFW-749
...
SD card menu
2019-01-25 14:32:12 +01:00
edc412697c
Increase selftest_irsensor() filament nozzle unload temperature to ABS.
...
Resume nozzle temperature immediately after unload.
2019-01-24 21:24:46 +01:00
68ffa95aa9
Fix axis self-test progress visualization.
2019-01-24 21:06:03 +01:00
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
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
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
b2b65475df
SD card menu
...
SDcard-menu after card insertion
2019-01-24 17:32:57 +01:00
ad65024147
selftest: filament sensor check change
2019-01-24 13:57:52 +01:00
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
1d71c1a5d1
Update IR sensor selftest progress bar more frequently.
2019-01-22 19:02:42 +01:00
97a4623800
Fix lcd_selftest_screen for small _progress_scale.
2019-01-22 19:01:55 +01:00
9cda0b69b8
Update IR sensor selftest progress bar.
2019-01-22 18:23:00 +01:00
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
c371a5ea65
Document.
2019-01-22 14:05:08 +01:00
a92d9c782b
Add IR sensor test.
2019-01-22 11:29:55 +01:00
f292a6ca7a
Refactor filament sensor selftest call.
2019-01-21 21:39:38 +01:00
e36e58f385
show sensor on/off temporarily changed to unlocalized strings
2018-12-21 21:28:57 +01:00
ba57986b72
merge changes from upstream
2018-12-21 20:58:38 +01:00
5462d451e1
show power failures in fail stats menu, shorter load to nozzle if idler sensor detected
2018-12-21 20:56:45 +01:00
d292e877df
load to nozzle shortened, sensor menu moved to support
2018-12-21 18:51:13 +01:00
3c64bad1cb
initial version which works on old and new hw, initial version of idler sensor detection
2018-12-21 17:12:16 +01:00
b0fce9122e
Merge pull request #1416 from PavelSindler/z_cal_endstops
...
Z cal endstops and stop paused print fix
2018-12-19 19:46:27 +01:00
40fe52202d
stop paused print fix: saved_printing set to false when doing stop print
2018-12-19 19:20:09 +01:00
b5430c2968
M600: consume click
2018-12-18 19:10:02 +01:00
880163dbcb
missing prototypes
2018-12-18 17:38:24 +01:00
fc5d7e35ef
fail stats mmu function definitions
2018-12-18 17:35:41 +01:00
11ab5dfd36
fail stats menu for mmu defined for MK2.5 version
2018-12-18 17:33:27 +01:00
cb1f6d2a0e
show sensor states in calibration menu
2018-12-14 19:43:26 +01:00
e0bed71801
comments update
2018-12-13 17:01:45 +01:00
bbba27c15f
idler state menu
2018-12-13 16:53:59 +01:00
DRracer
Ondrej Tuma
Marek Bel
MRprusa3d
PavelSindler
PavelSindler
MRprusa3d
Robert Pelnar