Commit Graph

931 Commits

Author SHA1 Message Date
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
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
leptun 795b1d1cf7 Toggle Sound 2019-08-31 16:56:14 +03: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
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
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
Marek Bel 3628d893ee Remove duplicate preheat menu.
Known limitations: farm_mode missing, wizard_active missing, cooldown missing, ASA missing, print fan missing.
2019-08-26 20:11:52 +02:00
Marek Bel b9b0d6049e Fix formatting. 2019-08-26 19:48:39 +02:00
DRracer c6df3fe012
Merge pull request #2127 from DRracer/code-size-reduction-1
Code size reduced by almost 5KB
2019-08-22 14:25:23 +02:00
3d-gussner d3123a74b0 Updated LCD menu documentation to new form/syntax 2019-08-22 04:58:16 +02:00
3d-gussner 514b062107
Added `lcd_menu` format description
Added some documentation how the LCD menus look like and added max character values for translations.

There are more things needed and also the placement in the code is an open task. Depending on the decision if we use `messages.c/h`
2019-08-21 10:28:28 +02:00
DRracer a7c2aec04c Code size reduced by almost 5KB 2019-08-21 09:59:51 +02:00
Marek Bel f204cdea81 Refactor
Remove variable CrashDetectMenu. Read this state from EEPROM_CRASH_DET instead in bool lcd_crash_detect_enabled().
Rename crashdet_enable() to lcd_crash_detect_enable() and move it to ultralcd.cpp.
Rename crashdet_disable() to lcd_crash_detect_disable() and move it to ultralcd.cpp.
Rename lcd_crash_mode_set() to crash_mode_switch().
Remove forward function declarations from *.cpp file.

Saves 34B of FLASH and 2B of RAM.
2019-08-20 17:22:27 +02:00
leptun 0d22f8039e Toggle FSENSOR and FSENSOR_AUTOLOAD 2019-08-19 11:58:16 +03:00
leptun 5a3f14b752 "N/A" toggle support and format update 2019-08-19 10:20:17 +03:00
Marek Bel 170c1ea866 Split first layer calibration load filament and intro line into separate steps. If load fails, pause print apparently flushes command buffer and intro line is not printed after issue is resolved. 2019-08-16 20:47:55 +02:00
Marek Bel 1036c4f755 Do not precede first layer calibration without filament if print is paused due to MMU load failed. 2019-08-16 19:00:45 +02:00
Marek Bel b10bd8340a Make local functions static. 2019-08-15 17:57:30 +02:00
Marek Bel 0b798767af Fix preheat ASA. 2019-08-15 17:54:23 +02:00
Marek Bel a6f955b62d Use unused macros *_PREHEAT_FAN_SPEED. 2019-08-15 17:47:34 +02:00
Marek Bel eb68bb9b43 Add ASA preheat. 2019-08-15 17:46:29 +02:00
Marek Bel 36a69281ee Remove unused functions forward declarations. 2019-08-15 17:36:05 +02:00
leptun 596ffe1dc2 Actual fix to the missing first two characters 2019-08-10 21:03:45 +03:00
leptun 7ce2fedac7 Fix missing first two characters in multi-lang mode 2019-08-10 09:16:23 +03:00
leptun 29dcb1cad3 Toggle FANS_CHECK 2019-08-10 08:43:07 +03:00
DRracer d9dec38815 Workaround for the "viper" situation bug. 2019-08-07 17:23:19 +02:00
Yuri D'Elia 33037d369c Prevent LCD long-press re-entry (fixes #1196) 2019-08-05 19:00:29 +02:00
Marek Kühn f1a947af2c Whole hw settings hidden in farm mode 2019-08-05 10:40:21 +02:00
Marek Kühn 5f14e9c2e5 Removed sheet setting when in farm mode 2019-08-03 17:35:39 +02:00
Marek Bel bca0fd81eb Fix loading filament 255 instead of 0 in first layer calibration wizard. 2019-07-30 19:15:33 +02:00
leptun 3ddb853bbd Fix shifted languages. Use \n and \x0a 2019-07-26 18:53:08 +03:00
NotaRobotexe 5021fadd5d multiple sheets - menu switching bug 2019-07-24 11:20:27 +02:00
NotaRobotexe 851aaac053 Merge branch 'MK3' of https://github.com/NotaRobotexe/Prusa-Firmware into MK3 2019-07-23 19:29:36 +02:00
NotaRobotexe fb35009628 multiple sheets,fix of bug in switching sheets from menu 2019-07-23 19:25:59 +02:00
NotaRobotexe c4d5e332c8
Merge branch 'MK3' into MK3 2019-07-23 11:34:42 +02:00
NotaRobotexe b9f622f8a6 variables to PROGMEM, text formating 2019-07-23 11:31:20 +02:00
NotaRobotexe b5129ff2ec Revert "force push"
This reverts commit 19e7838c20.
2019-07-23 11:12:53 +02:00
NotaRobotexe 19e7838c20 add default names to PROGMEM, text formating edit 2019-07-22 20:35:10 +02:00
NotaRobotexe ab2eafe175 sheet menu, add hw setting, sheet change in menu, sheet name initialization in eeprom 2019-07-22 18:43:43 +02:00
DRracer 6f79ef4c9c resolve hidden conflicts in commented code 2019-07-22 17:29:43 +02:00
DRracer 65087b89ee Merge remote-tracking branch 'upstream/MK3' into code_size_optimization
and resolve conflicts (ultralcd.cpp)
2019-07-22 17:26:14 +02:00
DRracer b96c9700ce fix prusa_statistics code size optimization according to unit test
results
2019-07-22 17:10:04 +02:00
NotaRobotexe 9c95f8c015 sheet menu 2019-07-19 18:34:46 +02:00