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 2022-01-06 18:25:53 +01:00
parent e06e6385f4
commit 988257a6f1
3 changed files with 77 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
macros/helpers.cfg
View file

@ -1,7 +1,10 @@
#################################################################### ####################################################################
# Helper macros # Helper macros
# - MOVE_SPEED # - MOVE_SPEED
# - ... # - NOTIFY_BED
# - NOTIFY_EXTRUDER
# - ZC - calibrate z and move to front to measure
# - TZC - Test Z Calibration
#################################################################### ####################################################################
[gcode_macro MOVE_SPEED] [gcode_macro MOVE_SPEED]
@ -42,30 +45,33 @@ gcode:
M118 Already printing M118 Already printing
{% endif %} {% endif %}
[gcode_macro fes]
description: query filament sensor encoder_sensor
gcode:
QUERY_FILAMENT_SENSOR SENSOR=encoder_sensor
[gcode_macro fts] [gcode_macro NOTIFY_BED]
description: query filament sensor toolhead_sensor
gcode: gcode:
QUERY_FILAMENT_SENSOR SENSOR=toolhead_sensor {% set BED=params.BED|default(0)|int %}
M117 HEATING BED from {printer.heater_bed.temperature} to {BED}
[gcode_macro zc] M118 HEATING BED from {printer.heater_bed.temperature} to {BED}
gcode:
{% set z_run = params.CUR|default(0.4)|float %}
{% set z_hold = z_run %}
{action_respond_info("zc: setting zcurrent to %.2f" % z_run)}
SET_TMC_CURRENT STEPPER=stepper_z CURRENT={z_run} HOLDCURRENT={z_hold}
SET_TMC_CURRENT STEPPER=stepper_z1 CURRENT={z_run} HOLDCURRENT={z_hold}
SET_TMC_CURRENT STEPPER=stepper_z2 CURRENT={z_run} HOLDCURRENT={z_hold}
SET_TMC_CURRENT STEPPER=stepper_z3 CURRENT={z_run} HOLDCURRENT={z_hold}
[gcode_macro zm] [gcode_macro NOTIFY_EXTRUDER]
gcode: gcode:
{% set F = params.SPEED|default(300)|int %} {% set EXTRUDER=params.EXTRUDER|default(0)|int %}
{action_respond_info("moving with F=%d" % F)} M117 HEATING EXTRUDER from {printer.extruder.temperature} to {EXTRUDER}
G0 Z30 F{F} M118 HEATING EXTRUDER from {printer.extruder.temperature} to {EXTRUDER}
G0 Z10 F{F}
[gcode_macro ZC]
gcode:
G28
CALIBRATE_Z
G0 X150 Y30 Z2 F10000
G0 Z1 F300
[gcode_macro TZC]
gcode:
{% set N=params.N|default(1)|int %}
{% for i in range(N) %}
M118 move {(i+1)}/{N}
G28
CALIBRATE_Z
{% endfor %}

73
macros/print.cfg
View file

