修复D600Pro2和D1000机型,IDLE状态有其他操作后,再恢复打印温度不恢复问题

This commit is contained in:
魏瑞鹏 2025-03-06 10:40:29 +08:00
parent a5955157db
commit 724fa910c5
4 changed files with 20 additions and 36 deletions

View File

@ -796,18 +796,14 @@ gcode:
else printer[printer.toolhead.extruder].can_extrude %} # status of active extruder else printer[printer.toolhead.extruder].can_extrude %} # status of active extruder
#### Printer comming from timeout idle state #### #### 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 or autoshift %}
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=idle_state VALUE=False SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=idle_state VALUE=Fals
{% endif %}
{% if last_extruder_temp.restore or last_extruder1_temp.restore %} {% 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("")} {client.user_temp_macro|default("")}
{% set do_resume = True %} {% set do_resume = True %}
{% elif can_extrude %} {% elif can_extrude %}
{% set do_resume = True %} {% set do_resume = True %}
{% endif %} {% endif %}
#### Printer comming out of regular PAUSE state ####
{% elif can_extrude %}
{% set do_resume = True %}
{% endif %}
_ACT_RESUME DO_RESUME={do_resume} _ACT_RESUME DO_RESUME={do_resume}
[gcode_macro _ACT_RESUME] [gcode_macro _ACT_RESUME]

View File

@ -730,18 +730,14 @@ gcode:
else printer[printer.toolhead.extruder].can_extrude %} # status of active extruder else printer[printer.toolhead.extruder].can_extrude %} # status of active extruder
#### Printer comming from timeout idle state #### #### 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 or autoshift %}
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=idle_state VALUE=False SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=idle_state VALUE=Fals
{% endif %}
{% if last_extruder_temp.restore or last_extruder1_temp.restore %} {% 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("")} {client.user_temp_macro|default("")}
{% set do_resume = True %} {% set do_resume = True %}
{% elif can_extrude %} {% elif can_extrude %}
{% set do_resume = True %} {% set do_resume = True %}
{% endif %} {% endif %}
#### Printer comming out of regular PAUSE state ####
{% elif can_extrude %}
{% set do_resume = True %}
{% endif %}
_ACT_RESUME DO_RESUME={do_resume} _ACT_RESUME DO_RESUME={do_resume}
[gcode_macro _ACT_RESUME] [gcode_macro _ACT_RESUME]

View File

@ -788,18 +788,14 @@ gcode:
#### Printer comming from timeout idle state #### #### 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 or autoshift %}
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=idle_state VALUE=False SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=idle_state VALUE=Fals
{% endif %}
{% if last_extruder_temp.restore or last_extruder1_temp.restore %} {% 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("")} {client.user_temp_macro|default("")}
{% set do_resume = True %} {% set do_resume = True %}
{% elif can_extrude %} {% elif can_extrude %}
{% set do_resume = True %} {% set do_resume = True %}
{% endif %} {% endif %}
#### Printer comming out of regular PAUSE state ####
{% elif can_extrude %}
{% set do_resume = True %}
{% endif %}
_ACT_RESUME DO_RESUME={do_resume} _ACT_RESUME DO_RESUME={do_resume}
[gcode_macro _ACT_RESUME] [gcode_macro _ACT_RESUME]

View File

@ -725,18 +725,14 @@ gcode:
#### Printer comming from timeout idle state #### #### 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 or autoshift %}
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=idle_state VALUE=False SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=idle_state VALUE=Fals
{% endif %}
{% if last_extruder_temp.restore or last_extruder1_temp.restore %} {% 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("")} {client.user_temp_macro|default("")}
{% set do_resume = True %} {% set do_resume = True %}
{% elif can_extrude %} {% elif can_extrude %}
{% set do_resume = True %} {% set do_resume = True %}
{% endif %} {% endif %}
#### Printer comming out of regular PAUSE state ####
{% elif can_extrude %}
{% set do_resume = True %}
{% endif %}
_ACT_RESUME DO_RESUME={do_resume} _ACT_RESUME DO_RESUME={do_resume}
[gcode_macro _ACT_RESUME] [gcode_macro _ACT_RESUME]