bd80ee88a0
Set the IN_HANDLER busy state while checking the filament
2019-12-29 21:27:42 +01:00
97170ed68d
Do not call process_commands() within fsensor_update()
...
Plan moves directly to reduce the required stack size.
2019-12-27 19:37:20 +01:00
fe4c00fb8a
Lift the extruder when checking for the filament
...
This avoids leaving marks on the print
2019-12-27 19:35:08 +01:00
301d64042b
Set fsensor_watch_runout earlier to prevent re-entry
...
Do not set/clear fsensor_watch_runout within fsensor_oq_meassure_start
which is used outside of fsensor_update where it could have a different
starting value.
Set it within fsensor_stop_and_save_print to immediately prevent
re-entry.
2019-12-27 19:34:36 +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
7b29ce29b4
Add a Linear Advance 1.0->1.5 compatibility layer
...
Allow existing gcode using LA10 to transparently take advantage of LA15
by using a simple linear conversion function based on experimental
results with the MK3 implementation of linear advance.
Autodetect LA10 values based on the first M900 instruction contained in
the print. In order to support printing mixed files without resetting
the printer we also reset the autodetection status when starting a new
SD print and/or when explicitly disabling LA.
Since we cannot reliably detect whether a new print is started when
printing via USB, also reset the detection status when homing in G28,
which is generally performed once at each print. Note that this doesn't
clear the previous K value, it only allows a subsequent M900 to provide
LA10 values when printed after a LA15 file.
2019-12-21 23:22:35 +01:00
c0ae92cd2a
Remove "relative_mode", only use "axis_relative_modes"
...
axis_relative_modes can cleanly handle G90/G91 and M82/M83 without the
need of "relative_mode" entirely.
Change G90/G91 to simply reset all axes according to the requested
state, which avoids to check two variables in get_coordinates(),
fixing the following incorrect handling:
G91 ; all axis relative
M83 ; set extruder absolute
G1 E1 ; should be an absolute move, but still relative
2019-12-20 18:47:30 +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
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
d4fab1a713
Merge pull request #2304 from 3d-gussner/MK3-Fix_M81
...
Fix M81 Turn off Power Supply...
2019-12-15 11:52:56 +01:00
c45d4f4bba
Merge pull request #2088 from rhounsell/MK3
...
Fix for Toshiba FlashAir (or other) SD card initialization
2019-12-15 11:46:56 +01:00
44288bfe90
Merge pull request #2309 from leptun/MK3_fix_MMU_pause_time
...
Fix MMU needs user attention Statistics error
2019-12-15 11:04:57 +01:00
d6ac9e4638
Merge pull request #2342 from vintagepc/2306-hard-reset-homing-fails
...
Fix #2306 hard reset homing fails
2019-12-15 10:51:52 +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
6ab3b20ce1
Merge pull request #2348 from leptun/MK3_fix_kill
...
Fix kill messages
2019-12-13 18:30:27 +01:00
1423de10a9
Merge pull request #2362 from leptun/MK3_Fix_Lang_64K_limit
...
Fix optiboot erase function after address 0xFFFF. Allows language files greater than 64K
2019-12-13 13:59:23 +01:00
30cee7afca
Merge pull request #2353 from wavexx/lcd_pause_fixes
...
Fix the LCD pause (regression)
2019-12-13 13:53:29 +01:00
838cec75ec
Merge pull request #2352 from wavexx/fix_m603_regression
...
Use lcd_print_stop() in M603, fix octoprint regression
2019-12-13 13:52:40 +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
89dfb00b04
Fix optiboot erase function after address 0xFFFF
2019-12-08 08:43:43 +02: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
17e23693eb
Fixed stuipid copy paste error
2019-12-04 14:21:43 +01:00
0cafd10378
minor fix
2019-12-04 13:43:19 +01:00
f7bfca3061
Fix merge issues
2019-12-04 13:39:56 +01:00
7da1db2f25
Merge remote-tracking branch 'upstream/MK3' into MK3-Gcode_documentation
2019-12-04 13:35:09 +01:00
fb3c65b3dc
fixed links to RR Wiki
2019-12-04 12:38:43 +01:00
cdc6beaf6f
Added M910 -> M918
2019-12-04 12:25:33 +01:00
a5f3027ee1
D2130 updated
...
Needs review
2019-12-04 11:38:29 +01:00
8448b8d413
Keep destination updated in an aborted plan as well
...
When aborting the plan destination is updated anyway to reflect the latest
position. There's no use in this additional check.
2019-12-03 20:37:13 +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
d60230e494
Add some documentation
2019-12-03 20:37:13 +01:00
792d7ca6dc
Turn off heaters just prior to retraction to limit oozing
2019-12-03 20:37:13 +01:00
4fce74140a
Also abort planning in stop_and_save_print_to_ram
...
Similarly to resume_print_from_ram_and_continue, abort any
planning in mesh_plan_buffer_line already in stop_and_save_print_to_ram
in case it is called for pausing only.
2019-12-03 20:37:09 +01:00
0ce7c51c1d
Added more D-codes to RR Wiki and doxygen
...
D-1, D80, D81, D106
2019-12-03 20:02:58 +01:00
454e99dbb5
Use lcd_print_stop() in M603, fix octoprint regression
...
M603 shouldn't report a fatal error state.
Use lcd_print_stop().
Regression introduced in PR #2274
2019-12-03 16:51:59 +01:00
56193ea252
Merge branch 'MK3' into MK3_TONE
2019-11-29 23:16:46 +02:00
e7f2577233
Fix kill messages
2019-11-29 22:49:22 +02:00
15bfb7013d
Merge pull request #2274 from wavexx/fix_mesh_plan_buffer_line
...
PFW-1028: Fix recovery from filament sensor checks / crash detect / power panic
2019-11-29 15:18:15 +01:00
779423f0e7
Move hardcoded values to variants
2019-11-29 15:06:54 +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
18eaf21baf
Halve memory usage of saved feedrate
...
Truncate the saved feedrate to an uint16_t.
This is more than sufficient for recovery.
2019-11-28 17:16:37 +01:00
17176c1df2
Save/restore the default feedrate correctly
...
Since the global feedrate can be similarly modified for moves ahead of
time, save the original feedrate in the planner as we do for
gcode_target.
This avoids having to undo feedmultiply (and machine limits!) from
"nominal_speed" as previously done.
Thanks @leptun
2019-11-28 17:16:37 +01:00
4f0af648fb
Save/restore feedmultiply independently of the feedrate
2019-11-28 17:16:36 +01:00
6ecff003b7
Fix M600 insertion by the filament sensor
...
Remove incorrect usage of stop_and_save_print combined with the
fsensor_recovert internal instruction which would result in a
broken sequence of events and/or broken stack.
Re-use the now safe stop/recover functions in the same spot
(fsensor_checkpoint_stream) to effectively cut a hole in the current
gcode stream to insert an M600 instruction, which removes all
recursive behavior without the need of extra state variables.
2019-11-28 17:13:37 +01:00
4268c2fdae
Fix recovery from relative/chunked moves
...
When starting to replay existing USB/SD commands from a recovery state,
an immediate relative move needs to compensate for a previously
interrupted move. This is almost the norm for the E axis.
Instead of saving the relative status of the move (which needs to
account for the world2machine conversion and is not always available on
a chunked move split by MBL) save directly the calculated target
position for the move in the original plan, which is easy to replay.
2019-11-28 16:42:35 +01:00
faa9e925fe
Replace a few loops with set_current_to_destination()
2019-11-28 15:57:21 +01:00
5fa7c178b5
Do not set current_position in mesh_plan_buffer_line
...
This is a task which _has_ to be performed by the caller,
such as prepare_move().
2019-11-28 15:57:21 +01:00
0f6b9b4051
Unroll the stack in restore_print_from_ram_and_continue
...
While handling moves in a recursive plan, such a filament check,
ensure restore_print_from_ram_and_continue unwinds the stack by
aborting early from any call that waits on the planner.
This currently only handles G1 moves, but hard-coded behavior that can
trigger recursive behavior (such as filament change) will probably have
to be checked too.
2019-11-28 15:57:20 +01:00
404802b5e6
Clear "sdprinting" state only when all SD moves are complete
...
Ensure card.printingHasFinished sees all the planned moves before
clearing sdprinting. To do that, we need to ensure all SD commands
exited the command queue.
2019-11-28 15:57:20 +01:00
660b646b57
RR Wiki for Dcodes
...
open D-1, D80, D81, D106, D2130
2019-11-27 11:29:55 +01:00
475551431c
How does M862.5 P works???
2019-11-26 20:21:05 +01:00
84cb373905
More G codes documented in RR wiki
...
M44, M45, M47, M403, M509, M851, M601, M602, M603, M862
2019-11-26 20:11:55 +01:00
5eaf6f0133
Merge branch 'MK3' into MK3-Gcode_documentation
...
Merge with MK3 branch
2019-11-26 12:48:21 +01:00
35ce2896bb
Merge pull request #2339 from leptun/PFW-943
...
PFW-943: IR sensor gen. II - Updated PR
2019-11-25 06:23:24 +01:00
abb220ff69
Merge pull request #2323 from Panayiotis-git/MK3_Fix_M603
...
Add oversighted ‘break’ statement at the M603 command's source
2019-11-25 06:04:41 +01:00
982c4cbf7b
Candidate fix for homing fail hard reset
2019-11-21 18:51:02 -05: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
86ea24c364
Merge pull request #2273 from wavexx/do_not_wait_for_disabled_heater
...
Do not wait forever if the heater on the extruder is disabled
2019-11-15 17:19:11 +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
e559a6b67f
Merge branch 'MK3' into MK3_BED_LEVELING_PWM
2019-11-13 14:32:57 +02:00
28e812d91f
Mesh bed leveling testing
2019-11-13 14:32:33 +02:00
23cf076242
Add oversighted ‘break’ statement at the M603 command's source
2019-11-12 21:32:39 +02: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
422e7fde4a
Merge branch 'MK3' into MK3-Gcode_documentation
2019-11-08 18:16:56 +01: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
21dd8eadd1
Merge pull request #2188 from mkbel/cut_last_try
...
Use MMU cutter only as last resort.
2019-11-08 16:49:28 +01:00
ce5efb107a
Merge pull request #2155 from leptun/MK3_SD_scroll_workaround
...
SD Scroll workaround
2019-11-08 16:48:38 +01:00
4cf2f05d1d
Merge pull request #2057 from leptun/MK3_fix_M350
...
M350 for all axis - MK3
2019-11-08 16:15:15 +01:00
a14d7545a5
Update Marlin_main.cpp
2019-11-08 16:06:42 +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
5bd995b21b
Added more info to doxygen G-Codes
2019-11-06 11:14:06 +01:00
e6eeafd20c
More M-Commands ...
2019-11-05 15:47:04 +01:00
ca234a11ed
M-Commands to M240
2019-11-05 12:40:51 +01:00
8114bd5b1c
Merge with MK3 and few spaces
2019-11-05 09:05:05 +01:00
58404b9c9d
Merge branch 'MK3' into MK3-Gcode_documentation
2019-11-05 09:04:52 +01:00
e56cb14bb9
Merge pull request #1739 from draeath/MK3-fix-sdcard-sorting
...
use modification times for sdcard time sorting. fixes #477
2019-11-04 17:31:38 +01: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
459385708e
Fix MMU needs user attention Statistics error
2019-11-02 13:15:13 +02: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
4501f9d760
M commands documentation #2
2019-10-31 15:46:23 +01:00
c899320590
Fix M81 Turn off Power Supply...
...
... as it should be active if PS_ON_PIN is defined and assinged to an actual pin.
2019-10-31 15:08:07 +01:00
1e09f8c003
Wake on certain events
...
EEPROM DIM and BRIGHT values swapped!!!
2019-10-30 21:11:19 +02:00
ce8dbb5013
M commands documentation #1
2019-10-30 18:52:25 +01:00
b9dca5f895
other doxygen format changes
2019-10-30 15:52:27 +01:00
d472f0730c
Change doxygen format
2019-10-30 15:50:23 +01:00
986ac95c45
G codes documented ... next M commands
2019-10-30 11:19:51 +01:00
8f05627747
Update #1 gcodes doxygen documentation
...
added some RepRap G-codes Wiki external links.
2019-10-25 13:04:04 +02:00
023ce01f9d
Version 3.8.1 final.
2019-10-24 16:12:46 +02:00
b603528bfd
Merge pull request #2291 from DRracer/lang-381-fixes-4
...
Lang 381 fixes 4
2019-10-23 15:04:39 +02:00
e25befa175
Fix include guard to silence duplicate declaration warnings
2019-10-22 15:49:10 +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
4943e17bda
Preserve power during PP by turning off backlight
2019-10-19 18:45:31 +03: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
d432c3644d
Enable beeping after fan error is fixed
2019-10-18 09:13:19 +03:00
ea8d9ae49d
Merge branch 'MK3' into MK3_Octoprint_fIxes
2019-10-18 08:45:22 +03:00
ace1d7049a
Reenable command processing when issue is fixed if printer not active
2019-10-17 17:49:15 +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
5a4126e00c
Merge pull request #2263 from leptun/MK3-Fix_PSU_DELTA_SILENT
...
PSU_DELTA fix force_high_power_mode()
2019-10-16 13:22:22 +02:00
7f3ba499a0
Do not wait forever if the heater on the extruder is disabled
2019-10-15 20:54:00 +02:00
5a662413e6
Fix compile for printer without backlight support
2019-10-13 14:34:04 +03:00
75f389a71d
Auto-Dimming initial
2019-10-13 14:31:43 +03:00
b2a1dc6786
Compile fix for firmware without LCD_BL_PIN
2019-10-11 19:23:38 +03:00
68491c9d4d
First implementation
2019-10-11 19:06:37 +03:00
e3ac2e2509
PSU_DELTA fix force_high_power_mode()
2019-10-10 19:01:57 +03:00
dde61bb444
Automaton changes. Keep heater ON during probing only if pwm is high
2019-10-06 12:44:45 +03:00
7650e2b60c
Handle disable_heater()
2019-10-06 12:43:03 +03:00
570b5989f4
Disable bed PWM while probing bed.
2019-10-06 10:50:11 +03:00
219a5e0625
Initialize EEPROM_SILENT in one place both for MK3 and MK25 printers and make it more clear.
2019-10-03 21:25:52 +02:00
0dde5e3167
Increase version.
2019-10-03 17:37:22 +02:00
4fc4cf9c11
Increase version and commit number.
2019-10-03 17:30:14 +02:00
7feb763643
Move check for clear EEPROM just after factory_reset() to ensure nothing is written to EEPROM before check.
...
Fix wizard not starting after Factory RESET / All Data on MK25 printer.
This was broken by:
Author: leptun <voinea.dragos.alexandru@gmail.com>
Date: 3 weeks ago (9/12/2019 6:16:31 AM)
Commit hash: 78708903e8
2019-10-02 18:38:46 +02:00
05e23d1468
Merge branch 'MK3' into MM_lay1_cal
2019-10-01 23:08:11 +02:00
ff7260dc6e
Merge pull request #2246 from mkbel/reset_live_Z
...
Reset live z
2019-10-01 23:02:40 +02:00
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
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
210d7f6bf1
Merge pull request #2245 from DRracer/knob-long-press
...
Knob long press fixes
2019-10-01 22:33:26 +02:00
Yuri D'Elia
Alex Voinea
DRracer
3d-gussner
vintagepc
MRprusa3d
Panayiotis-git
Marek Bel
XPila
Marek Běl