Commit Graph

3243 Commits

Author SHA1 Message Date
Marek Bel 07a0f527d8 Reset lcd_encoder_diff in lcd_show_fullscreen_message_yes_no_and_wait_P() also when it times out. 2019-09-12 20:30:27 +02:00
Marek Bel 6630591f9e Consume lcd_encoder_diff in lcd_show_fullscreen_message_yes_no_and_wait_P().
This fixes problem encountered in lcd_v2_calibration(). Selected menu item skips to another if returning to menu after this message is used.
2019-09-12 20:20:33 +02:00
Marek Bel d48197656c Fix lcd_v2_calibration menu not redrawn after full screen message or question. 2019-09-12 20:05:16 +02:00
Marek Bel 770e470fd5 Extract common code to function preheat_or_continue(). Saves 138B of FLASH memory. 2019-09-12 18:53:24 +02:00
Marek Bel d80b8280a0 Remove commented out and unused functions prototypes. 2019-09-12 18:41:17 +02:00
Marek Bel 3a541488b2 Rename extr_unload_() to mmu_unload_filament() and move it to ultralcd.cpp as it is menu. 2019-09-12 18:40:02 +02:00
Marek Bel 0cdfa7a5e8 Remove dead code. 2019-09-12 18:33:02 +02:00
Marek Bel e83b2ebe1f Rename mFilamentMenu to lcd_generic_preheat_menu to match naming convention for global function and be more descriptive. 2019-09-12 18:15:15 +02:00
Marek Bel c26d7e50f7 Remove redundant lcd_update_enable(true) call. 2019-09-12 18:07:46 +02:00
Marek Bel 6674cbf0d7 Select material / temperature before first layer calibration. 2019-09-12 17:54:05 +02:00
Marek Bel 6661d3aa45 Merge remote-tracking branch 'prusa3d/MK3' into MM_lay1_cal 2019-09-12 14:28:52 +02:00
DRracer 521c5eb8ef
Merge pull request #2141 from mkbel/preheat_menu
Unify preheat menu, add ASA material
2019-09-12 14:25:38 +02:00
Marek Bel 43705aae2e Rename lay1cal_preheat() to lay1cal_wait_preheat(). 2019-09-12 00:19:20 +02:00
Marek Bel ae3e6530e6 Do not ask for PLA filament in the beginning of first layer calibration. Do not ask if filament is present if it can be detected by IR sensor. 2019-09-12 00:14:24 +02:00
Marek Bel 14dc6b86e0 Change undocumented behaviour of M190 (Wait for bed temperature). Document M190 and M109 (Wait for extruder temperature).
Do not remember CooldownNoWait property set by M190 and M109. If M190 was invoked without parameters, CooldownNoWait property was set if it was previously set by "M109 S" or "M109 S" or printer was after power up. Otherwise CooldownNoWait was not set. Now CooldownNoWait is never set if M190 is invoked without parameters.

