Commit Graph

1032 Commits

Author SHA1 Message Date
Alex Voinea 359c447127 Do not check for fanError if it is not enabled on resume
Fix typos
2019-11-16 22:44:34 +02:00
Alex Voinea 07b6173aaa Merge branch 'MK3' into MK3-PFW-1024 2019-11-16 11:28:29 +02:00
DRracer e2e32b455a
Merge pull request #2247 from mkbel/reset_live_Z+offset
Show current Z offset in reset dialog before first layer calibration
2019-11-15 17:52:29 +01:00
DRracer 460f6c3b5e
update message 2019-11-15 17:47:39 +01:00
DRracer 715794d854
Merge pull request #2092 from leptun/MK3_Translations
PFW-1062: Mk3 Toggle and Translations
2019-11-15 16:53:17 +01:00
DRracer 3a41405f52
Merge pull request #2146 from vintagepc/MK3-2093-sheet-display
PFW-1061: #2093 - Relocate sheet menu, show sheet on info screen
2019-11-15 16:07:51 +01:00
vintagepc f6c35c5d5f
Removed separate fix for #2089
Per PR fix request
2019-11-15 08:58:58 -05:00
DRracer 8fae50ec79
Merge pull request #2315 from mkbel/finda
PFW-1047: Show FINDA state as N/A if last received response is older than 1s.
2019-11-15 12:53:01 +01:00
DRracer 56251c4f99
Merge pull request #1937 from arons/MK3
added new function belt test under calibration menu
2019-11-15 09:39:42 +01:00
DRracer 9e780f0b2b
remove ESC sequence 2019-11-15 09:26:56 +01:00
Alex Voinea 11428388c6 MBL toggle and cleanup 2019-11-09 20:58:56 +02:00
Alex Voinea 20a59f5f40 Temp cal. 2019-11-08 19:44:48 +02:00
DRracer c82fa07299
Merge pull request #2195 from leptun/MK3-fix-LFN
Fix short filenames scrolling in sdprint menu and status screen
2019-11-08 16:52:53 +01:00
DRracer ce5efb107a
Merge pull request #2155 from leptun/MK3_SD_scroll_workaround
SD Scroll workaround
2019-11-08 16:48:38 +01:00
DRracer b33c79e6c7
Merge pull request #1899 from wavexx/fix_lcd_pause_function
Fix the LCD pause function
2019-11-08 14:55:13 +01:00
DRracer 42d70f3dea
Merge pull request #1768 from wavexx/unknown_z_improvements
"Unknown z" improvements
2019-11-08 14:52:56 +01:00
Alex Voinea 1de353dd09 Merge branch 'MK3' into MK3_Translations 2019-11-07 17:02:45 +02:00
DRracer 3c26f7855b
Merge pull request #1704 from leptun/MK3_Enable_fan_waiting_cooldown
Enable print fan while waiting for cooldown
2019-11-04 16:52:26 +01:00
leptun cd5ff783cf General fixes and improvements to code 2019-10-31 19:07:20 +02:00
Marek Bel 76c39ce689 Show FINDA state as N/A if last received response is older than 1s. 2019-10-31 17:45:22 +01:00
leptun 1e09f8c003 Wake on certain events
EEPROM DIM and BRIGHT values swapped!!!
2019-10-30 21:11:19 +02:00
Yuri D'Elia 50231b76da Improved handling of unknown Z position
- Introduce raise_z_above to move Z carefully when the current position
  is potentially unknown, using stallguard
- Use raise_z_above for:
  * filament loading/unloading clearance
  * extruder spacing when preheating (to avoid buildplate marks on PEI)
  * before homing to avoid damaging the build plate and to avoid
    repeated Z moves as well

Since raise_z_above is conditional, it will only raise when needed.

