From 263d459fd9ee86dd2afa25c5049c05b9db54e457 Mon Sep 17 00:00:00 2001 From: Eugene Dzhumak Date: Mon, 25 Mar 2024 21:39:54 +0400 Subject: [PATCH 1/2] Update M600-support.cfg --- files/macros/M600-support.cfg | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/files/macros/M600-support.cfg b/files/macros/M600-support.cfg index 2f1d66c..579ec65 100644 --- a/files/macros/M600-support.cfg +++ b/files/macros/M600-support.cfg @@ -39,6 +39,7 @@ gcode: {action_respond_info("z_safe = %s"% (z_safe))} SET_GCODE_VARIABLE MACRO=M600 VARIABLE=m600_state VALUE=1 SET_GCODE_VARIABLE MACRO=PRINTER_PARAM VARIABLE=hotend_temp VALUE={printer.extruder.target} + SET_GCODE_VARIABLE MACRO=PRINTER_PARAM VARIABLE=z_safe_pause VALUE={z_safe|float} RESPOND TYPE=command MSG="Print paused for filament change!" PAUSE_BASE G91 @@ -91,13 +92,6 @@ 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 %} M106 P2 S{s_value} {% endif %} - {% set z_resume_move = printer['gcode_macro PRINTER_PARAM'].z_safe_pause|int %} - {% if z_resume_move > 2 %} - {% set z_resume_move = z_resume_move - 2 %} - G91 - G1 Z-{z_resume_move} F600 - M400 - {% endif %} {% set E = printer["gcode_macro PAUSE"].extrude|float + 1.0 %} {% if 'VELOCITY' in params|upper %} {% set get_params = ('VELOCITY=' + params.VELOCITY) %} From 6c784eb6b4983ca0c7a878e175fc337efbbe3717 Mon Sep 17 00:00:00 2001 From: Eugene Dzhumak Date: Mon, 1 Apr 2024 10:47:48 +0400 Subject: [PATCH 2/2] Update M600-support.cfg --- files/macros/M600-support.cfg | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/files/macros/M600-support.cfg b/files/macros/M600-support.cfg index a3eb972..3516f3c 100644 --- a/files/macros/M600-support.cfg +++ b/files/macros/M600-support.cfg @@ -92,6 +92,15 @@ 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 %} M106 P2 S{s_value} {% endif %} + {% if printer['gcode_macro M600'].m600_state != 1 %} + {% set z_resume_move = printer['gcode_macro PRINTER_PARAM'].z_safe_pause|int %} + {% if z_resume_move > 2 %} + {% set z_resume_move = z_resume_move - 2 %} + G91 + G1 Z-{z_resume_move} F600 + M400 + {% endif %} + {% endif %} {% set E = printer["gcode_macro PAUSE"].extrude|float + 1.0 %} {% if 'VELOCITY' in params|upper %} {% set get_params = ('VELOCITY=' + params.VELOCITY) %}