Saves 44 B of FLASH memory.
2019-09-11 23:37:09 +02:00
Marek Bel acb0341a1f Do not set temperature in lay1cal_preheat(). 2019-09-11 22:42:40 +02:00
Marek Běl 5a1005e143
Merge pull request #2186 from DRracer/enable-fan-pin-test-MK3
Enable fan pin test even for MK3
2019-09-10 18:21:17 +02:00
DRracer d94356802c
Merge pull request #2187 from prusa3d/MK3_3.8.0
Mk3 3.8.0
2019-09-10 18:19:36 +02:00
DRracer e1e40213b2 Enable fan pin test even for MK3 (was disabled in 3.7.2 due to lack of
FLASH)
2019-09-10 16:49:22 +02:00
DRracer 898e85e69f
Merge pull request #2038 from Eriobis/MK3
Add a threshold distance to Z calibration
2019-09-10 16:20:24 +02:00
DRracer 76c062b980
Merge pull request #2169 from mkbel/format
Use same format for all instances where "ok" is send to serial line.
2019-09-10 14:14:47 +02:00
DRracer 059c6b6cbf
Merge pull request #2148 from leptun/MK3_MK2.x_fix_Default_stepper_power
Mk3 mk2.x fix default stepper power
2019-09-10 14:13:51 +02:00
DRracer 60de313b8a
Merge pull request #1759 from wavexx/enhanced_longpress
Default to "Live Adjust Z" when longpressing during a print (closes #1604)
2019-09-10 14:13:00 +02:00
DRracer f6f8f5b3b6
Merge pull request #2171 from 3d-gussner/patch-3
Update reserved space bytes as mentioned in
2019-09-10 14:07:56 +02:00
DRracer 90f85f7128
Merge pull request #2181 from leptun/MK3_fix_lcd_warning
Mk3 fix lcd warning
2019-09-10 14:07:28 +02:00
DRracer 6659348d2f
Merge pull request #2185 from prusa3d/MK3_3.8.0
Mk3 3.8.0
2019-09-10 14:06:03 +02:00
leptun 818befb91b Fix compile warning
function was defined as static in lcd.cpp and redefined in lcd.h
2019-09-09 14:05:20 +03:00
leptun 2480bd90fc Revert lcd_putchar to type int and retrun 0
Discussion: https://github.com/prusa3d/Prusa-Firmware/pull/2008#issuecomment-514500738
2019-09-09 13:59:20 +03:00
MRprusa3d 7cc9fe2e4f
Update 1_75mm_MK3S-EINSy10a-E3Dv6full.h 2019-09-09 02:20:39 +02:00
MRprusa3d 70de4d58f6
Update 1_75mm_MK3-EINSy10a-E3Dv6full.h 2019-09-09 02:20:14 +02:00
MRprusa3d fb561b15ad
Update 1_75mm_MK25S-RAMBo13a-E3Dv6full.h 2019-09-09 02:19:52 +02:00
MRprusa3d 325e4a3403
Update 1_75mm_MK25S-RAMBo10a-E3Dv6full.h 2019-09-09 02:19:27 +02:00
MRprusa3d 0b50b2295c
Update 1_75mm_MK25-RAMBo13a-E3Dv6full.h 2019-09-09 02:18:54 +02:00
MRprusa3d e581263bf1
Update 1_75mm_MK25-RAMBo10a-E3Dv6full.h 2019-09-09 02:18:22 +02:00
MRprusa3d ca6937edaf
Update 1_75mm_MK2-RAMBo13a-E3Dv6full.h 2019-09-09 02:17:42 +02:00
MRprusa3d a9a3d9d084
Update 1_75mm_MK2-RAMBo10a-E3Dv6full.h 2019-09-09 02:17:00 +02:00
MRprusa3d 978ace7fd7
Update Marlin_main.cpp 2019-09-09 02:16:06 +02:00
MRprusa3d 28c1486df2
Update Configuration.h 2019-09-09 02:14:10 +02:00
DRracer eec8e5f8c0 Version changed (3.8.0 build 2684) 2019-09-06 19:47:05 +02:00
MRprusa3d 847f50cb62
Merge pull request #2172 from DRracer/lang38
fine-tuning the translated texts to fit into LCD
2019-09-06 17:29:07 +02:00
DRracer 0413fe9e0e lang translation finetuning 6 2019-09-06 17:12:19 +02:00
DRracer 61c6e6d257 lang translation finetuning 5 2019-09-06 16:47:55 +02:00
DRracer 3d8b5129da lang translation finetuning 4 2019-09-06 16:04:00 +02:00
DRracer e8d8e0c9f0 lang translation finetuning 3 2019-09-06 15:58:26 +02:00
3d-gussner d408fd2f42
Update reserved space bytes as mentioned in
https://github.com/prusa3d/Prusa-Firmware/pull/2170#pullrequestreview-284810840
2019-09-06 15:54:04 +02:00
DRracer da0c4a2fa8 lang translation finetuning 2 2019-09-06 15:51:51 +02:00
DRracer d182e6fc65 DE,ES,FR translation finetuning 2019-09-06 15:35:21 +02:00
XPila 59a0213329
Merge pull request #2170 from DRracer/lang38
update translated UI texts
2019-09-06 13:39:52 +02:00
DRracer 3ba2197dd3 more space for the second lang 2019-09-06 08:37:59 +02:00
DRracer 441e24acbd update translated UI texts 2019-09-06 08:30:10 +02:00