Merge branch 'develop' of https://server.creatbot.com/Gitea/CreatBot/CreatBotKlipper into develop
This commit is contained in:
commit
401da556f5
@ -619,7 +619,7 @@ variable_idle_timeout : 600
|
|||||||
variable_runout_sensor : ""
|
variable_runout_sensor : ""
|
||||||
variable_filament_sensor : "filament_switch_sensor extruder"
|
variable_filament_sensor : "filament_switch_sensor extruder"
|
||||||
variable_filament_sensor1 : "filament_switch_sensor extruder1"
|
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_pause_macro : "_USER_PAUSE"
|
||||||
variable_user_resume_macro: ""
|
variable_user_resume_macro: ""
|
||||||
variable_user_cancel_macro: "_USER_CANCEL"
|
variable_user_cancel_macro: "_USER_CANCEL"
|
||||||
@ -692,7 +692,7 @@ gcode:
|
|||||||
{% 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
|
# 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) }'
|
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 %}
|
{% set do_resume = True %}
|
||||||
{% elif can_extrude %}
|
{% elif can_extrude %}
|
||||||
{% set do_resume = True %}
|
{% set do_resume = True %}
|
||||||
|
@ -612,7 +612,7 @@ variable_idle_timeout : 600
|
|||||||
variable_runout_sensor : ""
|
variable_runout_sensor : ""
|
||||||
variable_filament_sensor : "filament_switch_sensor extruder"
|
variable_filament_sensor : "filament_switch_sensor extruder"
|
||||||
variable_filament_sensor1 : "filament_switch_sensor extruder1"
|
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_pause_macro : "_USER_PAUSE"
|
||||||
variable_user_resume_macro: ""
|
variable_user_resume_macro: ""
|
||||||
variable_user_cancel_macro: "_USER_CANCEL"
|
variable_user_cancel_macro: "_USER_CANCEL"
|
||||||
@ -685,7 +685,7 @@ gcode:
|
|||||||
{% 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
|
# 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) }'
|
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 %}
|
{% set do_resume = True %}
|
||||||
{% elif can_extrude %}
|
{% elif can_extrude %}
|
||||||
{% set do_resume = True %}
|
{% set do_resume = True %}
|
||||||
|
@ -754,7 +754,7 @@ variable_idle_timeout : 600
|
|||||||
variable_runout_sensor : ""
|
variable_runout_sensor : ""
|
||||||
variable_filament_sensor : "filament_switch_sensor extruder"
|
variable_filament_sensor : "filament_switch_sensor extruder"
|
||||||
variable_filament_sensor1 : "filament_switch_sensor extruder1"
|
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_pause_macro : "_USER_PAUSE"
|
||||||
variable_user_resume_macro: ""
|
variable_user_resume_macro: ""
|
||||||
variable_user_cancel_macro: "_USER_CANCEL"
|
variable_user_cancel_macro: "_USER_CANCEL"
|
||||||
@ -847,7 +847,7 @@ gcode:
|
|||||||
{% 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
|
# 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) }'
|
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 %}
|
{% set do_resume = True %}
|
||||||
{% elif can_extrude %}
|
{% elif can_extrude %}
|
||||||
{% set do_resume = True %}
|
{% set do_resume = True %}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user