genuineparts/Creality-Helper-Script
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2 from ElForastero/main

Browse source 
Conflict between PAUSE and M600
This commit is contained in:
Cyril Guislain 2024-04-01 12:49:02 +02:00 • committed by GitHub
commit 4449e4bacf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
files/macros/M600-support.cfg
View file

@ -92,12 +92,14 @@ gcode:
{% set s_value = (printer['gcode_macro PRINTER_PARAM'].fan2_speed * 255 - printer['gcode_macro PRINTER_PARAM'].fan2_min) * 255 / (255 - printer['gcode_macro PRINTER_PARAM'].fan2_min)|float %} {% set s_value = (printer['gcode_macro PRINTER_PARAM'].fan2_speed * 255 - printer['gcode_macro PRINTER_PARAM'].fan2_min) * 255 / (255 - printer['gcode_macro PRINTER_PARAM'].fan2_min)|float %}
M106 P2 S{s_value} M106 P2 S{s_value}
{% endif %} {% endif %}
{% set z_resume_move = printer['gcode_macro PRINTER_PARAM'].z_safe_pause|int %} {% if printer['gcode_macro M600'].m600_state != 1 %}
{% if z_resume_move > 2 %} {% set z_resume_move = printer['gcode_macro PRINTER_PARAM'].z_safe_pause|int %}
{% set z_resume_move = z_resume_move - 2 %} {% if z_resume_move > 2 %}
G91 {% set z_resume_move = z_resume_move - 2 %}
G1 Z-{z_resume_move} F600 G91
M400 G1 Z-{z_resume_move} F600
M400
{% endif %}
{% endif %} {% endif %}
{% set E = printer["gcode_macro PAUSE"].extrude|float + 1.0 %} {% set E = printer["gcode_macro PAUSE"].extrude|float + 1.0 %}
{% if 'VELOCITY' in params|upper %} {% if 'VELOCITY' in params|upper %}