CreatBot/CreatBotKlipper
CreatBot/CreatBotKlipper
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化耗材检测弹窗内容及格式

Browse Source
This commit is contained in:
魏瑞鹏 2024-12-26 11:41:34 +08:00
parent 9b487abec3
commit 765bc8dc22
5 changed files with 55 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
config/CreatBot_D1000/base.cfg
View File

@ -378,7 +378,7 @@ gcode:
{% else %} {% else %}
PAUSE PAUSE
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE='"T0"' SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE='"T0"'
RESPOND TYPE=error MSG='{"Noting! extruder filament has been run out."}' RESPOND TYPE=error MSG='{"Noting! Left extruder filament has been run out."}'
{% endif %} {% endif %}
[gcode_macro T1] [gcode_macro T1]
@ -405,7 +405,7 @@ gcode:
{% else %} {% else %}
PAUSE PAUSE
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE='"T1"' SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE='"T1"'
RESPOND TYPE=error MSG='{"Noting! extruder1 filament has been run out."}' RESPOND TYPE=error MSG='{"Noting! Right extruder filament has been run out."}'
{% endif %} {% endif %}
[gcode_macro PROBE_SERVO_OPEN] [gcode_macro PROBE_SERVO_OPEN]
@ -711,8 +711,8 @@ gcode:
{'index': 1, 'name': 'last_extruder1_temp'}] %} {'index': 1, 'name': 'last_extruder1_temp'}] %}
{% set temperature = "last_extruder_temp" if printer.toolhead.extruder == "extruder" else "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 %} {% set value = printer["gcode_macro RESUME"][temperature].temp %}
RESPOND TYPE=echo MSG='{"Restoring \"%s\" temperature to %3.1f\u00B0C, this may take some time" % {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
(printer.toolhead.extruder, value)}' RESPOND TYPE=echo MSG='{"Restoring %s extruder temperature to %3.1f\u00B0C, this may take some time" % (msg, value)}'
{% for info in extruder_info %} {% for info in extruder_info %}
{% set variable = printer["gcode_macro RESUME"][info.name] %} {% set variable = printer["gcode_macro RESUME"][info.name] %}
{% if variable.restore %} {% if variable.restore %}
@ -768,16 +768,10 @@ gcode:
{% set do_resume = True %} {% set do_resume = True %}
{% elif can_extrude %} {% elif can_extrude %}
{% set do_resume = True %} {% set do_resume = True %}
{% else %}
RESPOND TYPE=error MSG='{"Resume aborted !!! \"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder}'
{% set _d = prompt_txt.append("\"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder) %}
{% endif %} {% endif %}
#### Printer comming out of regular PAUSE state #### #### Printer comming out of regular PAUSE state ####
{% elif can_extrude %} {% elif can_extrude %}
{% set do_resume = True %} {% set do_resume = True %}
{% else %}
RESPOND TYPE=error MSG='{"Resume aborted !!! \"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder}'
{% set _d = prompt_txt.append("\"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder) %}
{% endif %} {% endif %}
_ACT_RESUME DO_RESUME={do_resume} _ACT_RESUME DO_RESUME={do_resume}
@ -801,15 +795,16 @@ gcode:
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE="None" SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE="None"
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=autoshift VALUE="False" SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=autoshift VALUE="False"
{% else %} {% else %}
{% set _d = prompt_txt.append("\"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder) %} {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
{% set _d = prompt_txt.append("%s extruder not hot enough, please heat up again and press resume" % msg) %}
{% endif %} {% endif %}
{% else %} {% else %}
RESPOND TYPE=error MSG='{"Resume aborted !!! \"%s\" detects no filament, please load filament and press RESUME" % printer.toolhead.extruder}' {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
{% set _d = prompt_txt.append("\"%s\" detects no filament, please load filament and press RESUME" % printer.toolhead.extruder) %} {% set _d = prompt_txt.append("%s extruder detects no filament, please load filament and press resume" % msg) %}
{% endif %} {% endif %}
##### Generate User Information box in case of abort ##### ##### Generate User Information box in case of abort #####
{% if not (filament_state and do_resume) %} {% if not (filament_state and do_resume) %}
RESPOND TYPE=command MSG="action:prompt_begin RESUME aborted !!!" RESPOND TYPE=command MSG="action:prompt_begin RESUME ABORTED !"
{% for element in prompt_txt %} {% for element in prompt_txt %}
RESPOND TYPE=command MSG='{"action:prompt_text %s" % element}' RESPOND TYPE=command MSG='{"action:prompt_text %s" % element}'
{% endfor %} {% endfor %}
@ -867,7 +862,8 @@ gcode:
RESPOND TYPE=error MSG='{"Noting! All extruders filament has been run out."}' RESPOND TYPE=error MSG='{"Noting! All extruders filament has been run out."}'
{% endif %} {% endif %}
{% else %} {% else %}
RESPOND TYPE=error MSG='{"Noting! \"%s\" filament has been run out." % printer.toolhead.extruder}' {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
RESPOND TYPE=error MSG='{"Noting! %s extruder filament has been run out." % msg}'
{% endif %} {% endif %}
{% endif %} {% endif %}

26
config/CreatBot_D1000_V0/base.cfg
View File

@ -314,7 +314,7 @@ gcode:
{% else %} {% else %}
PAUSE PAUSE
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE='"T0"' SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE='"T0"'
RESPOND TYPE=error MSG='{"Noting! extruder filament has been run out."}' RESPOND TYPE=error MSG='{"Noting! Left extruder filament has been run out."}'
{% endif %} {% endif %}
[gcode_macro T1] [gcode_macro T1]
@ -341,7 +341,7 @@ gcode:
{% else %} {% else %}
PAUSE PAUSE
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE='"T1"' SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE='"T1"'
RESPOND TYPE=error MSG='{"Noting! extruder1 filament has been run out."}' RESPOND TYPE=error MSG='{"Noting! Right extruder filament has been run out."}'
{% endif %} {% endif %}
[gcode_macro PROBE_SERVO_OPEN] [gcode_macro PROBE_SERVO_OPEN]
@ -647,8 +647,8 @@ gcode:
{'index': 1, 'name': 'last_extruder1_temp'}] %} {'index': 1, 'name': 'last_extruder1_temp'}] %}
{% set temperature = "last_extruder_temp" if printer.toolhead.extruder == "extruder" else "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 %} {% set value = printer["gcode_macro RESUME"][temperature].temp %}
RESPOND TYPE=echo MSG='{"Restoring \"%s\" temperature to %3.1f\u00B0C, this may take some time" % {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
(printer.toolhead.extruder, value)}' RESPOND TYPE=echo MSG='{"Restoring %s extruder temperature to %3.1f\u00B0C, this may take some time" % (msg, value)}'
{% for info in extruder_info %} {% for info in extruder_info %}
{% set variable = printer["gcode_macro RESUME"][info.name] %} {% set variable = printer["gcode_macro RESUME"][info.name] %}
{% if variable.restore %} {% if variable.restore %}
@ -704,16 +704,10 @@ gcode:
{% set do_resume = True %} {% set do_resume = True %}
{% elif can_extrude %} {% elif can_extrude %}
{% set do_resume = True %} {% set do_resume = True %}
{% else %}
RESPOND TYPE=error MSG='{"Resume aborted !!! \"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder}'
{% set _d = prompt_txt.append("\"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder) %}
{% endif %} {% endif %}
#### Printer comming out of regular PAUSE state #### #### Printer comming out of regular PAUSE state ####
{% elif can_extrude %} {% elif can_extrude %}
{% set do_resume = True %} {% set do_resume = True %}
{% else %}
RESPOND TYPE=error MSG='{"Resume aborted !!! \"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder}'
{% set _d = prompt_txt.append("\"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder) %}
{% endif %} {% endif %}
_ACT_RESUME DO_RESUME={do_resume} _ACT_RESUME DO_RESUME={do_resume}
@ -737,15 +731,16 @@ gcode:
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE="None" SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE="None"
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=autoshift VALUE="False" SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=autoshift VALUE="False"
{% else %} {% else %}
{% set _d = prompt_txt.append("\"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder) %} {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
{% set _d = prompt_txt.append("%s extruder not hot enough, please heat up again and press resume" % msg) %}
{% endif %} {% endif %}
{% else %} {% else %}
RESPOND TYPE=error MSG='{"Resume aborted !!! \"%s\" detects no filament, please load filament and press RESUME" % printer.toolhead.extruder}' {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
{% set _d = prompt_txt.append("\"%s\" detects no filament, please load filament and press RESUME" % printer.toolhead.extruder) %} {% set _d = prompt_txt.append("%s extruder detects no filament, please load filament and press resume" % msg) %}
{% endif %} {% endif %}
##### Generate User Information box in case of abort ##### ##### Generate User Information box in case of abort #####
{% if not (filament_state and do_resume) %} {% if not (filament_state and do_resume) %}
RESPOND TYPE=command MSG="action:prompt_begin RESUME aborted !!!" RESPOND TYPE=command MSG="action:prompt_begin RESUME ABORTED !"
{% for element in prompt_txt %} {% for element in prompt_txt %}
RESPOND TYPE=command MSG='{"action:prompt_text %s" % element}' RESPOND TYPE=command MSG='{"action:prompt_text %s" % element}'
{% endfor %} {% endfor %}
@ -803,7 +798,8 @@ gcode:
RESPOND TYPE=error MSG='{"Noting! All extruders filament has been run out."}' RESPOND TYPE=error MSG='{"Noting! All extruders filament has been run out."}'
{% endif %} {% endif %}
{% else %} {% else %}
RESPOND TYPE=error MSG='{"Noting! \"%s\" filament has been run out." % printer.toolhead.extruder}' {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
RESPOND TYPE=error MSG='{"Noting! %s extruder filament has been run out." % msg}'
{% endif %} {% endif %}
{% endif %} {% endif %}

26
config/CreatBot_D600Pro2/base.cfg
View File

@ -378,7 +378,7 @@ gcode:
{% else %} {% else %}
PAUSE PAUSE
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE='"T0"' SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE='"T0"'
RESPOND TYPE=error MSG='{"Noting! extruder filament has been run out."}' RESPOND TYPE=error MSG='{"Noting! Left extruder filament has been run out."}'
{% endif %} {% endif %}
[gcode_macro T1] [gcode_macro T1]
@ -405,7 +405,7 @@ gcode:
{% else %} {% else %}
PAUSE PAUSE
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE='"T1"' SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE='"T1"'
RESPOND TYPE=error MSG='{"Noting! extruder1 filament has been run out."}' RESPOND TYPE=error MSG='{"Noting! Right extruder filament has been run out."}'
{% endif %} {% endif %}
[gcode_macro PROBE_SERVO_OPEN] [gcode_macro PROBE_SERVO_OPEN]
@ -704,8 +704,8 @@ gcode:
{'index': 1, 'name': 'last_extruder1_temp'}] %} {'index': 1, 'name': 'last_extruder1_temp'}] %}
{% set temperature = "last_extruder_temp" if printer.toolhead.extruder == "extruder" else "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 %} {% set value = printer["gcode_macro RESUME"][temperature].temp %}
RESPOND TYPE=echo MSG='{"Restoring \"%s\" temperature to %3.1f\u00B0C, this may take some time" % {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
(printer.toolhead.extruder, value)}' RESPOND TYPE=echo MSG='{"Restoring %s extruder temperature to %3.1f\u00B0C, this may take some time" % (msg, value)}'
{% for info in extruder_info %} {% for info in extruder_info %}
{% set variable = printer["gcode_macro RESUME"][info.name] %} {% set variable = printer["gcode_macro RESUME"][info.name] %}
{% if variable.restore %} {% if variable.restore %}
@ -763,16 +763,10 @@ gcode:
{% set do_resume = True %} {% set do_resume = True %}
{% elif can_extrude %} {% elif can_extrude %}
{% set do_resume = True %} {% set do_resume = True %}
{% else %}
RESPOND TYPE=error MSG='{"Resume aborted !!! \"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder}'
{% set _d = prompt_txt.append("\"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder) %}
{% endif %} {% endif %}
#### Printer comming out of regular PAUSE state #### #### Printer comming out of regular PAUSE state ####
{% elif can_extrude %} {% elif can_extrude %}
{% set do_resume = True %} {% set do_resume = True %}
{% else %}
RESPOND TYPE=error MSG='{"Resume aborted !!! \"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder}'
{% set _d = prompt_txt.append("\"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder) %}
{% endif %} {% endif %}
_ACT_RESUME DO_RESUME={do_resume} _ACT_RESUME DO_RESUME={do_resume}
@ -796,15 +790,16 @@ gcode:
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE="None" SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE="None"
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=autoshift VALUE="False" SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=autoshift VALUE="False"
{% else %} {% else %}
{% set _d = prompt_txt.append("\"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder) %} {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
{% set _d = prompt_txt.append("%s extruder not hot enough, please heat up again and press resume" % msg) %}
{% endif %} {% endif %}
{% else %} {% else %}
RESPOND TYPE=error MSG='{"Resume aborted !!! \"%s\" detects no filament, please load filament and press RESUME" % printer.toolhead.extruder}' {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
{% set _d = prompt_txt.append("\"%s\" detects no filament, please load filament and press RESUME" % printer.toolhead.extruder) %} {% set _d = prompt_txt.append("%s extruder detects no filament, please load filament and press resume" % msg) %}
{% endif %} {% endif %}
##### Generate User Information box in case of abort ##### ##### Generate User Information box in case of abort #####
{% if not (filament_state and do_resume) %} {% if not (filament_state and do_resume) %}
RESPOND TYPE=command MSG="action:prompt_begin RESUME aborted !!!" RESPOND TYPE=command MSG="action:prompt_begin RESUME ABORTED !"
{% for element in prompt_txt %} {% for element in prompt_txt %}
RESPOND TYPE=command MSG='{"action:prompt_text %s" % element}' RESPOND TYPE=command MSG='{"action:prompt_text %s" % element}'
{% endfor %} {% endfor %}
@ -862,7 +857,8 @@ gcode:
RESPOND TYPE=error MSG='{"Noting! All extruders filament has been run out."}' RESPOND TYPE=error MSG='{"Noting! All extruders filament has been run out."}'
{% endif %} {% endif %}
{% else %} {% else %}
RESPOND TYPE=error MSG='{"Noting! \"%s\" filament has been run out." % printer.toolhead.extruder}' {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
RESPOND TYPE=error MSG='{"Noting! %s extruder filament has been run out." % msg}'
{% endif %} {% endif %}
{% endif %} {% endif %}

26
config/CreatBot_D600Pro2_V0/base.cfg
View File

@ -314,7 +314,7 @@ gcode:
{% else %} {% else %}
PAUSE PAUSE
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE='"T0"' SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE='"T0"'
RESPOND TYPE=error MSG='{"Noting! extruder filament has been run out."}' RESPOND TYPE=error MSG='{"Noting! Left extruder filament has been run out."}'
{% endif %} {% endif %}
[gcode_macro T1] [gcode_macro T1]
@ -341,7 +341,7 @@ gcode:
{% else %} {% else %}
PAUSE PAUSE
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE='"T1"' SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE='"T1"'
RESPOND TYPE=error MSG='{"Noting! extruder1 filament has been run out."}' RESPOND TYPE=error MSG='{"Noting! Right extruder filament has been run out."}'
{% endif %} {% endif %}
[gcode_macro PROBE_SERVO_OPEN] [gcode_macro PROBE_SERVO_OPEN]
@ -640,8 +640,8 @@ gcode:
{'index': 1, 'name': 'last_extruder1_temp'}] %} {'index': 1, 'name': 'last_extruder1_temp'}] %}
{% set temperature = "last_extruder_temp" if printer.toolhead.extruder == "extruder" else "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 %} {% set value = printer["gcode_macro RESUME"][temperature].temp %}
RESPOND TYPE=echo MSG='{"Restoring \"%s\" temperature to %3.1f\u00B0C, this may take some time" % {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
(printer.toolhead.extruder, value)}' RESPOND TYPE=echo MSG='{"Restoring %s extruder temperature to %3.1f\u00B0C, this may take some time" % (msg, value)}'
{% for info in extruder_info %} {% for info in extruder_info %}
{% set variable = printer["gcode_macro RESUME"][info.name] %} {% set variable = printer["gcode_macro RESUME"][info.name] %}
{% if variable.restore %} {% if variable.restore %}
@ -699,16 +699,10 @@ gcode:
{% set do_resume = True %} {% set do_resume = True %}
{% elif can_extrude %} {% elif can_extrude %}
{% set do_resume = True %} {% set do_resume = True %}
{% else %}
RESPOND TYPE=error MSG='{"Resume aborted !!! \"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder}'
{% set _d = prompt_txt.append("\"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder) %}
{% endif %} {% endif %}
#### Printer comming out of regular PAUSE state #### #### Printer comming out of regular PAUSE state ####
{% elif can_extrude %} {% elif can_extrude %}
{% set do_resume = True %} {% set do_resume = True %}
{% else %}
RESPOND TYPE=error MSG='{"Resume aborted !!! \"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder}'
{% set _d = prompt_txt.append("\"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder) %}
{% endif %} {% endif %}
_ACT_RESUME DO_RESUME={do_resume} _ACT_RESUME DO_RESUME={do_resume}
@ -732,15 +726,16 @@ gcode:
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE="None" SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE="None"
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=autoshift VALUE="False" SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=autoshift VALUE="False"
{% else %} {% else %}
{% set _d = prompt_txt.append("\"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder) %} {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
{% set _d = prompt_txt.append("%s extruder not hot enough, please heat up again and press resume" % msg) %}
{% endif %} {% endif %}
{% else %} {% else %}
RESPOND TYPE=error MSG='{"Resume aborted !!! \"%s\" detects no filament, please load filament and press RESUME" % printer.toolhead.extruder}' {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
{% set _d = prompt_txt.append("\"%s\" detects no filament, please load filament and press RESUME" % printer.toolhead.extruder) %} {% set _d = prompt_txt.append("%s extruder detects no filament, please load filament and press resume" % msg) %}
{% endif %} {% endif %}
##### Generate User Information box in case of abort ##### ##### Generate User Information box in case of abort #####
{% if not (filament_state and do_resume) %} {% if not (filament_state and do_resume) %}
RESPOND TYPE=command MSG="action:prompt_begin RESUME aborted !!!" RESPOND TYPE=command MSG="action:prompt_begin RESUME ABORTED !"
{% for element in prompt_txt %} {% for element in prompt_txt %}
RESPOND TYPE=command MSG='{"action:prompt_text %s" % element}' RESPOND TYPE=command MSG='{"action:prompt_text %s" % element}'
{% endfor %} {% endfor %}
@ -798,7 +793,8 @@ gcode:
RESPOND TYPE=error MSG='{"Noting! All extruders filament has been run out."}' RESPOND TYPE=error MSG='{"Noting! All extruders filament has been run out."}'
{% endif %} {% endif %}
{% else %} {% else %}
RESPOND TYPE=error MSG='{"Noting! \"%s\" filament has been run out." % printer.toolhead.extruder}' {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
RESPOND TYPE=error MSG='{"Noting! %s extruder filament has been run out." % msg}'
{% endif %} {% endif %}
{% endif %} {% endif %}

26
config/CreatBot_F430NX/base.cfg
View File

@ -456,7 +456,7 @@ gcode:
{% else %} {% else %}
PAUSE PAUSE
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE='"T0"' SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE='"T0"'
RESPOND TYPE=error MSG='{"Noting! extruder filament has been run out."}' RESPOND TYPE=error MSG='{"Noting! Left extruder filament has been run out."}'
{% endif %} {% endif %}
[gcode_macro _PARK_extruder1] [gcode_macro _PARK_extruder1]
@ -499,7 +499,7 @@ gcode:
{% else %} {% else %}
PAUSE PAUSE
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE='"T1"' SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE='"T1"'
RESPOND TYPE=error MSG='{"Noting! extruder1 filament has been run out."}' RESPOND TYPE=error MSG='{"Noting! Right extruder filament has been run out."}'
{% endif %} {% endif %}
[gcode_macro ACTIVATE_COPY_MODE] [gcode_macro ACTIVATE_COPY_MODE]
@ -824,8 +824,8 @@ gcode:
{'index': 1, 'name': 'last_extruder1_temp'}] %} {'index': 1, 'name': 'last_extruder1_temp'}] %}
{% set temperature = "last_extruder_temp" if printer.toolhead.extruder == "extruder" else "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 %} {% set value = printer["gcode_macro RESUME"][temperature].temp %}
RESPOND TYPE=echo MSG='{"Restoring \"%s\" temperature to %3.1f\u00B0C, this may take some time" % {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
(printer.toolhead.extruder, value)}' RESPOND TYPE=echo MSG='{"Restoring %s extruder temperature to %3.1f\u00B0C, this may take some time" % (msg, value)}'
{% for info in extruder_info %} {% for info in extruder_info %}
{% set variable = printer["gcode_macro RESUME"][info.name] %} {% set variable = printer["gcode_macro RESUME"][info.name] %}
{% if variable.restore %} {% if variable.restore %}
@ -930,16 +930,10 @@ gcode:
{% set do_resume = True %} {% set do_resume = True %}
{% elif can_extrude %} {% elif can_extrude %}
{% set do_resume = True %} {% set do_resume = True %}
{% else %}
RESPOND TYPE=error MSG='{"Resume aborted !!! \"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder}'
{% set _d = prompt_txt.append("\"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder) %}
{% endif %} {% endif %}
#### Printer comming out of regular PAUSE state #### #### Printer comming out of regular PAUSE state ####
{% elif can_extrude %} {% elif can_extrude %}
{% set do_resume = True %} {% set do_resume = True %}
{% else %}
RESPOND TYPE=error MSG='{"Resume aborted !!! \"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder}'
{% set _d = prompt_txt.append("\"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder) %}
{% endif %} {% endif %}
_ACT_RESUME DO_RESUME={do_resume} _ACT_RESUME DO_RESUME={do_resume}
@ -963,15 +957,16 @@ gcode:
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE="None" SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=change_runout VALUE="None"
SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=autoshift VALUE="False" SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=autoshift VALUE="False"
{% else %} {% else %}
{% set _d = prompt_txt.append("\"%s\" not hot enough, please heat up again and press RESUME" % printer.toolhead.extruder) %} {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
{% set _d = prompt_txt.append("%s extruder not hot enough, please heat up again and press resume" % msg) %}
{% endif %} {% endif %}
{% else %} {% else %}
RESPOND TYPE=error MSG='{"Resume aborted !!! \"%s\" detects no filament, please load filament and press RESUME" % printer.toolhead.extruder}' {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
{% set _d = prompt_txt.append("\"%s\" detects no filament, please load filament and press RESUME" % printer.toolhead.extruder) %} {% set _d = prompt_txt.append("%s extruder detects no filament, please load filament and press resume" % msg) %}
{% endif %} {% endif %}
##### Generate User Information box in case of abort ##### ##### Generate User Information box in case of abort #####
{% if not (filament_state and do_resume) %} {% if not (filament_state and do_resume) %}
RESPOND TYPE=command MSG="action:prompt_begin RESUME aborted !!!" RESPOND TYPE=command MSG="action:prompt_begin RESUME ABORTED !"
{% for element in prompt_txt %} {% for element in prompt_txt %}
RESPOND TYPE=command MSG='{"action:prompt_text %s" % element}' RESPOND TYPE=command MSG='{"action:prompt_text %s" % element}'
{% endfor %} {% endfor %}
@ -1036,7 +1031,8 @@ gcode:
RESPOND TYPE=error MSG='{"Noting! All extruders filament has been run out."}' RESPOND TYPE=error MSG='{"Noting! All extruders filament has been run out."}'
{% endif %} {% endif %}
{% else %} {% else %}
RESPOND TYPE=error MSG='{"Noting! \"%s\" filament has been run out." % printer.toolhead.extruder}' {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
RESPOND TYPE=error MSG='{"Noting! %s extruder filament has been run out." % msg}'
{% endif %} {% endif %}
{% endif %} {% endif %}