From a7475bb36b9f41e12e7bb707ebcbb9ed62a29be1 Mon Sep 17 00:00:00 2001 From: zkk <1007518571@qq.com> Date: Wed, 4 Dec 2024 15:27:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9A=82=E5=81=9C=E5=86=B7?= =?UTF-8?q?=E5=8D=B4=E5=90=8E=E7=BB=A7=E7=BB=AD=E6=B8=A9=E5=BA=A6=E4=B8=8D?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=83=AD=E7=94=B5=E5=81=B6=E6=9C=80=E5=A4=A7=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E6=AC=A1=E6=95=B0=EF=BC=8CD1000=20Z=E8=BD=B4=E6=9C=80?= =?UTF-8?q?=E5=A4=A7=E9=80=9F=E5=BA=A6=E4=BF=AE=E6=94=B9=E4=B8=BA7mm/s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 52ea64cf83535c84c378239b43a7f0a6a362a517 Author: ruipeng <1041589370@qq.com> Date: Thu Nov 28 10:55:09 2024 +0800 修复暂停掉温后，恢复时喷头温度不能恢复的问题 --- config/CreatBot_D1000/base.cfg | 4 ++-- config/CreatBot_D600Pro2/base.cfg | 4 ++-- config/CreatBot_F430NX/base.cfg | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/CreatBot_D1000/base.cfg b/config/CreatBot_D1000/base.cfg index 36818fc88..20b9215b0 100644 --- a/config/CreatBot_D1000/base.cfg +++ b/config/CreatBot_D1000/base.cfg @@ -619,7 +619,7 @@ variable_idle_timeout : 600 variable_runout_sensor : "" variable_filament_sensor : "filament_switch_sensor extruder" variable_filament_sensor1 : "filament_switch_sensor extruder1" -variable_user_temp_resume : "_USER_TEMP_RESUME" +variable_user_temp_macro : "_USER_TEMP_RESUME" variable_user_pause_macro : "_USER_PAUSE" variable_user_resume_macro: "" variable_user_cancel_macro: "_USER_CANCEL" @@ -692,7 +692,7 @@ gcode: {% if last_extruder_temp.restore or last_extruder1_temp.restore %} # we need to use the unicode (\u00B0) for the ° as py2 env's would throw an error otherwise RESPOND TYPE=echo MSG='{"Restoring \"%s\" temperature to %3.1f\u00B0C, this may take some time" % (printer.toolhead.extruder, last_extruder_temp.temp) }' - {client.user_temputer_macro|default("")} + {client.user_temp_macro|default("")} {% set do_resume = True %} {% elif can_extrude %} {% set do_resume = True %} diff --git a/config/CreatBot_D600Pro2/base.cfg b/config/CreatBot_D600Pro2/base.cfg index 7b51d60d7..dcc307df5 100644 --- a/config/CreatBot_D600Pro2/base.cfg +++ b/config/CreatBot_D600Pro2/base.cfg @@ -612,7 +612,7 @@ variable_idle_timeout : 600 variable_runout_sensor : "" variable_filament_sensor : "filament_switch_sensor extruder" variable_filament_sensor1 : "filament_switch_sensor extruder1" -variable_user_temp_resume : "_USER_TEMP_RESUME" +variable_user_temp_macro : "_USER_TEMP_RESUME" variable_user_pause_macro : "_USER_PAUSE" variable_user_resume_macro: "" variable_user_cancel_macro: "_USER_CANCEL" @@ -685,7 +685,7 @@ gcode: {% if last_extruder_temp.restore or last_extruder1_temp.restore %} # we need to use the unicode (\u00B0) for the ° as py2 env's would throw an error otherwise RESPOND TYPE=echo MSG='{"Restoring \"%s\" temperature to %3.1f\u00B0C, this may take some time" % (printer.toolhead.extruder, last_extruder_temp.temp) }' - {client.user_temputer_macro|default("")} + {client.user_temp_macro|default("")} {% set do_resume = True %} {% elif can_extrude %} {% set do_resume = True %} diff --git a/config/CreatBot_F430NX/base.cfg b/config/CreatBot_F430NX/base.cfg index 5d52940ce..545ce4dd2 100644 --- a/config/CreatBot_F430NX/base.cfg +++ b/config/CreatBot_F430NX/base.cfg @@ -754,7 +754,7 @@ variable_idle_timeout : 600 variable_runout_sensor : "" variable_filament_sensor : "filament_switch_sensor extruder" variable_filament_sensor1 : "filament_switch_sensor extruder1" -variable_user_temp_resume : "_USER_TEMP_RESUME" +variable_user_temp_macro : "_USER_TEMP_RESUME" variable_user_pause_macro : "_USER_PAUSE" variable_user_resume_macro: "" variable_user_cancel_macro: "_USER_CANCEL" @@ -847,7 +847,7 @@ gcode: {% if last_extruder_temp.restore or last_extruder1_temp.restore %} # we need to use the unicode (\u00B0) for the ¡ã as py2 env's would throw an error otherwise RESPOND TYPE=echo MSG='{"Restoring \"%s\" temperature to %3.1f\u00B0C, this may take some time" % (printer.toolhead.extruder, last_extruder_temp.temp) }' - {client.user_temputer_macro|default("")} + {client.user_temp_macro|default("")} {% set do_resume = True %} {% elif can_extrude %} {% set do_resume = True %}