3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Make G10 and G11 behave just like actual retractions

Browse source 
That's what CuraEngine does anyway.

Contributes to issue CURA-5561.
This commit is contained in:
Ghostkeeper 2018-09-05 11:15:25 +02:00
parent 4e7f8a268f
commit bddfe44f2c
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
1 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
50_inst_per_sec.py
View file

@ -206,6 +206,17 @@ class Command:
def _handle_g(self, cmd_num: int, parts: List[str]) -> None: def _handle_g(self, cmd_num: int, parts: List[str]) -> None:
estimated_exec_time_in_ms = 0.0 estimated_exec_time_in_ms = 0.0
# G10: Retract. Make this behave as if it's a retraction of 25mm.
if cmd_num == 10:
#TODO: If already retracted, this shouldn't add anything to the time.
cmd_num = 1
parts = ["G1", "E" + str(buf.current_position[3] - 25)]
# G11: Unretract. Make this behave as if it's an unretraction of 25mm.
elif cmd_num == 11:
#TODO: If already unretracted
cmd_num = 1
parts = ["G1", "E" + str(buf.current_position[3] + 25)]
# G0 and G1: Move # G0 and G1: Move
if cmd_num in (0, 1): if cmd_num in (0, 1):
# Move # Move
@ -301,20 +312,6 @@ class Command:
if num > 0: if num > 0:
estimated_exec_time_in_ms = num estimated_exec_time_in_ms = num
# G10: Retract. Assume 0.3 seconds for short retractions and 0.5 seconds for long retractions.
if cmd_num == 10:
# S0 is short retract (default), S1 is long retract
is_short_retract = True
if len(parts) > 1:
cmd, num = get_code_and_num(parts[1])
if cmd == "S" and num == 1:
is_short_retract = False
estimated_exec_time_in_ms = (0.3 if is_short_retract else 0.5) * 1000
# G11: Unretract. Assume 0.5 seconds.
if cmd_num == 11:
estimated_exec_time_in_ms = 0.5 * 1000
# G90: Set to absolute positioning. Assume 0 seconds. # G90: Set to absolute positioning. Assume 0 seconds.
if cmd_num == 90: if cmd_num == 90:
estimated_exec_time_in_ms = 0.0 estimated_exec_time_in_ms = 0.0