From 95d20c9b6357a444871ea9dce5f5ad35d74c1990 Mon Sep 17 00:00:00 2001
From: ruipeng <1041589370@qq.com>
Date: Tue, 7 Jan 2025 16:33:54 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8DF430NX=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91=E8=80=97=E6=9D=90=E6=A3=80=E6=B5=8B=EF=BC=8C=E5=96=B7?=
 =?UTF-8?q?=E5=A4=B4=E8=B6=85=E6=97=B6=E5=86=B7=E5=8D=B4=EF=BC=8C=E6=89=8B?=
 =?UTF-8?q?=E5=8A=A8=E8=AE=BE=E7=BD=AE=E6=B8=A9=E5=BA=A6=E5=B9=B6=E8=A3=85?=
 =?UTF-8?q?=E8=BD=BD=E8=80=97=E6=9D=90=E5=90=8E=EF=BC=8C=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=B6=E4=BA=8C=E5=A4=B4=E6=B8=A9=E5=BA=A6?=
 =?UTF-8?q?=E4=B8=8D=E6=81=A2=E5=A4=8D=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
 =?UTF-8?q?=202=E3=80=81=E4=BF=AE=E6=94=B9=E7=AD=89=E5=BE=85=E6=B8=A9?=
 =?UTF-8?q?=E5=BA=A6=E6=81=A2=E5=A4=8D=E7=9A=84=E6=8F=90=E7=A4=BA=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/CreatBot_F430NX/base.cfg | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/config/CreatBot_F430NX/base.cfg b/config/CreatBot_F430NX/base.cfg
index 489591f64..2aa5a66d9 100644
--- a/config/CreatBot_F430NX/base.cfg
+++ b/config/CreatBot_F430NX/base.cfg
@@ -849,10 +849,6 @@ gcode:
         {'index': 1, 'name': 'last_extruder1_temp'}] %}
     {% set temperature = "last_extruder_temp" if printer.toolhead.extruder == "extruder" else "last_extruder1_temp" %}
     {% set value = printer["gcode_macro RESUME"][temperature].temp %}
-    {% if printer[printer.toolhead.extruder].temperature < value-3 %}
-        {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
-        RESPOND TYPE=echo MSG='{"Restoring %s extruder temperature, this may take some time." % msg}'
-    {% endif %}
     {% for info in extruder_info %}
         {% set variable = printer["gcode_macro RESUME"][info.name] %}
         {% if variable.restore %}
@@ -865,8 +861,9 @@ gcode:
             {% set tool = "extruder" if info.index == 0 else "extruder1" %}
             {% set needwait = True if printer[tool].temperature < variable.temp else False %}
             {% if needwait %}
+                RESPOND TYPE=echo MSG='{"Restoring activated extruder temperature, this may take some time."}'
                 M109 T{info.index} S{variable.temp}
-                {% endif %}
+            {% endif %}
         {% endif %}
     {% endfor %}
 
@@ -962,7 +959,6 @@ gcode:
     {% set autoshift = printer.save_variables.variables.auto_change_nozzle|default(False) %}
     {% set client = printer['gcode_macro _CLIENT_VARIABLE']|default({}) %}
     {% set do_resume = False %}
-    {% set prompt_txt = [] %}
     {% set runout = True %}
     ##### end of definitions #####
     _FILAMENT_UPDATE
@@ -979,16 +975,12 @@ gcode:
     {% set can_extrude = True if printer.toolhead.extruder == ''           # no extruder defined in config
                     else printer[printer.toolhead.extruder].can_extrude %} # status of active extruder
     #### Printer comming from timeout idle state ####
-    {% if printer.idle_timeout.state|upper == "IDLE" or idle_state or autoshift %}
+    {% if printer.idle_timeout.state|upper == "IDLE" or idle_state %}
         SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=idle_state VALUE=False
-        {% 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
-            {client.user_temp_macro|default("")}
-            {% set do_resume = True %}
-        {% elif can_extrude %}
-            {% set do_resume = True %}
-        {% endif %}
-    #### Printer comming out of regular PAUSE state ####
+    {% endif %}
+    {% if last_extruder_temp.restore or last_extruder1_temp.restore %}
+        {client.user_temp_macro|default("")}
+        {% set do_resume = True %}
     {% elif can_extrude %}
         {% set do_resume = True %}
     {% endif %}