Commit Graph

970 Commits

Author SHA1 Message Date
Marek Bel aba9d1c360 Merge branch 'MK3' into MM_lay1_cal 2019-09-30 18:13:57 +02:00
leptun dfd3f34351 Check for minimum fan speed. Should be achievable by both fans in 1s. 2019-09-25 22:35:35 +03:00
leptun 532d1fc4ae Fix "Resume Print" missing when doing a normal pause 2019-09-25 18:32:35 +03:00
leptun c3b7b5ebb5 Check fans before resuming 2019-09-25 15:58:07 +03:00
leptun 3c17f7e145 No need to check the fan in the menu 2019-09-22 14:04:58 +03:00
leptun 2363f19a62 Minor tweaks for usb printing 2019-09-20 21:07:20 +03:00
DRracer 139c37c744 allow only one string translation constraint defintion per line 2019-09-20 13:01:07 +02:00
leptun fd01942db8 FAN Error fix - Initial 2019-09-19 20:48:59 +03: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
MRprusa3d d491a9801d
Update ultralcd.cpp 2019-09-16 16:04:45 +02:00
MRprusa3d 0e1d559f03
Merge branch 'MK3' into PFW-943 2019-09-16 15:29:28 +02:00
MRprusa3d 011468598e IR sensor gen. II
disconnected PCB detection
2019-09-16 00:43:37 +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
leptun ae839aee31 Merge branch 'MK3' into MK3_Translations 2019-09-12 16:28:36 +03: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
leptun bf9f668574 Fix short filenames scrolling in sdprint menu and status screen 2019-09-11 22:04:48 +03: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
vintagepc 339771a5fb Fixed info screen when selected_sheet hasn't been initialized. 2019-08-31 21:27:08 -04:00
leptun 10cdcb3ae3 SD Scroll workaround 2019-08-31 17:00:39 +03:00
leptun 795b1d1cf7 Toggle Sound 2019-08-31 16:56:14 +03:00
Yuri D'Elia 2345288d40 Fix the LCD pause function
Do not call long_pause recursively!

long_pause() is called before resetting the lcd_command_type. As
long_pause uses st_synchronize() internally, there could be time to
schedule another call to long_pause().
2019-08-31 15:28:31 +02:00
leptun 3c4fffef60 Merge branch 'MK3' into MK3_Translations 2019-08-31 15:30:51 +03:00
leptun a5a5f5cf0b Toggle RPi port
Probably works, needs to be tested.
2019-08-31 15:25:00 +03:00
leptun f69035323a Toggle SD Settings
This includes FlashAir support and SD Sorting type
2019-08-31 14:55:51 +03:00
leptun a821002f02 Toggle MMU Mode 2019-08-31 07:38:40 +03:00
vintagepc d347a36509 Merge branch 'MK3' of https://github.com/prusa3d/Prusa-Firmware into MK3-2093-sheet-display 2019-08-30 19:17:27 -04:00
vintagepc 871e29621f Fix "stuck" rename cursor 2019-08-30 19:14:22 -04: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
leptun 6a8330a43b Toggle "HW Setup"*
All toggles from "HW Setup" were changed.
This includes:
-"Nozzle d."
-all "Checks"
Also added an option to provide a string from sram (not from progmem) as the toggle argument. This can be useful when toggling numbers or even when toggling sheets in the future.
2019-08-30 17:36:21 +03: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
leptun b86a92a7d6 Toggle Mode (stepper power) 2019-08-30 07:59:58 +03:00
vintagepc 8df6691819 Relocate sheet menu, show sheet on info screen
-Sheet is shown instead of percentage done either if idle, or during
print preheat.
-Relocated sheet menu to below SD menu for additional visibility to
current sheet.
2019-08-29 18:07:24 -04:00
leptun db6e2e0525 Toggle Crash det. 2019-08-29 22:31:30 +03: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
leptun 7f51e0bad8 Move SpoolJoin and Cutter to MSGs 2019-08-29 17:35:26 +03: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
leptun 0b21acec46 Minor fix to Toggle Cutter 2019-08-29 15:49:26 +03:00
leptun d0f9f10ed6 Toggle Cutter 2019-08-29 15:43:41 +03:00
leptun 1937cf2074 Toggle SpoolJoin 2019-08-29 15:40:04 +03:00
leptun 5eea8d26fe Merge branch 'MK3' into MK3_Translations 2019-08-29 12:08:48 +03:00
Marek Bel f3bb72be64 Reset calibration status if there is no calibrated sheet after reset. 2019-08-29 03:33:33 +02:00
Marek Bel f64252b59b Hide sheet switcher from main menu, if there are less than 2 sheets calibrated. 2019-08-28 19:08:53 +02:00
Marek Bel 9692f94683 Move sheet menu up to be after Print from SD. 2019-08-28 19:01:48 +02:00
Marek Bel 3903dc819a Extract function next_initialized_sheet from change_sheet_from_menu(). Make it more general to depend on sizeof(Sheets::s) instead of hard coded value of 2. 2019-08-28 18:59:48 +02:00
Marek Bel 49bc11037c Remove statements with no effect. 2019-08-28 18:14:10 +02:00
DRracer 1d23cc52e9 endstop sound alert fixes 2019-08-28 09:39:28 +02:00
Marek Bel 29c8cb2927 Fix bad merge. 2019-08-27 22:22:36 +02:00
Marek Běl 3f04c4db87
Merge branch 'MK3' into preheat_menu 2019-08-27 22:20:23 +02:00
Marek Bel 07169ad84a Make file local variable static. 2019-08-27 20:48:53 +02:00
Marek Bel e57fcc04a7 Fix compiler warnings. 2019-08-27 20:23:48 +02:00
Marek Bel d927d5b05d Port wizard_active to mFilamentItem(). 2019-08-27 20:19:03 +02:00
Marek Bel cef7f31b9f Set FilamentAction to None if mFilamentMenu left by cooldown or menu back action. 2019-08-27 20:13:55 +02:00
Marek Bel ffc5a64154 Remove commented out code. 2019-08-27 20:06:48 +02:00
Marek Bel 269aef1696 Remove unused code guarded by WATCH_TEMP_PERIOD macro as most of the functionality is duplicate to what is implemented in temp_runaway_check(). This will release us from porting setWatch() to unified preheat menu and maintaining it. 2019-08-27 20:05:10 +02:00
DRracer 1a1be5c518 Fix sound mode [assist]: encoder clicking indefinitely when MMU wants to
select filament
2019-08-27 17:10:29 +02:00
Marek Bel bf2097342d Add ASA preheat into mFilamentMenu(); 2019-08-27 17:01:41 +02:00
Marek Bel 3da43ae8c2 Do not port print fan preheat speed preset, as it was never used. And it was broken until recently fixed when adding ASA profile. 2019-08-26 21:14:07 +02:00
Marek Bel 4792559536 Add farm preheat items. Add setWatch() call. 2019-08-26 21:00:30 +02:00
Marek Bel aa13f9e809 Fix formatting. 2019-08-26 20:19:34 +02:00
Marek Bel 668e89e5a9 Preheat menu: Add ASA, hide menu item back when in wizard. 2019-08-26 20:18:34 +02:00
Marek Bel 52ae62bbba Fix formatting. 2019-08-26 20:14:00 +02:00