a1254b3a3c
Merge branch 'MK3_3.9.0' into flashair_display_ip
2020-04-29 10:19:51 +09:00
b9ce572559
Reset LA10/15 state also when stopping a print
...
Based on f22fb2770b
2020-04-28 17:35:28 +02:00
67e9b4c096
IR fsensor fixes ( #2632 )
...
* MK3S IR sensor detection and safe operational range fix
* debug, change of fsensor_IR_check behavior
* more doc + disable debug print voltage
* fix displaying MSG_04_OR_NEWER and MSG_03.... kudos to @ovariludovit
* better handling of fsensor not responding scenario
2020-04-28 10:20:21 +02:00
c34c622b3c
Merge branch 'MK3_3.9.0' into flashair_display_ip
2020-04-28 00:14:47 +09:00
baaa372a56
Rephrase texts for fsensor detection and cleanup ( #2630 )
...
* Rephrase texts for fsensor detection and cleanup
* fsensor msgs only for MK3S
2020-04-24 19:46:54 +02:00
8ef87d76ef
MK2.x: move away from endstops after lcd_selfcheck_pulleys() ( #2617 )
...
* Removed duplicate #defines
cleaned up display routine
* Change to raise_z_above()
* Better display handling
* Ditch charswitch, show ... for measuring
* Pull in changes from #5
* Fix printf()s
* revert feedrates
* typo
* MK2.x: move away from endstops after lcd_selfcheck_pulleys()
amend
* Use absolute coordinates
Co-authored-by: vintagepc <53943260+vintagepc@users.noreply.github.com>
2020-04-20 09:55:14 +02:00
32fa7b5496
Merge pull request #2473 from vintagepc/#2472-#2356-belt-test-stealth-mode
...
#2472 #2356 #2484 belt test improvements
2020-04-20 09:36:39 +02:00
0e25eaee8f
Merge branch 'MK3' into MK3_NEW_SD_COMPILATION
2020-04-19 16:02:11 +03:00
dce453fd4a
typo
2020-04-16 07:31:54 -04:00
85a4c44d83
revert feedrates
2020-04-16 07:29:59 -04:00
207f0f27a6
🐛 Flip lcd_detect_IRsensor logic
2020-04-09 16:35:38 +03:00
4c4b4c489c
🐛 ♻️ Update the feedrate percentage before drawing the screen
2020-04-07 17:10:27 +03:00
fd1d05ab48
♻️ Code optimization
2020-04-02 14:44:44 +03:00
f8843b25b0
✨ Progress bar for check_file()
2020-04-02 13:21:53 +03:00
b8896ad9c0
First attempt for Z probe checking during selftest on the MK3/S
2020-04-01 12:28:39 +03:00
b449e248a1
Fix printf()s
2020-03-31 17:48:56 -04:00
0c383e20b3
Pull in changes from #5
2020-03-31 17:33:08 -04:00
f1cba64e56
Merge remote-tracking branch 'upstream/MK3' into #2472-#2356-belt-test-stealth-mode
2020-03-31 17:03:10 -04:00
5106831ba2
Merge pull request #2526 from leptun/MK3_decouple_XYZE_relative_mode
...
Mk3 decouple XYZE relative modes
2020-03-26 18:58:20 +01:00
587b051b1f
Merge pull request #2492 from vintagepc/belt-test-fixes-no-reorg
...
Belt test improvements (No display alteration)
2020-03-26 18:53:40 +01:00
b95d7365c8
Merge branch 'MK3' into remove-unnecessary-delay
2020-03-26 18:45:34 +01:00
c085ecaa11
Merge pull request #2264 from leptun/MK3_fix_selftest_Z_crash2
...
PFW-1048: fix selftest Z crash. Use stallGuard when testing Z
2020-03-26 18:22:35 +01:00
d0c51b9e73
int -> bool
2020-03-26 19:06:35 +02:00
65228a046e
Merge pull request #2520 from MRprusa3d/PFW-x001bPR
...
FS PCB auto-detect
2020-03-26 17:36:18 +01:00
818efb4fa2
updated messages + slight refactoring to save some bytes
2020-03-26 15:07:48 +01:00
34ac2917ae
fix. warning "Macro expansion producing 'defined' has undefined
...
behavior"
update screen layout comments
2020-03-26 14:40:47 +01:00
ff479afd88
version for testing / final review
2020-03-10 15:51:48 +01:00
5fcf18718f
Decouple XYZ relative from E relative.
2020-03-05 11:22:35 +02:00
355b003b7f
menu_data_reset()
2020-03-04 22:20:53 +02:00
22432b1053
Reset menu state after lcd_sd_refresh
2020-03-04 21:07:51 +02:00
5edc1ef297
Fix updir and dir again
2020-03-04 21:03:57 +02:00
57c149e7b5
Comment cleanup
2020-03-04 21:01:08 +02:00
7b19715c99
Cache sdSort
2020-03-04 20:41:17 +02:00
f35e553373
Code cleanup
2020-03-04 20:33:43 +02:00
8e47cb35a3
Possible fix to longpress in sdcard menu
2020-03-03 15:29:10 +02:00
d1968f6ff0
Option to refresh/resort SDcard files when flashAir type is selected
2020-03-03 15:17:50 +02:00
f69a68b966
Fix subdir enter and exit
2020-03-03 14:55:08 +02:00
53e130fc6d
Merge branch 'MK3' into MK3_NEW_SD_COMPILATION
2020-03-03 14:14:43 +02:00
0eaa4edfee
configuration update
2020-03-02 21:18:11 +01:00
2a9504b20a
!!! for testing only !!!
...
filament sensor auto-detection
2020-03-02 19:07:23 +01:00
ec5e54de25
state fixing
2020-03-02 17:52:25 +01:00
e06beb61c3
Ditch charswitch, show ... for measuring
2020-02-21 18:14:13 -05:00
1aaefffdb0
Change to raise_z_above()
2020-02-13 07:37:27 -05:00
5abee3d3e5
Better display handling
2020-02-11 19:44:26 -05:00
278bb032d7
Change to raise_z_above()
2020-02-11 18:37:26 -05:00
a4458fb57b
Removed duplicate #defines
...
cleaned up display routine
2020-02-11 18:33:40 -05:00
e4b1a1e9c4
Remove delay for belttest, similar to #2439
...
There's a separate PR to remove the first delay in the selftest. (#2439 ). Mirroring that to the belt test function, which I suspect also inherited it.
2020-02-09 21:39:48 -05:00
721b27fcb6
Reorg/cleanup
...
Removed unused progress variable
reorganized flow to avoid early returns (ensures forced high power mode is disabled regardless of outcome)
2020-02-08 12:33:23 -05:00
1384e783bf
Force high power mode when running belt test
2020-02-07 16:14:33 -05:00
6fbd632c84
Isolate all PAT9125-specific code, fix build on !MK3 variants
...
- Hide all prototypes related to PAT9125 to force all callers
to check for the proper sensor, since the handling differences
are substantial
- Remove unneeded lenght accounting from the stepper isr as as
consequence.
- Keep detailed soft failure counts for the MK3 on the "last print
failures" status screen, but fix build on variants without a PAT9125
by fixing the lcd stats function.
2020-02-05 16:20:12 +01:00
8fb8ff4bf4
Include fsensor recovery stats in the last print stats
2020-02-05 16:20:12 +01:00
3ae5fa70ca
Fix comments
2020-02-03 19:20:43 +02:00
1f482adf55
Improved lcd_menu_statistics() implementation
2020-02-03 18:40:46 +02:00
d6522a643c
Update ultralcd.cpp
...
indent
2020-01-31 16:57:18 +01:00
fd42361236
Update ultralcd.cpp
...
do delay(2000) everytime, even if IR_SENSOR_ANALOG
2020-01-31 16:55:40 +01:00
10d468cceb
Merge branch 'MK3' into remove-unnecessary-delay
2020-01-31 16:51:27 +01:00
3e70b73a1f
Remove unnecessary delay in lcd_selftest, which occured there as a result of merge.
2020-01-27 19:02:15 +01:00
2e50954710
Merge branch 'MK3' into MK3_fix_selftest_Z_crash2
2020-01-22 14:56:54 +02:00
73527d6069
selfTest workflow optimalization
2020-01-22 04:45:13 +01:00
24b748c4ac
Merge remote-tracking branch 'upstream/MK3' into flashair_display_ip
2020-01-16 21:25:55 +09:00
7230b99448
Merge pull request #2393 from wavexx/sync_before_resume
...
Sync before resume
2020-01-15 12:49:56 +01:00
1a8420f3f9
Merge pull request #2383 from wavexx/fix_usb_resume_check
...
Fix fan_check_error check in usb print resume
2020-01-15 12:48:48 +01:00
43870c4028
Merge pull request #2368 from wavexx/unretract_after_lcd_pause
...
Unretract when resuming a paused print
2020-01-15 12:47:24 +01:00
32c9cd2307
Merge branch 'MK3' into fix_lcd_stop
2020-01-09 14:17:56 +02:00
b088500eaf
Merge pull request #1909 from wavexx/MK3_LA15
...
Linear Advance 1.5 Returns
2020-01-09 11:22:06 +01:00
e295c83d09
Folder sorting shellSort
2020-01-08 21:16:08 +02:00
7028583e9b
Merge branch 'MK3_ShellSort' into MK3_NEW_SD_COMPILATION
2020-01-08 16:27:31 +02:00
37dc5fed45
Merge branch 'MK3_revised_filename_scrolling' into MK3_NEW_SD_COMPILATION
2020-01-08 16:26:51 +02:00
df300a2488
Merge pull request #2403 from leptun/MK3_unknown_Z_mark
...
Show ? near Z value if the position is unknown
2020-01-08 14:55:37 +01:00
e15d5e21f5
Merge pull request #2402 from leptun/MK3_sheet_on_status_screen
...
Do not show sheet on status screen if less than 2 are initialized
2020-01-08 14:42:29 +01:00
2f2e415eae
Merge pull request #2382 from wavexx/fix_lcd_stop
...
Fix lcd "Stop" when used within a pause
2020-01-08 14:40:54 +01:00
8b0f0695a8
Merge branch 'MK3_fix_shorter_sheet_name_on_status_screen' into MK3_sheet_on_status_screen
2020-01-08 15:31:33 +02:00
9abdf4e535
Show ? near Z value if the position is unknown
2020-01-08 13:46:51 +02:00
c5324291ad
Do not show sheet on status screen if less than 2 are initialized
2020-01-08 12:48:41 +02:00
d9e5283526
Fix pause->stop->PrintFromSD scenario
2020-01-07 21:02:13 +02:00
1996fc7940
Remove commented-out code
2020-01-07 20:43:56 +02:00
4422fc29f8
Set XYZ to absolute and E to relative
2020-01-07 20:42:21 +02:00
f8a0d5d773
Fix lcd_print_stop function
2020-01-07 19:54:06 +02:00
df0d781c20
Merge branch 'MK3' into fix_lcd_stop
2020-01-07 19:53:55 +02:00
1ba89b9689
Merge branch 'MK3' into MK3_ShellSort
2020-01-07 14:18:31 +02:00
f923427dc1
Show the FlashAir IP address
...
Displays the FlashAir IP address in the "Support" menu if the card is available.
If no IP address has been assigned yet, "0.0.0.0" will be displayed.
2020-01-04 12:51:20 +09:00
57be14fca6
Complete all pending moves before restoring a saved print
2019-12-30 13:30:06 +01:00
a31319888c
Fix fan_check_error check in usb print resume
...
Also check for fan_check_error == EFCE_OK in addition to EFCE_FIXED.
Reorganize the check in order to fix both #if[n]def FANCHECK cases,
as similarly done in the SDSUPPORT case a few lines below.
2019-12-23 19:12:46 +01:00
8d60e4d6db
Merge remote-tracking branch 'upstream/MK3' into MK3_LA15
2019-12-18 18:28:41 +01:00
f071aec747
Fix sheet minimum width on the status screen
2019-12-18 08:52:25 +03:00
f0f7db57ea
Fist attempt at "saved position SD menu"
2019-12-17 00:45:25 +02:00
3ad611ca16
Merge branch 'MK3' into MK3_revised_filename_scrolling
2019-12-16 21:39:27 +02:00
8d490f941a
Make use of the CRITICAL_SECTION macros in lcd_print_stop
2019-12-16 16:39:20 +01:00
0cc68228f8
Unretract when resuming a paused print
2019-12-16 16:33:11 +01:00
955c88cf68
Merge pull request #2370 from wavexx/no_resume_while_resuming
...
Do not allow to resume a print twice while waiting for the hotend
2019-12-16 16:26:02 +01:00
faa76df2fe
Fix the "Stop print" behavior from the LCD
...
Correctly cleanup the printer state when stopping the current print:
- Disable interrupts while aborting the planner/queue to ensure
new serial commands are not inserted while aborting
- _Always_ call planner_abort_hard() to interrupt any pending move!
- Clear the saved_target, which might be set when calling stop
from within a paused state. Create a new function to clear the
paused state for future use.
- Do not disable/reset the MBL: doing so will destroy the ability to
restart correctly using M999.
2019-12-16 15:52:37 +01:00
348bbbffb0
Do not allow to resume a print twice while waiting for the hotend
...
Clear isPrintPaused just prior to restore_print_from_ram_and_continue.
2019-12-15 22:22:44 +01:00
c122399020
Merge pull request #2270 from leptun/MK3-PFW-1024
...
PFW-1024
2019-12-15 10:25:37 +01:00
d68d9c7fef
Merge pull request #2058 from leptun/MK3_fix_warnings
...
Fix "LANG_MODE 0" warnings
2019-12-15 09:29:27 +01:00
770fcd7c42
Merge branch 'MK3' into MK3-PFW-1024
2019-12-14 10:08:52 +02:00
30cee7afca
Merge pull request #2353 from wavexx/lcd_pause_fixes
...
Fix the LCD pause (regression)
2019-12-13 13:53:29 +01:00
a1bc4cc5dc
Merge pull request #2332 from leptun/MK3_Octoprint_fIxes
...
Do not check for fanError if it is not enabled on resume
2019-12-13 13:47:56 +01:00
0b9123ce24
Fix Live K, allow "Advance K" to be translated
2019-12-05 15:18:24 +01:00
5122f79a39
Merge remote-tracking branch 'upstream/MK3' into MK3_LA15
2019-12-04 17:27:23 +01:00
063d0421ac
Call long_pause from the main loop (again)
...
After calling stop_and_save_print_to_ram, perform the parking moves
within the main loop as done before PR#1899 to avoid planning within
an interrupted move (which would clear the abort flag too soon).
2019-12-03 20:37:13 +01:00
63655a906a
Merge branch 'MK3' into MK3_revised_filename_scrolling
2019-11-30 01:31:48 +02:00
103e29d38a
Merge branch 'MK3' into MK3_ShellSort
2019-11-29 16:52:20 +02:00
a413cfbb9a
Merge branch 'MK3' into MK3-PFW-1024
2019-11-29 13:07:45 +02:00
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
960f4a88ed
Status bar, lcd optimization, compile warning fix
2019-11-26 13:36:28 +02:00
d40656e3ca
Small changes to rendering
2019-11-24 19:16:22 +02:00
273d834b19
Fix card removal
2019-11-22 20:27:24 +02:00
2fd192a95d
Set scroll delay to 300ms
2019-11-22 20:14:55 +02:00
fdab70fa3a
Dir fixes
2019-11-22 14:39:21 +02:00
8a806bceea
SDDIR
2019-11-21 21:32:52 +02:00
6538262e75
First build that actually works
2019-11-21 19:04:45 +02:00
8f901d2613
Temporary fix
2019-11-21 14:58:13 +02:00
b3a587f5a4
SD first attempt. Broken
2019-11-20 20:25:51 +02:00
45b89c5728
Fix typo
2019-11-19 13:55:37 +02:00
e66574ac5f
Updated branch to use TOGGLE
2019-11-19 13:51:10 +02:00
6e2793566c
Merge branch 'MK3' into PFW-943
2019-11-18 14:43:46 +01:00
b077303156
Fix compile error
2019-11-17 11:10:13 +02:00
14104e7bf9
Clear error flag when fanError is disabled
2019-11-17 10:44:11 +02:00
2e0034d915
Update Toggles and Translations
2019-11-17 09:53:14 +02:00
359c447127
Do not check for fanError if it is not enabled on resume
...
Fix typos
2019-11-16 22:44:34 +02:00
07b6173aaa
Merge branch 'MK3' into MK3-PFW-1024
2019-11-16 11:28:29 +02:00
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
460f6c3b5e
update message
2019-11-15 17:47:39 +01:00
715794d854
Merge pull request #2092 from leptun/MK3_Translations
...
PFW-1062: Mk3 Toggle and Translations
2019-11-15 16:53:17 +01:00
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
f6c35c5d5f
Removed separate fix for #2089
...
Per PR fix request
2019-11-15 08:58:58 -05:00
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
56251c4f99
Merge pull request #1937 from arons/MK3
...
added new function belt test under calibration menu
2019-11-15 09:39:42 +01:00
9e780f0b2b
remove ESC sequence
2019-11-15 09:26:56 +01:00
11428388c6
MBL toggle and cleanup
2019-11-09 20:58:56 +02:00
20a59f5f40
Temp cal.
2019-11-08 19:44:48 +02:00
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
ce5efb107a
Merge pull request #2155 from leptun/MK3_SD_scroll_workaround
...
SD Scroll workaround
2019-11-08 16:48:38 +01:00
b33c79e6c7
Merge pull request #1899 from wavexx/fix_lcd_pause_function
...
Fix the LCD pause function
2019-11-08 14:55:13 +01:00
42d70f3dea
Merge pull request #1768 from wavexx/unknown_z_improvements
...
"Unknown z" improvements
2019-11-08 14:52:56 +01:00
1de353dd09
Merge branch 'MK3' into MK3_Translations
2019-11-07 17:02:45 +02:00
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
cd5ff783cf
General fixes and improvements to code
2019-10-31 19:07:20 +02:00
76c39ce689
Show FINDA state as N/A if last received response is older than 1s.
2019-10-31 17:45:22 +01:00
1e09f8c003
Wake on certain events
...
EEPROM DIM and BRIGHT values swapped!!!
2019-10-30 21:11:19 +02:00
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
d32fd1d893
Better EN for new messages
2019-10-22 09:11:47 +02:00
d7b12faa95
Add "Brightness" to Tune menu
2019-10-19 18:45:04 +03:00
0ed4a23ae7
And another compile fix...
2019-10-18 12:42:55 +03:00
9fc42526e7
Backlight always on during calibration
2019-10-18 12:18:43 +03:00
91e94aa0e8
Adjustable timeout
2019-10-18 10:32:41 +03:00
812eafd09c
Fix compile for miniRambo
2019-10-17 13:14:32 +03:00
25e0d23efe
Backlight overhaul and UI changes
2019-10-17 13:11:32 +03:00
04bfe674df
tiny lang fixes, part 1
2019-10-16 16:32:49 +02:00
3b005ae38f
Backlight detection
2019-10-16 14:40:45 +03:00
odaki
Yuri D'Elia
DRracer
Alex Voinea
vintagepc
D.R.racer
MRprusa3d
MRprusa3d
Marek Bel