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

修复全系耗材检测关闭后仍然生效的问题

Browse Source
This commit is contained in:
魏瑞鹏 2025-04-24 16:24:36 +08:00
parent 42139a47db
commit 621f2040de
5 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/CreatBot_D1000/base.cfg
View File

@ -369,7 +369,10 @@ gcode:
[gcode_macro T0] [gcode_macro T0]
gcode: gcode:
{% set filament_insert = printer["filament_switch_sensor extruder"].filament_detected|default(False) %} {% set client = printer['gcode_macro _CLIENT_VARIABLE']|default({}) %}
{% set filament_insert = True if client.filament_sensor|default("") == ""
else True if not printer[client.filament_sensor].enabled
else printer[client.filament_sensor].filament_detected|default(False) %}
{% set printing = printer.print_stats.state == "printing" %} {% set printing = printer.print_stats.state == "printing" %}
{% if filament_insert or printing == False %} {% if filament_insert or printing == False %}
SET_SERVO SERVO=switch_nozzle angle=135 SET_SERVO SERVO=switch_nozzle angle=135
@ -396,7 +399,10 @@ gcode:
{% set y_offset = sv.nozzle_y_offset_val|default(0)|float %} {% set y_offset = sv.nozzle_y_offset_val|default(0)|float %}
{% set z_offset = sv.nozzle_z_offset_val|default(0)|float %} {% set z_offset = sv.nozzle_z_offset_val|default(0)|float %}
{% set x_offset = x_offset - 59 %} {% set x_offset = x_offset - 59 %}
{% set filament_insert = printer["filament_switch_sensor extruder1"].filament_detected|default(False) %} {% set client = printer['gcode_macro _CLIENT_VARIABLE']|default({}) %}
{% set filament_insert = True if client.filament_sensor1|default("") == ""
else True if not printer[client.filament_sensor1].enabled
else printer[client.filament_sensor1].filament_detected|default(False) %}
{% set printing = (printer.print_stats.state == "printing") %} {% set printing = (printer.print_stats.state == "printing") %}
{% if filament_insert or printing == False %} {% if filament_insert or printing == False %}
SET_SERVO SERVO=switch_nozzle angle=135 SET_SERVO SERVO=switch_nozzle angle=135

10
config/CreatBot_D1000_V0/base.cfg
View File

@ -301,7 +301,10 @@ gcode:
[gcode_macro T0] [gcode_macro T0]
gcode: gcode:
{% set filament_insert = printer["filament_switch_sensor extruder"].filament_detected|default(False) %} {% set client = printer['gcode_macro _CLIENT_VARIABLE']|default({}) %}
{% set filament_insert = True if client.filament_sensor|default("") == ""
else True if not printer[client.filament_sensor].enabled
else printer[client.filament_sensor].filament_detected|default(False) %}
{% set printing = printer.print_stats.state == "printing" %} {% set printing = printer.print_stats.state == "printing" %}
{% if filament_insert or printing == False %} {% if filament_insert or printing == False %}
SET_SERVO SERVO=switch_nozzle angle=135 SET_SERVO SERVO=switch_nozzle angle=135
@ -328,7 +331,10 @@ gcode:
{% set y_offset = sv.nozzle_y_offset_val|default(0)|float %} {% set y_offset = sv.nozzle_y_offset_val|default(0)|float %}
{% set z_offset = sv.nozzle_z_offset_val|default(0)|float %} {% set z_offset = sv.nozzle_z_offset_val|default(0)|float %}
{% set x_offset = x_offset - 59 %} {% set x_offset = x_offset - 59 %}
{% set filament_insert = printer["filament_switch_sensor extruder1"].filament_detected|default(False) %} {% set client = printer['gcode_macro _CLIENT_VARIABLE']|default({}) %}
{% set filament_insert = True if client.filament_sensor1|default("") == ""
else True if not printer[client.filament_sensor1].enabled
else printer[client.filament_sensor1].filament_detected|default(False) %}
{% set printing = (printer.print_stats.state == "printing") %} {% set printing = (printer.print_stats.state == "printing") %}
{% if filament_insert or printing == False %} {% if filament_insert or printing == False %}
SET_SERVO SERVO=switch_nozzle angle=135 SET_SERVO SERVO=switch_nozzle angle=135

10
config/CreatBot_D600Pro2/base.cfg
View File

