Yuri D'Elia
dbe2ed4150
Fix pause/resume when using M25/M601
...
Remove the conflicting and mostly useless card.paused flag (the printing
is either paused, or not) and switch to isPrintPaused only which
accounts for both cases (SD/USB) correctly.
Fix M27/getStatus to show the current real status of the SD print.
Synchronize the queue on M601, as required to precisely pause the print
at the correct instruction.
Alias M25 to M601, which when combined with PR #1899 fixes issue #1614 .
Guard against incorrect usage in M601, M602 and M603.
2019-11-28 17:37:58 +01:00
Alex Voinea
960f4a88ed
Status bar, lcd optimization, compile warning fix
2019-11-26 13:36:28 +02:00
Alex Voinea
d40656e3ca
Small changes to rendering
2019-11-24 19:16:22 +02:00
Alex Voinea
273d834b19
Fix card removal
2019-11-22 20:27:24 +02:00
Alex Voinea
2fd192a95d
Set scroll delay to 300ms
2019-11-22 20:14:55 +02:00
Alex Voinea
fdab70fa3a
Dir fixes
2019-11-22 14:39:21 +02:00
Alex Voinea
8a806bceea
SDDIR
2019-11-21 21:32:52 +02:00
Alex Voinea
6538262e75
First build that actually works
2019-11-21 19:04:45 +02:00
Alex Voinea
8f901d2613
Temporary fix
2019-11-21 14:58:13 +02:00
Alex Voinea
b3a587f5a4
SD first attempt. Broken
2019-11-20 20:25:51 +02:00
Alex Voinea
45b89c5728
Fix typo
2019-11-19 13:55:37 +02:00
Alex Voinea
e66574ac5f
Updated branch to use TOGGLE
2019-11-19 13:51:10 +02:00
MRprusa3d
6e2793566c
Merge branch 'MK3' into PFW-943
2019-11-18 14:43:46 +01:00
Alex Voinea
b077303156
Fix compile error
2019-11-17 11:10:13 +02:00
Alex Voinea
14104e7bf9
Clear error flag when fanError is disabled
2019-11-17 10:44:11 +02:00
Alex Voinea
2e0034d915
Update Toggles and Translations
2019-11-17 09:53:14 +02:00
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
4703853a3d
Small fixes
2019-10-12 13:19:17 +03:00
leptun
350e27810a
fix selftest Z crash. Use stallGuard when testing Z
2019-10-11 21:00:51 +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
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
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
Yuri D'Elia
18b8dc89e5
Merge remote-tracking branch 'upstream/MK3' into MK3_LA15
2019-08-04 17:06:34 +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
5fdaead663
Fix language related warnings in LANG_MODE 0
2019-07-29 15:55:42 +03: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
NotaRobotexe
756ce51b5e
Merge branch 'MK3' into octoprint_fix
2019-07-17 20:06:06 +02:00
NotaRobotexe
b8fec59f21
octoprint fan error fix
2019-07-17 19:59:31 +02:00
NotaRobotexe
2bae208133
Merge pull request #2011 from MRprusa3d/PFW-873
...
GUI updates
2019-07-17 14:49:07 +02:00
DRracer
255db28684
merge unit test and upstream changes
2019-07-17 10:30:49 +02:00
Yuri D'Elia
3a87ff56f6
Default to "Move Z" above a certain height even when printing
...
This speeds-up the ability to manually get the carriage out of the way
just after a print has finished
2019-07-16 22:04:32 +02:00
MRprusa3d
034cbff10a
GUI updates
2019-07-16 20:10:49 +02:00
DRracer
1dab0f7a04
Merge pull request #2008 from leptun/MK3_LCD_improvements
...
Lcd optimization - 1K of flash saved
2019-07-16 19:15:57 +02:00
DRracer
0422713b29
Merge pull request #2005 from prusa3d/MK3_3.7.2
...
Mk3 3.7.2
2019-07-16 08:50:38 +02:00
leptun
8b1c687629
Lcd optimization - 1K of flash saved
2019-07-15 20:32:58 +03:00
NotaRobotexe
8fb30f886a
octoprint stop fix
2019-07-15 14:30:21 +02:00
DRracer
a3fde091ab
More than 7.5KB saved by slight refactoring of printing to serial line
2019-07-12 10:10:56 +02:00
leptun
b8b167d1ca
Merge branch 'MK3' into MK3_Enable_fan_waiting_cooldown
2019-07-10 19:26:43 +03:00
Marek Běl
d3dd0ad271
Merge pull request #1952 from NotaRobotexe/sound
...
new sound
2019-07-10 18:06:32 +02:00
MRprusa3d
98bae7af9f
Merge branch 'MK3' into PFW-873
2019-07-10 16:50:14 +02:00
MRprusa3d
3333d937ed
some improvements
2019-07-10 16:29:40 +02:00
MRprusa3d
4d535f1217
... incl. SupportMenu ;-P
2019-07-09 12:31:20 +02:00
MRprusa3d
8229a45187
pre-production version ;-)
2019-07-09 12:16:51 +02:00
Marek Bel
61566f7fb1
Move translated string MSG_V2_CALIBRATION from untranslated section to PROGMEM_I1, add missing ISTR macro. Revert _T(MSG_SELECT) and _T(MSG_RENAME) to _i("Select") and _i("Rename") as it is preferred macro for internationalized strings. Use MSG_V2_CALIBRATION in both occurrences.
2019-07-08 21:18:55 +02:00
NotaRobotexe
a1a8945bee
more code editing
2019-07-04 15:31:44 +02:00
NotaRobotexe
e77898d5dc
code edit
2019-07-04 13:21:27 +02:00
NotaRobotexe
81b3b71cca
check eeprom inicialization
2019-07-03 19:37:11 +02:00
MRprusa3d
a3a7f3106e
print parameters checking
2019-07-03 17:21:11 +02:00
Marek Bel
d344e514c4
Rename functions and macro to match with naming convention - remove 'P' where there is no pointer to progmem.
2019-06-26 15:51:58 +02:00
Marek Bel
d879794922
Remove first parameter of macro menu_format_sheet_P_E, of function menu_format_sheet_P_E and menu_item_submenu_P as it was always called with the same parameter. Saves 66B of FLASH.
2019-06-26 15:47:06 +02:00
Marek Bel
53dbcdd852
Display sheet name when adjusting Z. Costs 130B of flash.
2019-06-26 15:33:54 +02:00
Marek Bel
4a16fe6902
Save z_offset, bed_temp and pinda_temp with sheet calibration.
2019-06-26 14:10:12 +02:00
Marek Bel
20dd1110f6
Remove unused parameters of function _lcd_babystep(int axis, chonst char *msg).
...
Saves 24B of flash memory.
2019-06-25 19:43:10 +02:00
Marek Bel
ebdeb99134
Add menu to show sheet live adjust Z value.
2019-06-25 18:55:25 +02:00
NotaRobotexe
3e9dc91cef
ifdef for mk2
2019-06-24 18:01:49 +02:00
NotaRobotexe
b5168bd6c2
fan error fix
2019-06-24 17:30:56 +02:00
Marek Bel
b67ec501b4
Add rename sheet menu.
2019-06-24 17:11:13 +02:00
Marek Bel
e6fbac08ed
Move sheet selector to submenu.
2019-06-21 15:44:56 +02:00
Marek Bel
0a48082609
Add steel sheet profile selector.
2019-06-20 16:40:53 +02:00
Renzo Dani
9a904362e5
code only for TMC2130
2019-06-20 10:17:48 +02:00
Renzo
e54497d802
added new function belt test under calibration menu
2019-06-20 00:09:55 +02:00
Marek Bel
524121141a
Remove commented out code. This code is of unknown genesis and purpose. It was added in commit "3.0.10 sync" two years ago and it was already commented out in that moment.
2019-06-19 15:54:24 +02:00
Marek Bel
24cec4091b
Merge branch 'MK3' into sound
2019-06-17 17:28:19 +02:00
Marek Běl
aff020a6d4
Merge pull request #1897 from NotaRobotexe/farm_mode
...
PFW-571 send PRN:4 instead PRN:1, PFW-874 new firmware version alert with 30s timeout
2019-06-14 20:05:30 +02:00
Yuri D'Elia
367a28a5a8
Default to "Live Adjust Z" when longpressing during a print ( closes #1604 )
...
- Disable longpress action when homing or calibrating
- Default to Live Adjust during a print
- Retain "Move Z" otherwise
2019-06-14 11:44:06 +02:00
Voinea
d81970dd3d
Merge branch 'MK3' into MK3_Enable_fan_waiting_cooldown
2019-06-14 11:07:08 +03:00
Marek Bel
6717590631
Merge branch 'MK3' into MK3_LA15
2019-06-13 15:39:50 +02:00
Marek Bel
72f5e87c61
Merge branch 'MK3' into use_enum_class_2
2019-06-12 19:17:35 +02:00
Marek Bel
1390d4e5b9
Use first letter capital camel case for enum class members. Change underlying type to uint_least8_t.
2019-06-12 19:11:41 +02:00
Marek Bel
5fcf760954
Use first letter capital camel case for enum class members. Rename CustomMsgTypes to CustomMsg. Remove unnecessary maping to numbers. Change underlying type to uint_least8_t.
2019-06-12 18:54:43 +02:00
Marek Bel
51df6cdfdc
Remove LcdCommands::Unknown3. Remove LcdCommands mapping to numbers, as it is not needed.
2019-06-12 18:54:37 +02:00
Marek Bel
cbb92860d0
Use first letter capital camel case for enum class members.
2019-06-12 18:54:32 +02:00
Marek Bel
0401490cc1
Use first letter capital camel case for enum class members.
2019-06-12 18:54:25 +02:00
Marek Bel
9ceba00426
Use first letter capital camel case for enum class members. Remove dependency of FanCheck values on TestError values as it is not used.
2019-06-12 18:53:09 +02:00
MRprusa3d
b7d3766ae2
Merge branch 'MK3' into PFW-790
2019-06-12 17:32:13 +02:00
Marek Bel
6dd085bcc5
Use first letter capital camel case for enum class members.
2019-06-12 16:44:07 +02:00
Marek Bel
cc80bfa020
Merge branch 'MK3' into use_enum_class
2019-06-12 16:04:26 +02:00
DRracer
c7e1e73880
another almost 200B down by proper usage of smaller data types and enum
...
classes
2019-06-12 15:41:55 +02:00
DRracer
94a5175980
Code size reduction - saved almost 2KB
2019-06-12 15:41:34 +02:00
Marek Bel
49f172a7b9
Convert uint8_t cycle control varibles changed in previous commit to uint_least8_t to be potentially more portable.
2019-06-12 15:01:57 +02:00
DRracer
b15bbaf177
for cycles' variables: int -> uint8_t where appropriate, part1
2019-06-12 14:58:15 +02:00
DRracer
4f8ed7f123
for cycles' variables: int -> uint8_t where appropriate, part1
2019-06-12 10:31:09 +02:00
DRracer
baa36ce740
another almost 200B down by proper usage of smaller data types and enum
...
classes
2019-06-12 09:58:42 +02:00
Marek Bel
d528a53526
Refactor. Move lcd_commands_func1() to first_lay_cal.cpp and rename it to lay1cal_square(). Remove its constant parameters. Move remaining G1 code to lay1cal_meander(). Saves 6B of FLASH memory.
2019-06-12 01:36:48 +02:00
Marek Bel
60cc3d58ec
Use sprintf_P in first layer calibration. Save 30B of FLASH memory.
2019-06-11 20:00:49 +02:00
Marek Bel
47a183e96e
Use loop to enquecommand_P() in first layer calibration. Save 126B of FLASH memory.
2019-06-11 19:49:56 +02:00
Marek Bel
21f4669600
Make count_e() constexpr.
2019-06-11 19:22:08 +02:00
Marek Bel
4effff9e99
Use loop to enquecommand_P() in first layer calibration. Save 10B FLASH memory.
2019-06-11 18:56:29 +02:00
Marek Bel
d21f256cd0
Remove duplicate calls of lcd_timeoutToStatus.start(), move !blocks_queued() && cmd_buffer_empty() condition to outer if, rewrite using switch statement. Save 487B of FLASH memory.
2019-06-11 18:26:59 +02:00
Marek Bel
97a5d6b5f4
Make constants const.
2019-06-11 17:30:37 +02:00
Marek Bel
9b1e3213ae
Variable lcd_commands_step doesn't need to be global.
2019-06-11 17:30:19 +02:00
DRracer
58948cffcd
Code size reduction - saved almost 2KB
2019-06-11 17:23:01 +02:00
Marek Bel
0c9121e99e
Use loop to enquecommand_P() in first layer calibration.
2019-06-11 17:08:56 +02:00
DRracer
f20125a3e2
Code size reduction - saved almost 2KB
2019-06-11 16:24:40 +02:00
Marek Bel
27145204ed
Use internationalized M117, but anyway the text is not shown.
2019-06-10 21:40:12 +02:00
Marek Bel
4be8fa701e
Use loop to enquecommand_P() in first layer calibration.
2019-06-10 20:41:18 +02:00
Yuri D'Elia
c40e3b550d
Remove stubs and live K by default
2019-06-10 19:34:00 +02:00
NotaRobotexe
bb980e2fca
sound edit, delete mute mode, add blind mode
2019-06-10 15:03:52 +02:00
Marek Běl
28e7772421
Merge pull request #1886 from leptun/MK3_fix_load_filament_5
...
Fix Load Filament 5 for MMU2
2019-06-10 14:45:55 +02:00
Vojtech Pavlik
5494f23942
M0/M1/M117 fix: Add new CUSTOM_MSG states.
...
When the printer prints from a SD card, the display of progress messages
and filename takes precedence over CUSTOM_MSG_TYPE_STATUS messages used
by M0/M1/M117. Let's introduce two new CUSTOM_MSG states, one that
overrides the SD status while waiting in M0/M1 (M0WAIT) and one that
ensures the message will be displayed in at least one screen update
(MSGUPD).
2019-06-06 14:25:06 +02:00
DRracer
ebfad55617
Merge pull request #1888 from mkbel/always_cut_independent
...
Always cut independent
2019-05-31 07:00:37 +02:00
Marek Bel
ccb649b1f6
Add always cut experimental / for testing feature.
2019-05-30 23:03:59 +02:00
Marek Bel
18122049a6
Fix cut filament menu item labels.
2019-05-30 19:36:10 +02:00
Voinea
878e866401
Fix Load Filament 5 for MMU2
2019-05-30 17:28:02 +03:00
NotaRobotexe
3b2cbc68d8
PFW-571 send PRN:4 instead PRN:1 while changing filament
2019-05-28 18:22:34 +02:00
Yuri D'Elia
a742afcebd
Remove version check
2019-05-26 22:43:06 +02:00
Yuri D'Elia
4772532524
Allow Live-K to be used on stock 3.7.1 using a stub
2019-05-26 22:14:31 +02:00
Yuri D'Elia
daa8007de5
Allow to exclude Live K from the build
2019-05-26 16:41:45 +02:00
Yuri D'Elia
0a26de1e7f
Allow to live-tune K during a print
2019-05-25 18:41:21 +02:00
DRracer
9cb0bc7bcf
Fix MINTEMP errors and fsensor runout
2019-05-24 08:46:44 +02:00
DRracer
e17f3f8405
change language files accordingly
2019-05-23 11:14:26 +02:00
DRracer
da98977de3
Fix. menu texts and formatting - issues PFW-877 and PFW-879
2019-05-23 10:45:55 +02:00
Marek Bel
15ba17f110
Fix translator columns hint for Adjusting Z:
2019-05-16 17:30:15 +02:00
DRracer
a453c6fc9d
Save 236B by improving functions in menu.cpp. Beware - the label now has
...
to come with a ':' as its last character. Changed language files along
with this commit too.
2019-05-16 16:43:44 +02:00
Ondrej Tuma
ebfc8c1c79
Fan autotest for swapping in Selftest
2019-05-15 10:10:46 +02:00
Ondrej Tuma
c851e158cc
Manual fan check menu have default (selected) option
2019-05-15 10:10:46 +02:00
Marek Bel
66d20f0297
Fix code formatting (indentation).
2019-05-14 16:45:15 +02:00
Marek Bel
4de93ca19c
Fix eject filament menu items numbering.
2019-05-14 16:43:33 +02:00
Marek Bel
150787efbd
Generate menu item texts Cut filament <nr.> during runtime to conserve flash.
2019-05-14 16:25:29 +02:00
Marek Bel
7c4f66181f
Generate menu item texts Load filament <nr.> and Eject filament <nr.> during runtime to conserve flash.
2019-05-14 15:47:25 +02:00
Marek Běl
084c6f2700
Merge pull request #1805 from DRracer/MK3
...
PFW-844
2019-05-10 13:41:59 +00:00
Marek Bel
5707d4b85c
Set all target hot ends to 0 deg. Celsius instead of just hotend nr. 0 to be more safe with custom modifications.
2019-05-10 15:27:25 +02:00
DRracer
f431d24762
Merge branch 'MK3' of https://github.com/DRracer/Prusa-Firmware into MK3
2019-05-07 16:17:14 +02:00
DRracer
0124fbf9ee
Fix: display target extruder temperature on the main screen when doing
...
PID calibration
2019-05-07 16:15:42 +02:00
Ondrej Tuma
b7fe43bf68
Deleted bad cols/rows definitions for translation.
2019-05-07 12:52:23 +02:00
Marek Bel
1a0370e1c7
Make macro ON_MENU_LEAVE() usage similar to macros MENU_ITEM_BACK_P() and MENU_ITEM_FUNCTION_P().
2019-05-06 17:39:00 +02:00
DRracer
ffbdb43881
Remove commented code
2019-05-06 17:26:42 +02:00
DRracer
0794430208
Fix for linearity correction not being stored to EEPROM when doing MENU-
...
UP
2019-05-06 15:33:13 +02:00
MRprusa3d
b93f37ee02
"stop" immediately after "pause" patch
2019-04-29 14:39:19 +02:00
MRprusa3d
32f3471862
print parameters checking
...
prusa_stat_diameter()
2019-04-09 15:22:08 +02:00
Voinea
173062295f
Enable print fan while waiting for cooldown
2019-04-06 13:42:21 +03:00
PavelSindler
fd96bde69f
Merge pull request #1667 from mkbel/Add_IR_sensor_fail_message
...
Add ir sensor fail message
2019-04-02 14:55:27 +02:00
PavelSindler
ae11c1e26f
rename function
2019-03-28 16:39:56 +01:00
PavelSindler
97594c83bb
function misleading names changed
2019-03-28 14:58:58 +01:00
PavelSindler
1dd486d86d
max length of menu item strings added
2019-03-28 13:18:28 +01:00
PavelSindler
d22793f276
Z-probe nr. states reduced to 1; 3; 5
2019-03-28 12:02:46 +01:00
PavelSindler
02faadf0b9
MMU mode renamed
2019-03-28 09:49:08 +01:00
Marek Bel
baeee5817e
Make lcd_selftest_error() calls safer, as nullptr parameter is not handled. It is hard to believe, but it actually saves 4B flash.
2019-03-22 00:24:22 +01:00
Marek Bel
966e772702
Fix compile error for non TMC2130 endstops check.
2019-03-22 00:14:29 +01:00
Marek Bel
89f1a3bacf
Fix compile error for non TMC2130 pulley check.
2019-03-22 00:11:02 +01:00
Marek Bel
8582babddb
Fix compile error for manual fan check.
2019-03-22 00:08:44 +01:00
Marek Bel
d1c5c03907
Fix compile error for manual fan check.
2019-03-22 00:03:14 +01:00
Marek Bel
c45a7f8641
Fix 1_75mm_MK3-EINSy10a-E3Dv6full variant build error.
2019-03-21 23:50:01 +01:00
Marek Bel
91779a5d04
Add filament sensor false triggering message.
2019-03-21 23:36:59 +01:00
Marek Bel
ba23b1b2c5
Remove unused.
2019-03-21 22:50:46 +01:00
Marek Bel
6c28ed6349
Convert lcd_selftest_error() first parameter to enum class.
2019-03-21 22:48:57 +01:00
MRprusa3d
7d98177716
farmMode updates
2019-03-19 19:48:40 +01:00
PavelSindler
c05561d6b1
Merge pull request #1607 from PavelSindler/7x7
...
7x7 mbl and switching mmu modes
2019-03-15 19:55:15 +01:00
Marek Bel
ffe45bdef3
Disable mmu filament cutter feature.
2019-03-15 03:38:37 +01:00
PavelSindler
9e0e4198c5
Mesh by 3d-gussner, fixed difference between mbl points coordinates and coordinates used in planner for corrections, mbl settings menu update
2019-03-14 01:52:44 +01:00
MRprusa3d
1f131f66e0
print parameters checking
...
nozzle diameter
2019-03-14 00:36:56 +01:00
PavelSindler
32138ea09a
menu item alignment
2019-03-13 15:08:09 +01:00
PavelSindler
b20d9171b6
Merge remote-tracking branch 'upstream/MK3' into 7x7
2019-03-12 11:47:17 +01:00
PavelSindler
42036270cf
Merge pull request #1619 from MRprusa3d/PFW-795d
...
better autoLoad II
2019-03-12 11:44:30 +01:00
PavelSindler
c55f42965d
Merge pull request #1601 from MRprusa3d/PFW-749
...
SD card menu enhancement
2019-03-12 11:42:53 +01:00
PavelSindler
c9cff11732
Merge pull request #1593 from MRprusa3d/PFW-647
...
mode switching, G-code unification
2019-03-12 11:40:43 +01:00
MRprusa3d
3388444b6c
better autoLoad II
...
autoLoad inhibit if Support::ExtruderInfo(@MKx)/SensorInfo(@MKxS)-menu is selected
2019-03-11 20:43:07 +01:00
PavelSindler
698f81abe0
fix compile error
2019-03-11 15:55:48 +01:00
PavelSindler
819a91ab1e
switching stealth/normal mode for mmu in settings menu and tune menu
2019-03-11 12:33:22 +01:00
PavelSindler
141b78c048
number of Z-probes defualt value changed from 4 to 3, mmu stealth mode switch in settings menu
2019-03-10 16:03:46 +01:00
PavelSindler
091934462d
menu correction
2019-03-08 20:06:30 +01:00
PavelSindler
315959c13a
menu update
2019-03-08 20:03:23 +01:00
PavelSindler
6a864ffbab
G80 parameters configurable via settings menu
2019-03-08 15:43:37 +01:00
PavelSindler
98bb2b7acf
merge debug gcodes for bed analysis
2019-03-06 20:45:23 +01:00
PavelSindler
2a71dbefb8
Merge pull request #1597 from mkbel/fix_compiler__warning
...
Fix compiler warning
2019-03-06 19:55:18 +01:00
MRprusa3d
6217329d50
SD card menu enhancement
2019-03-06 19:51:26 +01:00
PavelSindler
101453b674
mbl submenu
2019-03-06 13:27:31 +01:00
Marek Bel
1eab058ad4
Fix uninitialized variable used.
2019-03-05 18:08:35 +01:00
Marek Bel
7fcecabd5f
Fix compiler warning: variable 'previous_millis_cmd' set but not used
2019-03-05 18:04:58 +01:00
Marek Bel
484259cbb2
Fix compiler warning: 'lcd_settings_linearity_correction_menu_save' defined but not used
2019-03-05 18:00:16 +01:00
PavelSindler
f1031d2302
new farm statuses for pause (14) and wait for user (15)
2019-03-05 16:00:50 +01:00
MRprusa3d
7e48d633cb
mode switching
...
info-message viewing during mode switching
2019-03-04 21:30:36 +01:00
PavelSindler
9dde8c4732
Merge pull request #1591 from MRprusa3d/PFW-795c
...
better autoLoad
2019-03-04 15:31:04 +01:00
PavelSindler
1051b7c39f
Merge pull request #1583 from mkbel/fix_cut
...
Fix unable to cut filament, if nozzle is already preheated.
2019-03-04 15:29:54 +01:00
MRprusa3d
b02ca18c93
better autoLoad
...
autoLoad inhibit if Support::ExtruderInfo-menu is selected
2019-03-04 12:52:35 +01:00
Marek Bel
9e38b1e101
Add missing message "Preheating to cut".
2019-03-01 18:17:08 +01:00
Marek Bel
6437d44991
Fix unable to cut filament, if nozzle is already preheated.
2019-03-01 18:10:06 +01:00
Marek Bel
83e07b5cdf
Fix compiler warnings:
...
sketch/ultralcd.cpp: In function 'void mFilamentPrompt()':
sketch/ultralcd.cpp:2335:7: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
switch(eFilamentAction)
^
sketch/ultralcd.cpp:2335:7: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
switch(eFilamentAction)
^
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuLoad' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuUnLoad' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuEject' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2359:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
sketch/ultralcd.cpp: In function 'void mFilamentItem(uint16_t, uint16_t)':
sketch/ultralcd.cpp:2513:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
switch(eFilamentAction)
^
sketch/ultralcd.cpp:2513:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
sketch/ultralcd.cpp:2562:12: warning: enumeration value 'e_FILAMENT_ACTION_none' not handled in switch [-Wswitch]
switch(eFilamentAction)
^
sketch/ultralcd.cpp:2562:12: warning: enumeration value 'e_FILAMENT_ACTION_mmuCut' not handled in switch [-Wswitch]
2019-03-01 18:07:19 +01:00
Marek Bel
824d11e4b0
Remove "Press the knob to eject filament" message, as it is never shown.
2019-03-01 17:43:28 +01:00
Marek Bel
57cf7ee171
Fix compiler warning: 'lcd_selftest_fsensor' defined but not used
2019-03-01 17:21:13 +01:00
Marek Bel
4c2d4fcf77
Fix compiler warning ultralcd.cpp:4038:10: warning: unused variable 'chars
2019-03-01 17:18:05 +01:00
PavelSindler
85c208f9f4
Merge branch 'MK3' into bad_load_cut
2019-03-01 14:55:55 +01:00
PavelSindler
22c0d6e230
Merge pull request #1577 from mkbel/add_cut
...
Add MMU cut filament
2019-03-01 14:53:12 +01:00
PavelSindler
e27fdafcec
menu switch - initial
2019-02-28 19:42:09 +01:00
Marek Bel
2a005caf42
Add cutter enable to tune menu.
2019-02-27 17:47:51 +01:00
Marek Bel
02a692c5d9
Store cutter enable state in EEPROM.
2019-02-27 17:34:03 +01:00
Marek Bel
4a4eb9962c
Cut filament when cutter is enabled and MMU load fails.
2019-02-27 10:42:26 +01:00
Marek Bel
49b1d1cb93
Move prototype to header file.
2019-02-26 18:50:15 +01:00
Marek Bel
815231bc26
Add MMU cut filament menu.
2019-02-26 17:58:00 +01:00
MRprusa3d
ff35119ef3
preHeat @ filament management
...
another funcionality III / autoLoad
2019-02-26 17:33:37 +01:00
Marek Bel
7a1b47c340
Convert functions mmu_eject_fil_0 to mmu_eject_fil_4 to template function.
2019-02-26 11:11:05 +01:00
Marek Bel
34e2495487
Convert mmu_load_to_nozzle_0 to mmu_load_to_nozzle_4 to template.
2019-02-26 10:32:10 +01:00
MRprusa3d
be0ed46335
preHeat @ filament management
...
another funcionality III
2019-02-22 03:09:50 +01:00
MRprusa3d
323071f50a
preHeat @ filament management
...
another funcionality II
2019-02-21 13:20:29 +01:00
MRprusa3d
a54c68b874
preHeat @ filament management
...
another funcionality II
2019-02-21 04:45:44 +01:00
MRprusa3d
da0867cfc5
preHeat @ filament management
...
another funcionality
2019-02-20 03:01:33 +01:00
PavelSindler
11d19879fc
Merge pull request #1533 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad / MMU
2019-02-15 17:45:38 +01:00
MRprusa3d
0c1f9b5100
preHeat @ filament management
...
target temperature keeping
2019-02-15 02:25:44 +01:00
MRprusa3d
80c3420a12
Merge branch 'MK3' into PFW-210
2019-02-14 00:05:50 +01:00
MRprusa3d
ef1f82627e
preHeat @ filament load / unload / autoLoad / MMU
...
MMU options added
2019-02-13 23:53:00 +01:00
Marek Bel
9e873ac0f7
Use enum for mmu_cmd instead of plain integer type.
2019-02-13 01:51:39 +01:00
PavelSindler
e432e258dc
extr fan RPM measuring fix
2019-02-06 22:56:10 +01:00
PavelSindler
22217a42f7
message change
2019-02-06 21:37:39 +01:00
PavelSindler
726d5aa3c3
typo fixed
2019-02-06 16:29:10 +01:00
PavelSindler
2fe8e0670a
MK2 build fail fixed
2019-02-06 16:15:19 +01:00
PavelSindler
ef86c78f25
menu item text changed
2019-02-06 14:24:47 +01:00
PavelSindler
1ba046395e
fan measurements fix: keep fanSpeedSoftPwm = 255 during measurements, selftest changes
2019-02-06 12:37:18 +01:00
PavelSindler
860e6f9994
Merge remote-tracking branch 'upstream/MK3' into variants
2019-02-06 09:19:38 +01:00
PavelSindler
fcb7dd90cf
Merge pull request #1505 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload / autoLoad
2019-02-06 09:14:03 +01:00
MRprusa3d
a53d150903
preHeat @ filament load / unload / autoLoad
...
autoLoad option added
2019-02-06 01:58:05 +01:00
PavelSindler
f9298b37b8
fan check hotfix (selftest, measuring RPM, fan errors)
2019-02-05 04:02:38 +01:00
PavelSindler
9a51a7be29
Merge branch 'bed_correction_fix' into variants
2019-02-04 12:47:06 +01:00
PavelSindler
0853ef5d06
Merge remote-tracking branch 'upstream/MK3' into variants
2019-02-04 12:45:28 +01:00
PavelSindler
b4f2dc3b5e
Merge remote-tracking branch 'robert/MK3-variants' into variants
2019-02-04 12:41:08 +01:00
PavelSindler
6d5a2ae816
Merge pull request #1499 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload
2019-02-04 12:37:42 +01:00
Robert Pelnar
d2a4cb4c49
Use _delay_ms instead of delay (fix - fast scrolling in sd card menu - temporary solution)
2019-02-04 12:20:07 +01:00
MRprusa3d
fff8fc8a48
preHeat @ filament load / unload
...
filament-list correction (PET missing)
2019-02-04 12:12:35 +01:00
Robert Pelnar
3244c37435
Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control
2019-02-04 01:32:04 +01:00
PavelSindler
5324181bf7
maximum bed level correction value enlarged from 50um to 100um and is now used in menus and mesh bed leveling itself
2019-02-03 20:56:14 +01:00
PavelSindler
4444b155f1
M600: prevention of blob; massage changed when autoload is active
2019-02-01 21:08:34 +01:00
PavelSindler
97aaf919a3
Merge remote-tracking branch 'upstream/MK3' into dev
2019-02-01 18:12:59 +01:00
Robert Pelnar
79449a8eaf
Conditional translation for fan control (FAN_SOFT_PWM), temporary disabled lcd backlight control
2019-02-01 13:29:50 +01:00
PavelSindler
4f67a9569c
dont show filament sensor in extruder info menu
2019-01-31 18:03:56 +01:00
PavelSindler
6342b6032c
Merge remote-tracking branch 'upstream/MK3' into variants
2019-01-31 10:18:41 +01:00
PavelSindler
491dbf5ebd
Merge pull request #1493 from MRprusa3d/PFW-210
...
preHeat @ filament load / unload
2019-01-31 10:15:59 +01:00
MRprusa3d
921b6993ee
preHeat @ filament load / unload
2019-01-31 05:21:53 +01:00
PavelSindler
9926468c91
Merge remote-tracking branch 'upstream/MK3' into variants
2019-01-30 17:26:45 +01:00
MRprusa3d
19fd05bb46
Merge pull request #1490 from PavelSindler/menu_update
...
menu update
2019-01-29 13:29:27 +01:00
PavelSindler
1fa9913029
include printers.h
2019-01-28 21:54:44 +01:00
PavelSindler
220437316b
Merge pull request #1485 from XPila/MK3-bed_fast_pwm
...
Mk3 bed fast pwm
2019-01-28 21:14:01 +01:00
PavelSindler
29e156b26d
printer types updated
2019-01-28 19:48:46 +01:00
PavelSindler
25d54d43aa
menu update
2019-01-28 19:41:02 +01:00
PavelSindler
dd4d8e1277
calibrate z endstop update
2019-01-28 19:23:19 +01:00
PavelSindler
0514306bed
selftest fixed
2019-01-28 11:09:41 +01:00
PavelSindler
7889305702
merging changes from upstream
2019-01-28 11:00:42 +01:00
PavelSindler
c6e6df404c
Merge pull request #1482 from mkbel/IR_fsens_selftest
...
Ir fsens selftest
2019-01-28 10:39:12 +01:00
Robert Pelnar
eea755496b
Conditional translation for SYSTEM_TIMER_2 because we want to have posibility to switch between old/new implementation.
...
Timing functions (millis, micros and delay) replaced in whole source, defined in Marlin.h.
This commit enables original implementation (SYSTEM_TIMER_2 undefined)
Verified with passed complete wizard process.
2019-01-27 22:48:51 +01:00
Robert Pelnar
434a723151
Timing functions 'micros' and 'delay' replaced in whole source with 'micros2' and 'delay2'
2019-01-27 17:37:27 +01:00
Marek Bel
aaa2670ef8
Remove redundant enum numbering.
2019-01-25 20:14:29 +01:00
Marek Bel
b167896c6d
Convert lcd_selftest_screen parameter int _step to enum class testScreen screen.
2019-01-25 20:00:12 +01:00
Marek Bel
6d1256eaad
Internationalize "Calibrating home".
2019-01-25 18:06:30 +01:00
PavelSindler
6b6a3d7d5f
MMU_IR_SENSOR_PIN -> IR_SENSOR_PIN
2019-01-25 18:01:17 +01:00
PavelSindler
7e3a1c7d45
merge changes from upstream
2019-01-25 17:57:24 +01:00
PavelSindler
0d1a7a1774
Merge pull request #1479 from MRprusa3d/PFW-749
...
SD card menu
2019-01-25 14:32:12 +01:00
Marek Bel
edc412697c
Increase selftest_irsensor() filament nozzle unload temperature to ABS.
...
Resume nozzle temperature immediately after unload.
2019-01-24 21:24:46 +01:00
Marek Bel
68ffa95aa9
Fix axis self-test progress visualization.
2019-01-24 21:06:03 +01:00
Marek Bel
1c4f3259ea
Increase heater check minimum expected temperature rises.
...
Bed increased from 3 to 10 K.
Nozzle increased from 10 to 30 K.
Measured rises with my MK3 printer:
Bed 26K,
Nozzle 73K.
2019-01-24 21:02:04 +01:00
Marek Bel
305598d7f6
Fix bed / nozzle test order and progress bar.
...
Known limitation:
Z progress shown in bed progress.
2019-01-24 20:03:37 +01:00
Marek Bel
22859800f0
Rearrange tests. Move hot end test to the end, to spare time in IR sensor test.
...
Known problems, hot end and bed is swapped. Bed progress indicator is painted to X axis test.
2019-01-24 19:22:36 +01:00
MRprusa3d
b2b65475df
SD card menu
...
SDcard-menu after card insertion
2019-01-24 17:32:57 +01:00
PavelSindler
ad65024147
selftest: filament sensor check change
2019-01-24 13:57:52 +01:00
PavelSindler
e0c1e4a02d
version which should on all printer versions: autoload, selftest, filament detection, filament sensors initialization, filament menus
2019-01-24 01:12:30 +01:00
Marek Bel
1d71c1a5d1
Update IR sensor selftest progress bar more frequently.
2019-01-22 19:02:42 +01:00
Marek Bel
97a4623800
Fix lcd_selftest_screen for small _progress_scale.
2019-01-22 19:01:55 +01:00
Marek Bel
9cda0b69b8
Update IR sensor selftest progress bar.
2019-01-22 18:23:00 +01:00
Marek Bel
3ff8a7c740
Unload filament by MMU unit in selftest_irsensor().
...
Known limitation:
If filament was not loaded to nozzle it is sticked completely out of MMU. To be fixed in MMU, as this problem can be reproduced also from printer menu - unload filament.
2019-01-22 14:54:06 +01:00
Marek Bel
c371a5ea65
Document.
2019-01-22 14:05:08 +01:00
Marek Bel
a92d9c782b
Add IR sensor test.
2019-01-22 11:29:55 +01:00
Marek Bel
f292a6ca7a
Refactor filament sensor selftest call.
2019-01-21 21:39:38 +01:00
PavelSindler
e36e58f385
show sensor on/off temporarily changed to unlocalized strings
2018-12-21 21:28:57 +01:00
PavelSindler
ba57986b72
merge changes from upstream
2018-12-21 20:58:38 +01:00
PavelSindler
5462d451e1
show power failures in fail stats menu, shorter load to nozzle if idler sensor detected
2018-12-21 20:56:45 +01:00
PavelSindler
d292e877df
load to nozzle shortened, sensor menu moved to support
2018-12-21 18:51:13 +01:00
PavelSindler
3c64bad1cb
initial version which works on old and new hw, initial version of idler sensor detection
2018-12-21 17:12:16 +01:00
PavelSindler
b0fce9122e
Merge pull request #1416 from PavelSindler/z_cal_endstops
...
Z cal endstops and stop paused print fix
2018-12-19 19:46:27 +01:00