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
Yuri D'Elia
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
Yuri D'Elia
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
Yuri D'Elia
4f0af648fb
Save/restore feedmultiply independently of the feedrate
2019-11-28 17:16:36 +01:00
Yuri D'Elia
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
Yuri D'Elia
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
Yuri D'Elia
faa9e925fe
Replace a few loops with set_current_to_destination()
2019-11-28 15:57:21 +01:00
Yuri D'Elia
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
Yuri D'Elia
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
Yuri D'Elia
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
DRracer
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
DRracer
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
vintagepc
982c4cbf7b
Candidate fix for homing fail hard reset
2019-11-21 18:51:02 -05: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
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
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
Panayiotis-git
23cf076242
Add oversighted ‘break’ statement at the M603 command's source
2019-11-12 21:32:39 +02: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
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
DRracer
ce5efb107a
Merge pull request #2155 from leptun/MK3_SD_scroll_workaround
...
SD Scroll workaround
2019-11-08 16:48:38 +01:00
DRracer
4cf2f05d1d
Merge pull request #2057 from leptun/MK3_fix_M350
...
M350 for all axis - MK3
2019-11-08 16:15:15 +01:00
DRracer
a14d7545a5
Update Marlin_main.cpp
2019-11-08 16:06:42 +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
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
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
459385708e
Fix MMU needs user attention Statistics error
2019-11-02 13:15:13 +02: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
3d-gussner
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
leptun
1e09f8c003
Wake on certain events
...
EEPROM DIM and BRIGHT values swapped!!!
2019-10-30 21:11:19 +02:00
Marek Bel
023ce01f9d
Version 3.8.1 final.
2019-10-24 16:12:46 +02:00
XPila
b603528bfd
Merge pull request #2291 from DRracer/lang-381-fixes-4
...
Lang 381 fixes 4
2019-10-23 15:04:39 +02:00
Yuri D'Elia
e25befa175
Fix include guard to silence duplicate declaration warnings
2019-10-22 15:49:10 +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
4943e17bda
Preserve power during PP by turning off backlight
2019-10-19 18:45:31 +03: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
d432c3644d
Enable beeping after fan error is fixed
2019-10-18 09:13:19 +03:00
leptun
ea8d9ae49d
Merge branch 'MK3' into MK3_Octoprint_fIxes
2019-10-18 08:45:22 +03:00
leptun
ace1d7049a
Reenable command processing when issue is fixed if printer not active
2019-10-17 17:49:15 +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
DRracer
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
Yuri D'Elia
7f3ba499a0
Do not wait forever if the heater on the extruder is disabled
2019-10-15 20:54:00 +02:00
leptun
5a662413e6
Fix compile for printer without backlight support
2019-10-13 14:34:04 +03:00
leptun
75f389a71d
Auto-Dimming initial
2019-10-13 14:31:43 +03:00
leptun
b2a1dc6786
Compile fix for firmware without LCD_BL_PIN
2019-10-11 19:23:38 +03:00
leptun
68491c9d4d
First implementation
2019-10-11 19:06:37 +03:00
leptun
e3ac2e2509
PSU_DELTA fix force_high_power_mode()
2019-10-10 19:01:57 +03:00
Marek Bel
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
Marek Bel
0dde5e3167
Increase version.
2019-10-03 17:37:22 +02:00
Marek Bel
4fc4cf9c11
Increase version and commit number.
2019-10-03 17:30:14 +02:00
Marek Bel
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
Also update eeprom value
2019-10-02 18:38:46 +02: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
leptun
6bd35bfa2f
Increase MENU_DEPTH_MAX to 7 to allow sheet calibration with MMU
2019-10-01 19:43:30 +03: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
DRracer
aa50479da5
Merge pull request #2231 from MRprusa3d/PFW-873c
...
default nozzle diameter for farm mode
2019-09-30 18:36:25 +02:00
Marek Bel
aba9d1c360
Merge branch 'MK3' into MM_lay1_cal
2019-09-30 18:13:57 +02:00
DRracer
d31abd4bce
Merge pull request #2240 from leptun/MK3_fix_SD_workDirDepth
...
fix workDirDepth not reset after card init.
2019-09-30 17:32:46 +02:00