@ -22,7 +22,6 @@ gcode:
{% 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 %}
{% if "xyz" in printer.toolhead.homed_axes %} {% if "xyz" in printer.toolhead.homed_axes %}
M118 brushie brushie brushie
G0 Z{z_hop} F1000 # move Z to travel height G0 Z{z_hop} F1000 # move Z to travel height
G0 X{x0} Y{y0} F6000 # move to x0/y0 G0 X{x0} Y{y0} F6000 # move to x0/y0
G0 Z{z0} # lower G0 Z{z0} # lower
@ -118,17 +117,15 @@ gcode:
gcode: gcode:
{% set BED=params.BED|default(100)|int %} {% set BED=params.BED|default(100)|int %}
{% set EXTRUDER=params.EXTRUDER|default(250)|int %} {% set EXTRUDER=params.EXTRUDER|default(250)|int %}
{% set CHAMBER=params.CHAMBER|default(0)|int %}
{% set SHEET=params.SHEET|default("default")|string %}
{% set QGL=params.QGL|default(1)|int %}
{% set BMC=params.BMC|default(0)|int %} {% set BMC=params.BMC|default(0)|int %}
{% set SHEET=params.SHEET|default("default")|string %}
{% set PURGE=params.PURGE|default(1)|int %} {% set PURGE=params.PURGE|default(1)|int %}
{% set SOAK=params.SOAK|default(0)|int * 1000 * 60 %}
{% set Z_ADJUST=params.Z_ADJUST|default(0.0)|float %} {% set Z_ADJUST=params.Z_ADJUST|default(0.0)|float %}
{% set ERCF=params.ERCF|default(0)|int %} {% set ERCF=params.ERCF|default(0)|int %}
{% set ERCF_EXTRUDER=params.ERCF_EXTRUDER|default(0)|int %} {% set ERCF_EXTRUDER=params.ERCF_EXTRUDER|default(0)|int %}
{action_respond_info("starting print BED=%d, EXTRUDER=%d, CHAMBER=%d, SHEET=%s, QGL=%d, BMC=%d, PURGE=%d, SOAK=%d, Z_AJUST=%f, ERCF=%d, ERCF_EXTRUDER=%d" % (BED, EXTRUDER, CHAMBER, SHEET, QGL, BMC, PURGE, SOAK, Z_ADJUST, ERCF, ERCF_EXTRUDER))} {action_respond_info("starting print BED=%d, EXTRUDER=%d, SHEET=%s, BMC=%d, PURGE=%d, Z_AJUST=%f, ERCF=%d, ERCF_EXTRUDER=%d" % (BED, EXTRUDER, SHEET, BMC, PURGE, Z_ADJUST, ERCF, ERCF_EXTRUDER))}
M118 configuring M117 CONFIGURING
M118 CONFIGURING
SET_GCODE_OFFSET Z=0.0 # reset z offset SET_GCODE_OFFSET Z=0.0 # reset z offset
M140 S{BED} # start bed heating M140 S{BED} # start bed heating
M104 S{EXTRUDER} # start extruder heating M104 S{EXTRUDER} # start extruder heating
@ -137,49 +134,60 @@ gcode:
G90 # use absolute coordinates G90 # use absolute coordinates
M83 # use relative distances for extrusion M83 # use relative distances for extrusion
G4 P2000 BED_MESH_CLEAR
{% if BMC %} {% if not "xyz" in printer.toolhead.homed_axes %}
BED_MESH_CLEAR M117 HOME
M118 HOME
G28
{% else %}
M117 NO HOME
M118 NO HOME
{% endif %} {% endif %}
M118 home
G28 {% if printer.quad_gantry_level.applied|lower == 'false' %}
BRUSHIE M117 QGL
{% if QGL %} M118 QGL
M118 qgl
QUAD_GANTRY_LEVEL PARK=false QUAD_GANTRY_LEVEL PARK=false
BRUSHIE {% else %}
M117 NO QGL
M118 NO QGL
{% endif %} {% endif %}
M118 calibrate z
CALIBRATE_Z
{% if BMC %} {% if BMC %}
M118 bed mesh calibrate M117 BED MESH CALIBRATE
M118 BED MESH CALIBRATE
BED_MESH_CALIBRATE BED_MESH_CALIBRATE
{% else %} {% else %}
M118 bed mesh load {SHEET} M117 BED MESH LOAD {SHEET}
M118 BED MESH LOAD {SHEET}
BED_MESH_PROFILE LOAD={SHEET} BED_MESH_PROFILE LOAD={SHEET}
{% endif %} {% endif %}
M118 heating M117 CALIBRATE_Z
G4 P2000 M118 CALIBRATE_Z
G92 E0 # reset extruder BRUSHIE
M190 S{BED} # set and wait for bed temperature G28 Z
M109 S{EXTRUDER} # set and wait for nozzle temperature CALIBRATE_Z
TEMPERATURE_WAIT SENSOR="temperature_sensor chamber" MINIMUM={CHAMBER} # wait for chamber temp
{% if SOAK > 0 %} G92 E0 # reset extruder
M118 soaking for {SOAK/1000/60|int} min NOTIFY_BED BED={BED}
G4 P{SOAK} M190 S{BED} # set and wait for bed temperature
{% endif %} NOTIFY_EXTRUDER EXTRUDER={EXTRUDER}
M109 S{EXTRUDER} # set and wait for extruder temperature
M118 starting
SET_GCODE_OFFSET Z_ADJUST={params.Z_ADJUST|default(0.0)|float} MOVE=1 SET_GCODE_OFFSET Z_ADJUST={params.Z_ADJUST|default(0.0)|float} MOVE=1
{% if ERCF %} {% if ERCF %}
M117 ercf changing to tool {ERCF_EXTRUDER}
M118 ercf changing to tool {ERCF_EXTRUDER} M118 ercf changing to tool {ERCF_EXTRUDER}
ERCF_HOME
ERCF_CHANGE_TOOL_SLICER TOOL={ERCF_EXTRUDER} ERCF_CHANGE_TOOL_SLICER TOOL={ERCF_EXTRUDER}
{% endif %} {% endif %}
BRUSHIE BRUSHIE
{% if PURGE %} {% if PURGE %}
PURGE_NOZZLE PURGE_NOZZLE
{% endif %} {% endif %}
M117 STARTING
M118 STARTING
# - PRINT_END # - PRINT_END
@ -209,7 +217,7 @@ gcode:
M118 purge nozzle M118 purge nozzle
G0 Z{z_hop} F300 # move Z to travel height G0 Z{z_hop} F300 # move Z to travel height
G0 X{x0} Y{y0} F5000 # move to x0/y0 G0 X{x0} Y{y0} F5000 # move to x0/y0
G0 Z0.24 F300 # lower Z G0 Z0.24 F300 # lower Z to 75%
G0 X{x1} E20 F1500 # draw line G0 X{x1} E20 F1500 # draw line
G0 Y{y1} # move to y1 G0 Y{y1} # move to y1
G0 X{x0} E10 # draw fine line G0 X{x0} E10 # draw fine line
@ -247,7 +255,6 @@ gcode:
{% if printer["gcode_macro ERCF_VAR"].clog_detection|int == 1 %} {% if printer["gcode_macro ERCF_VAR"].clog_detection|int == 1 %}
SET_FILAMENT_SENSOR SENSOR=encoder_sensor ENABLE=1 SET_FILAMENT_SENSOR SENSOR=encoder_sensor ENABLE=1
{% endif %} {% endif %}
M118 calling _RESUME_BASE
G4 P2000 G4 P2000
_RESUME_BASE _RESUME_BASE
{% endif %} {% endif %}

