From 7bd9f81ac87959f88c6e1d9cc515f9b2ea19cd1a Mon Sep 17 00:00:00 2001 From: Cyril Date: Fri, 3 May 2024 21:11:29 +0200 Subject: [PATCH] Update --- files/macros/M600-support-3v3.cfg | 5 +++-- files/macros/M600-support.cfg | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/files/macros/M600-support-3v3.cfg b/files/macros/M600-support-3v3.cfg index 3f42a2a..a4116ea 100644 --- a/files/macros/M600-support-3v3.cfg +++ b/files/macros/M600-support-3v3.cfg @@ -158,9 +158,11 @@ gcode: {% if printer['gcode_macro M600'].fan0_speed > 0 %} {% set s_value = (printer['gcode_macro M600'].fan0_speed * 255 - printer['gcode_macro PRINTER_PARAM'].fan0_min) * 255 / (255 - printer['gcode_macro PRINTER_PARAM'].fan0_min)|float %} M106 P0 S{s_value} G1 + SET_GCODE_VARIABLE MACRO=M600 VARIABLE=fan0_speed VALUE=0 {% endif %} SET_GCODE_VARIABLE MACRO=M600 VARIABLE=m600_state VALUE=0 SET_IDLE_TIMEOUT TIMEOUT=99999999 + RESPOND TYPE=command MSG="action:prompt_end" {% else %} {% if printer.extruder.can_extrude|lower == 'true' %} G91 @@ -171,6 +173,5 @@ gcode: RESPOND TYPE=command MSG="Extruder not hot enough!" {% endif %} {% endif %} - RESPOND TYPE=command MSG="action:prompt_end" - RESPOND TYPE=command MSG="Restarting print..." + RESPOND TYPE=command MSG="Resuming printing..." RESUME_BASE {get_params} diff --git a/files/macros/M600-support.cfg b/files/macros/M600-support.cfg index 9d125fc..fa99c72 100644 --- a/files/macros/M600-support.cfg +++ b/files/macros/M600-support.cfg @@ -158,9 +158,11 @@ gcode: {% if printer['gcode_macro M600'].fan0_speed > 0 %} {% set s_value = (printer['gcode_macro M600'].fan0_speed * 255 - printer['gcode_macro PRINTER_PARAM'].fan0_min) * 255 / (255 - printer['gcode_macro PRINTER_PARAM'].fan0_min)|float %} M106 P0 S{s_value} + SET_GCODE_VARIABLE MACRO=M600 VARIABLE=fan0_speed VALUE=0 {% endif %} SET_GCODE_VARIABLE MACRO=M600 VARIABLE=m600_state VALUE=0 SET_IDLE_TIMEOUT TIMEOUT=99999999 + RESPOND TYPE=command MSG="action:prompt_end" {% else %} {% if printer.extruder.can_extrude|lower == 'true' %} G91 @@ -171,6 +173,5 @@ gcode: RESPOND TYPE=command MSG="Extruder not hot enough!" {% endif %} {% endif %} - RESPOND TYPE=command MSG="action:prompt_end" - RESPOND TYPE=command MSG="Restarting print..." + RESPOND TYPE=command MSG="Resuming printing..." RESUME_BASE {get_params}