@ -369,7 +369,10 @@ gcode:
[gcode_macro T0] [gcode_macro T0]
gcode: gcode:
{% set filament_insert = printer["filament_switch_sensor extruder"].filament_detected|default(False) %} {% set client = printer['gcode_macro _CLIENT_VARIABLE']|default({}) %}
{% set filament_insert = True if client.filament_sensor|default("") == ""
else True if not printer[client.filament_sensor].enabled
else printer[client.filament_sensor].filament_detected|default(False) %}
{% set printing = printer.print_stats.state == "printing" %} {% set printing = printer.print_stats.state == "printing" %}
{% if filament_insert or printing == False %} {% if filament_insert or printing == False %}
SET_SERVO SERVO=switch_nozzle angle=135 SET_SERVO SERVO=switch_nozzle angle=135
@ -396,7 +399,10 @@ gcode:
{% set y_offset = sv.nozzle_y_offset_val|default(0)|float %} {% set y_offset = sv.nozzle_y_offset_val|default(0)|float %}
{% set z_offset = sv.nozzle_z_offset_val|default(0)|float %} {% set z_offset = sv.nozzle_z_offset_val|default(0)|float %}
{% set x_offset = x_offset - 59 %} {% set x_offset = x_offset - 59 %}
{% set filament_insert = printer["filament_switch_sensor extruder1"].filament_detected|default(False) %} {% set client = printer['gcode_macro _CLIENT_VARIABLE']|default({}) %}
{% set filament_insert = True if client.filament_sensor1|default("") == ""
else True if not printer[client.filament_sensor1].enabled
else printer[client.filament_sensor1].filament_detected|default(False) %}
{% set printing = (printer.print_stats.state == "printing") %} {% set printing = (printer.print_stats.state == "printing") %}
{% if filament_insert or printing == False %} {% if filament_insert or printing == False %}
SET_SERVO SERVO=switch_nozzle angle=135 SET_SERVO SERVO=switch_nozzle angle=135

10
config/CreatBot_D600Pro2_V0/base.cfg
View File

@ -302,7 +302,10 @@ gcode:
[gcode_macro T0] [gcode_macro T0]
gcode: gcode:
{% set filament_insert = printer["filament_switch_sensor extruder"].filament_detected|default(False) %} {% set client = printer['gcode_macro _CLIENT_VARIABLE']|default({}) %}
{% set filament_insert = True if client.filament_sensor|default("") == ""
else True if not printer[client.filament_sensor].enabled
else printer[client.filament_sensor].filament_detected|default(False) %}
{% set printing = printer.print_stats.state == "printing" %} {% set printing = printer.print_stats.state == "printing" %}
{% if filament_insert or printing == False %} {% if filament_insert or printing == False %}
SET_SERVO SERVO=switch_nozzle angle=135 SET_SERVO SERVO=switch_nozzle angle=135
@ -329,7 +332,10 @@ gcode:
{% set y_offset = sv.nozzle_y_offset_val|default(0)|float %} {% set y_offset = sv.nozzle_y_offset_val|default(0)|float %}
{% set z_offset = sv.nozzle_z_offset_val|default(0)|float %} {% set z_offset = sv.nozzle_z_offset_val|default(0)|float %}
{% set x_offset = x_offset - 59 %} {% set x_offset = x_offset - 59 %}
{% set filament_insert = printer["filament_switch_sensor extruder1"].filament_detected|default(False) %} {% set client = printer['gcode_macro _CLIENT_VARIABLE']|default({}) %}
{% set filament_insert = True if client.filament_sensor1|default("") == ""
else True if not printer[client.filament_sensor1].enabled
else printer[client.filament_sensor1].filament_detected|default(False) %}
{% set printing = (printer.print_stats.state == "printing") %} {% set printing = (printer.print_stats.state == "printing") %}
{% if filament_insert or printing == False %} {% if filament_insert or printing == False %}
SET_SERVO SERVO=switch_nozzle angle=135 SET_SERVO SERVO=switch_nozzle angle=135

10
config/CreatBot_F430NX/base.cfg
View File

@ -443,7 +443,10 @@ gcode:
[gcode_macro T0] [gcode_macro T0]
gcode: gcode:
{% set filament_insert = printer["filament_switch_sensor extruder"].filament_detected|default(False) %} {% set client = printer['gcode_macro _CLIENT_VARIABLE']|default({}) %}
{% set filament_insert = True if client.filament_sensor|default("") == ""
else True if not printer[client.filament_sensor].enabled
else printer[client.filament_sensor].filament_detected|default(False) %}
{% set printing = printer.print_stats.state == "printing" %} {% set printing = printer.print_stats.state == "printing" %}
{% if filament_insert or printing == False %} {% if filament_insert or printing == False %}
{% if "x" not in printer.toolhead.homed_axes %} {% if "x" not in printer.toolhead.homed_axes %}
@ -491,7 +494,10 @@ gcode:
{% set y_offset = svv.nozzle_y_offset_val|default(0)|float %} {% set y_offset = svv.nozzle_y_offset_val|default(0)|float %}
{% set z_offset = svv.nozzle_z_offset_val|default(0)|float %} {% set z_offset = svv.nozzle_z_offset_val|default(0)|float %}
{% set filament_insert = printer["filament_switch_sensor extruder1"].filament_detected|default(False) %} {% set client = printer['gcode_macro _CLIENT_VARIABLE']|default({}) %}
{% set filament_insert = True if client.filament_sensor1|default("") == ""
else True if not printer[client.filament_sensor1].enabled
else printer[client.filament_sensor1].filament_detected|default(False) %}
{% set printing = (printer.print_stats.state == "printing") %} {% set printing = (printer.print_stats.state == "printing") %}
{% if filament_insert or printing == False %} {% if filament_insert or printing == False %}
{% if "x" not in printer.toolhead.homed_axes %} {% if "x" not in printer.toolhead.homed_axes %}