MRprusa3d
73527d6069
selfTest workflow optimalization
2020-01-22 04:45:13 +01:00
DRracer
7230b99448
Merge pull request #2393 from wavexx/sync_before_resume
...
Sync before resume
2020-01-15 12:49:56 +01:00
DRracer
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
DRracer
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
Alex Voinea
32c9cd2307
Merge branch 'MK3' into fix_lcd_stop
2020-01-09 14:17:56 +02:00
DRracer
b088500eaf
Merge pull request #1909 from wavexx/MK3_LA15
...
Linear Advance 1.5 Returns
2020-01-09 11:22:06 +01:00
DRracer
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
DRracer
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
DRracer
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
Alex Voinea
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
Alex Voinea
9abdf4e535
Show ? near Z value if the position is unknown
2020-01-08 13:46:51 +02:00
Alex Voinea
c5324291ad
Do not show sheet on status screen if less than 2 are initialized
2020-01-08 12:48:41 +02:00
Alex Voinea
d9e5283526
Fix pause->stop->PrintFromSD scenario
2020-01-07 21:02:13 +02:00
Alex Voinea
1996fc7940
Remove commented-out code
2020-01-07 20:43:56 +02:00
Alex Voinea
4422fc29f8
Set XYZ to absolute and E to relative
2020-01-07 20:42:21 +02:00
Alex Voinea
f8a0d5d773
Fix lcd_print_stop function
2020-01-07 19:54:06 +02:00
Alex Voinea
df0d781c20
Merge branch 'MK3' into fix_lcd_stop
2020-01-07 19:53:55 +02:00
Yuri D'Elia
57be14fca6
Complete all pending moves before restoring a saved print
2019-12-30 13:30:06 +01:00
Yuri D'Elia
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
Yuri D'Elia
8d60e4d6db
Merge remote-tracking branch 'upstream/MK3' into MK3_LA15
2019-12-18 18:28:41 +01:00
Alex Voinea
f071aec747
Fix sheet minimum width on the status screen
2019-12-18 08:52:25 +03:00
Yuri D'Elia
8d490f941a
Make use of the CRITICAL_SECTION macros in lcd_print_stop
2019-12-16 16:39:20 +01:00
Yuri D'Elia
0cc68228f8
Unretract when resuming a paused print
2019-12-16 16:33:11 +01:00
DRracer
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
Yuri D'Elia
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
Yuri D'Elia
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
DRracer
c122399020
Merge pull request #2270 from leptun/MK3-PFW-1024
...
PFW-1024
2019-12-15 10:25:37 +01:00
DRracer
d68d9c7fef
Merge pull request #2058 from leptun/MK3_fix_warnings
...
Fix "LANG_MODE 0" warnings
2019-12-15 09:29:27 +01:00
Alex Voinea
770fcd7c42
Merge branch 'MK3' into MK3-PFW-1024
2019-12-14 10:08:52 +02:00
DRracer
30cee7afca
Merge pull request #2353 from wavexx/lcd_pause_fixes
...
Fix the LCD pause (regression)
2019-12-13 13:53:29 +01:00
DRracer
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
Yuri D'Elia
0b9123ce24
Fix Live K, allow "Advance K" to be translated
2019-12-05 15:18:24 +01:00
Yuri D'Elia
5122f79a39
Merge remote-tracking branch 'upstream/MK3' into MK3_LA15
2019-12-04 17:27:23 +01:00
Yuri D'Elia
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
Alex Voinea
a413cfbb9a
Merge branch 'MK3' into MK3-PFW-1024
2019-11-29 13:07:45 +02:00
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
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