Calling raise_z_above when the extruder position is unknown and already
at maximum travel is safe and will prevent further vertical moves.
2019-10-22 15:49:10 +02:00
DRracer d32fd1d893 Better EN for new messages 2019-10-22 09:11:47 +02:00
leptun d7b12faa95 Add "Brightness" to Tune menu 2019-10-19 18:45:04 +03:00
leptun 0ed4a23ae7 And another compile fix... 2019-10-18 12:42:55 +03:00
leptun 9fc42526e7 Backlight always on during calibration 2019-10-18 12:18:43 +03:00
leptun 91e94aa0e8 Adjustable timeout 2019-10-18 10:32:41 +03:00
leptun 812eafd09c Fix compile for miniRambo 2019-10-17 13:14:32 +03:00
leptun 25e0d23efe Backlight overhaul and UI changes 2019-10-17 13:11:32 +03:00
DRracer 04bfe674df tiny lang fixes, part 1 2019-10-16 16:32:49 +02:00
leptun 3b005ae38f Backlight detection 2019-10-16 14:40:45 +03:00
leptun 5a662413e6 Fix compile for printer without backlight support 2019-10-13 14:34:04 +03:00
leptun 75f389a71d Auto-Dimming initial 2019-10-13 14:31:43 +03:00
leptun b2a1dc6786 Compile fix for firmware without LCD_BL_PIN 2019-10-11 19:23:38 +03:00
leptun 68491c9d4d First implementation 2019-10-11 19:06:37 +03:00
Marek Běl 05e23d1468
Merge branch 'MK3' into MM_lay1_cal 2019-10-01 23:08:11 +02:00
DRracer ff7260dc6e
Merge pull request #2246 from mkbel/reset_live_Z
Reset live z
2019-10-01 23:02:40 +02:00
Marek Bel 74a1c9341b Revert "Use content supplied strings for lcd_first_layer_calibration_reset(), as we have translations prepared for release. It will be reverted later to show current Z offset."
This reverts commit ca9ef3aba1.
2019-10-01 22:57:59 +02:00
Marek Bel ca9ef3aba1 Use content supplied strings for lcd_first_layer_calibration_reset(), as we have translations prepared for release. It will be reverted later to show current Z offset. 2019-10-01 22:57:15 +02:00
Marek Běl 210d7f6bf1
Merge pull request #2245 from DRracer/knob-long-press
Knob long press fixes
2019-10-01 22:33:26 +02:00
Marek Bel 087d3cb250 Continue to lcd_v2_calibration() after selection is made in lcd_first_layer_calibration_reset(). Do not ask for selection if sheet is not calibrated, it is calibrated to zero offset or no first layer calibration was ever made. 2019-10-01 21:04:00 +02:00
Marek Bel aabf7655dc Do all text formatting in first layer calibration reset dialog in one line. 2019-10-01 19:20:36 +02:00
Marek Bel 7c3f397a62 Print sheet name and Z offset in first layer calibration reset dialog. 2019-10-01 18:22:12 +02:00
leptun b39f09b68e Merge branch 'MK3' into MM_lay1_cal 2019-10-01 19:20:50 +03:00
DRracer d044d3b7b5
Merge pull request #2244 from MRprusa3d/PFW-1008
EEPROM_BABYSTEP_Z using removal
2019-10-01 18:04:09 +02:00
DRracer f3c3526aa5 fix the knob long-press causing hang in modal dialogs 2019-10-01 17:13:36 +02:00
MRprusa3d ed13788e0c EEPROM_BABYSTEP_Z using removal 2019-10-01 16:57:37 +02:00
DRracer 9ae75612b5 Fixes after first feature tests 2019-10-01 15:31:01 +02:00
DRracer 06187f52f3
Merge pull request #2230 from leptun/MK3_Octoprint_fIxes
Mk3 Fan error fix
2019-10-01 11:34:55 +02:00
DRracer 72aed3c544 Allow knob-long-press only in listed menus 2019-10-01 10:51:02 +02:00
Marek Bel 543ad6eb41 Ask to reset Z offset before first layer calibration. 2019-09-30 19:58:09 +02:00
leptun 9d57f9c365 Fix fan_error_selftest() mistake 2019-09-30 20:30:09 +03:00
leptun 61c7479579 Code cleanup: Move texts to messages.c/h 2019-09-30 20:16:01 +03:00
leptun 30f325c81d Extract fan_error_selftest to function for readability 2019-09-30 20:01:31 +03:00
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