konni/klipper_config
1
0
Fork 0
Code Pull requests Releases Activity

v2.4: update macros

Browse source
This commit is contained in:
Konstantin Koslowski 2021-12-09 21:13:54 +01:00
parent 16a476294f
commit f397f1a7e2
2 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
macros/helpers.cfg
View file

@ -11,7 +11,7 @@ gcode:
{% set N=params.N|default(1)|int %} {% set N=params.N|default(1)|int %}
{% if printer.idle_timeout.state != "Printing" %} {% if printer.idle_timeout.state != "Printing" %}
{% if "xyz" in printer.toolhead.homed_axes %} {% if "xyz" in printer.toolhead.homed_axes %}
M118 moving {N}x with F{F} M118 moving N={N} with F={F}
{% set X0=275 %} {% set X0=275 %}
{% set X1=25 %} {% set X1=25 %}
{% set Y0=275 %} {% set Y0=275 %}
@ -65,9 +65,7 @@ gcode:
[gcode_macro zm] [gcode_macro zm]
gcode: gcode:
{% set speed = params.SPEED|default(300)|int %} {% set F = params.SPEED|default(300)|int %}
{action_respond_info("moving with F%d" % speed)} {action_respond_info("moving with F=%d" % F)}
G0 Z30 F{speed} G0 Z30 F{F}
G0 Z10 F{speed} G0 Z10 F{F}

12
macros/print.cfg
View file

@ -16,8 +16,8 @@
# BRUSHIE # BRUSHIE
[gcode_macro BRUSHIE] [gcode_macro BRUSHIE]
gcode: gcode:
{% set x0=200 %} {% set x0=250 %}
{% set x1=250 %} {% set x1=200 %}
{% set y0=309 %} {% set y0=309 %}
{% set z0=1.5 %} {% set z0=1.5 %}
{% set z_hop = printer['gcode_macro _USER_VARIABLE'].z_hop|int %} {% set z_hop = printer['gcode_macro _USER_VARIABLE'].z_hop|int %}
@ -29,7 +29,6 @@ gcode:
G0 X{x1} # 1 G0 X{x1} # 1
G0 X{x0} # 2 G0 X{x0} # 2
G0 X{x1} # 3 G0 X{x1} # 3
G0 X{x0} # 4
G0 Z{z_hop} F300 # move Z to travel height G0 Z{z_hop} F300 # move Z to travel height
{% else %} {% else %}
M118 Printer not homed M118 Printer not homed
@ -121,7 +120,7 @@ gcode:
{% set EXTRUDER=params.EXTRUDER|default(250)|int %} {% set EXTRUDER=params.EXTRUDER|default(250)|int %}
{% set CHAMBER=params.CHAMBER|default(0)|int %} {% set CHAMBER=params.CHAMBER|default(0)|int %}
{% set SHEET=params.SHEET|default("default")|string %} {% set SHEET=params.SHEET|default("default")|string %}
{% set QGL=params.QGL|default(0)|int %} {% set QGL=params.QGL|default(1)|int %}
{% set BMC=params.BMC|default(0)|int %} {% set BMC=params.BMC|default(0)|int %}
{% set PURGE=params.PURGE|default(1)|int %} {% set PURGE=params.PURGE|default(1)|int %}
{% set SOAK=params.SOAK|default(0)|int * 1000 * 60 %} {% set SOAK=params.SOAK|default(0)|int * 1000 * 60 %}
@ -184,10 +183,6 @@ gcode:
ERCF_CHANGE_TOOL_STANDALONE TOOL={ERCF_EXTRUDER} ERCF_CHANGE_TOOL_STANDALONE TOOL={ERCF_EXTRUDER}
{% endif %} {% endif %}
G4 P2000 G4 P2000
{% if printer['filament_switch_sensor toolhead_sensor'].filament_detected == False %}
M118 Insert filament and press resume
PAUSE
{% endif %}
{% if PURGE %} {% if PURGE %}
PURGE_NOZZLE PURGE_NOZZLE
{% endif %} {% endif %}
@ -251,6 +246,7 @@ gcode:
{% if printer.extruder.can_extrude|lower == 'true' %} {% if printer.extruder.can_extrude|lower == 'true' %}
G91 G91
G1 E{E} F6000 G1 E{E} F6000
G90
{% else %} {% else %}
M118 Extruder not hot enough M118 Extruder not hot enough
{% endif %} {% endif %}