Marek Bel
|
aba9d1c360
|
Merge branch 'MK3' into MM_lay1_cal
|
2019-09-30 18:13:57 +02:00 |
DRracer
|
139c37c744
|
allow only one string translation constraint defintion per line
|
2019-09-20 13:01:07 +02:00 |
D.R.racer
|
2afeb65811
|
return failStatsFmt that fell out in merge
|
2019-09-19 18:39:25 +02:00 |
|
D.R.racer
|
f50cef8361
|
Merge remote-tracking branch 'upstream/MK3' into translations-doc
and resolve ultralcd.cpp conflicts
|
2019-09-19 18:10:20 +02:00 |
Marek Běl
|
68359687f8
|
Merge pull request #2202 from DRracer/lang-381-fixes
dialogs' layouts fixes + FR polished
|
2019-09-19 16:33:26 +02:00 |
|
D.R.racer
|
17cca89993
|
Merge remote-tracking branch 'upstream/MK3' into translations-doc
|
2019-09-18 15:17:28 +02:00 |
|
DRracer
|
e7273ea505
|
Fix [French translation] Wrong display during mesh bed calibration #2218
minor code/doc improvements
|
2019-09-18 12:49:44 +02:00 |
|
DRracer
|
c1bf4a6288
|
Merge pull request #2216 from michalrudolf/MK3-miniopravy
Mk3 miniopravy
|
2019-09-18 11:34:17 +02:00 |
|
Marek Bel
|
027b6238fd
|
Mark code unused when PINDA_THERMISTOR is defined by macro. Saves 1B of RAM and 4B of FLASH memory.
|
2019-09-17 20:26:03 +02:00 |
|
Marek Bel
|
966d9baf2b
|
Document.
|
2019-09-17 19:00:03 +02:00 |
michalrudolf
|
b660cb3908
|
ultralcd.cpp
|
2019-09-17 11:46:29 +02:00 |
|
D.R.racer
|
77c4720c8b
|
Merge remote-tracking branch 'upstream/MK3' into translations-doc
|
2019-09-17 11:32:27 +02:00 |
|
michalrudolf
|
b4e0c2f455
|
Update ultralcd.cpp
Menu Support -> XYZ calibration details -> 3. obrazovka "point offset"
X value is no longer moved to the left if there’s no negative sign
|
2019-09-17 10:51:43 +02:00 |
|
Marek Bel
|
c66b4bd876
|
Do not ask for preheat temperature twice if calibrating first layer from wizard without filament.
|
2019-09-16 21:14:17 +02:00 |
|
Marek Bel
|
e1cfd6dc4f
|
Remove option to heat nozzle only from mFilamentItem() when activated from wizard, as it has no use after filament unload was removed from wizard.
|
2019-09-16 18:48:52 +02:00 |
|
Marek Bel
|
ff4450489b
|
Document.
|
2019-09-16 18:38:44 +02:00 |
|
Marek Bel
|
002a7d31a4
|
Make lcd_wizard() more debug friendly.
|
2019-09-16 18:31:12 +02:00 |
|
Marek Bel
|
b99038736c
|
Use eeprom_update_byte instead of eeprom_write_byte
|
2019-09-16 18:22:34 +02:00 |
|
Marek Bel
|
015b34de05
|
Alert user in wizard about more sheets presets.
|
2019-09-13 17:09:11 +02:00 |
|
DRracer
|
4423106fad
|
dialogs' layouts fixes (support menu dlgs, statistics etc.)
French translation polished
|
2019-09-13 16:55:05 +02:00 |
|
Marek Bel
|
e754780717
|
Fix condition for returning to wizard. eFilamentAction == FilamentAction::Preheat was never true as eFilamentAction is set to eFilamentAction::None in lcd_return_to_status().
|
2019-09-13 00:19:37 +02:00 |
|
Marek Bel
|
f1d190d2d5
|
Do not ask same filament related question twice if starting first layer calibration from wizard.
|
2019-09-12 23:41:42 +02:00 |
|
Marek Bel
|
ebf405d589
|
Preselect "yes" for filament question in first layer calibration wizard.
|
2019-09-12 23:20:03 +02:00 |
|
Marek Bel
|
d256c18635
|
Fix first layer calibration wizard. Do not jump to WizState::LoadFil if calibration is supposed to be performed.
|
2019-09-12 23:17:19 +02:00 |
|
Marek Bel
|
73642632f5
|
Do not force PLA filament in first layer calibration from wizard. Remove duplicate variable wizard_active. Saves 410 B of FLASH and 1 B of RAM.
|
2019-09-12 22:37:28 +02:00 |
|
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 |
|
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 |
3d-gussner
|
d51b3d6207
|
Added doxygen todos for missing LCD layout and positioning
|
2019-09-01 09:51:51 +02:00 |
|
Marek Běl
|
a789a8995f
|
Merge pull request #2145 from mkbel/fix_sheet_reset
Fix sheet reset
|
2019-08-30 16:49:34 +02:00 |
|
Marek Bel
|
3d292350d4
|
Do not activate selected_sheet in lcd_v2_calibration() as this leads to calibrating random sheet if activated from calibration menu.
selected_sheet is initialized to 0 and contains index of last Sheet menu visited.
|
2019-08-30 14:45:25 +02:00 |
|
Marek Bel
|
26423f98bc
|
Switch to next sheet if currently selected sheet is not initialized. Move next_initialized_sheet() and change_sheet_from_menu() to eeprom.cpp, rename it to eeprom_next_initialized_sheet() and eeprom_switch_to_next_sheet(). Rename default_sheet_name() to eeprom_default_sheet_name().
|
2019-08-30 12:24:13 +02:00 |
|
Marek Bel
|
8c8619be05
|
Convert reset sheet sub menu to function.
|
2019-08-29 20:52:53 +02:00 |
|
Marek Bel
|
abf84e36f5
|
Fix sheet menu back caption to Steel sheets to match parent menu caption.
|
2019-08-29 20:23:02 +02:00 |
|
Marek Bel
|
d647cdc02c
|
Convert sheet switcher from sub menu to function. Handle null characters in sheet name.
|
2019-08-29 20:13:10 +02:00 |
|
Marek Bel
|
32f435d1a0
|
Increase number of configurable steel sheets to 8. Move sheets into sub menu of HW setup.
|
2019-08-29 17:21:08 +02:00 |
|
Marek Běl
|
3413d5d486
|
Merge pull request #2139 from DRracer/assist-mode-fixes
Fix sound mode [assist]: encoder clicking indefinitely when MMU wants to
|
2019-08-29 15:55:49 +02:00 |
|
Marek Bel
|
f3bb72be64
|
Reset calibration status if there is no calibrated sheet after reset.
|
2019-08-29 03:33:33 +02:00 |