11
macros/z_calibration.cfg
View file

@ -88,14 +88,19 @@ gcode:
{% set z_run = printer['gcode_macro _USER_VARIABLE'].z_home_current %} {% set z_run = printer['gcode_macro _USER_VARIABLE'].z_home_current %}
{% set z_hold = printer['gcode_macro _USER_VARIABLE'].z_home_current %} {% set z_hold = printer['gcode_macro _USER_VARIABLE'].z_home_current %}
{% else %} {% else %}
{% if 'tmc2209 stepper_z' in printer.configfile.settings %} ## XY
{% if 'tmc2209 stepper_x' in printer.configfile.settings %}
{% set xy_run = printer.configfile.settings['tmc2209 stepper_x'].run_current %} {% set xy_run = printer.configfile.settings['tmc2209 stepper_x'].run_current %}
{% set xy_hold = printer.configfile.settings['tmc2209 stepper_x'].hold_current %} {% set xy_hold = printer.configfile.settings['tmc2209 stepper_x'].hold_current %}
{% elif 'tmc5160 stepper_x' in printer.configfile.settings %}
{% set xy_run = printer.configfile.settings['tmc5160 stepper_x'].run_current %}
{% set xy_hold = printer.configfile.settings['tmc5160 stepper_x'].hold_current %}
{% endif %}
## Z
{% if 'tmc2209 stepper_z' in printer.configfile.settings %}
{% set z_run = printer.configfile.settings['tmc2209 stepper_z'].run_current %} {% set z_run = printer.configfile.settings['tmc2209 stepper_z'].run_current %}
{% set z_hold = printer.configfile.settings['tmc2209 stepper_z'].hold_current %} {% set z_hold = printer.configfile.settings['tmc2209 stepper_z'].hold_current %}
{% elif 'tmc5160 stepper_z' in printer.configfile.settings %} {% elif 'tmc5160 stepper_z' in printer.configfile.settings %}
{% set xy_run = printer.configfile.settings['tmc5160 stepper_x'].run_current %}
{% set xy_hold = printer.configfile.settings['tmc5160 stepper_x'].hold_current %}
{% set z_run = printer.configfile.settings['tmc5160 stepper_z'].run_current %} {% set z_run = printer.configfile.settings['tmc5160 stepper_z'].run_current %}
{% set z_hold = printer.configfile.settings['tmc5160 stepper_z'].hold_current %} {% set z_hold = printer.configfile.settings['tmc5160 stepper_z'].hold_current %}
{% endif %} {% endif %}