Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated to current v2 printer configs #47

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
151 changes: 0 additions & 151 deletions macros/adaptive_bed_mesh.cfg

This file was deleted.

27 changes: 7 additions & 20 deletions macros/calibration.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,20 @@
description: Run printer calibration based on config. (quad_gantry_level,auto_z_offset,bed_mesh)
gcode:
# command params
{% set fl_size = params.SIZE|default("0_0_0_0")|string %}
{% set debug = params.DEBUG|default(0)|int %}
# features
{% set ena_debug = printer.save_variables.variables.debug|default("false")|lower %}
{% set ena_adaptive_bed_mesh = printer.save_variables.variables.adaptive_bed_mesh|default("false")|lower %}
{% set ena_auto_z_offset = printer["gcode_macro _COMMON_VARIABLE"].auto_z_offset|lower %}
{% set ena_bed_mesh = printer["gcode_macro _COMMON_VARIABLE"].bed_mesh|lower %}
{% set ena_flexplate = printer.save_variables.variables.flexplate|default("true")|lower %}
{% set ena_quad_gantry_level = printer["gcode_macro _COMMON_VARIABLE"].quad_gantry_level|lower %}
{% set ena_z_tilt = printer["gcode_macro _COMMON_VARIABLE"].z_tilt|lower %}

{% if ena_debug == "true" or debug == 1 %}
{action_respond_info("==== _CALIBRATE ====")}
{action_respond_info("features: [adaptive_bed_mesh: '%s', auto_z_offset: '%s', bed_mesh: '%s', flexplate: '%s', quad_gantry_level: '%s']" %
(ena_adaptive_bed_mesh,ena_auto_z_offset,ena_bed_mesh,ena_flexplate,ena_quad_gantry_level))}
{action_respond_info("fl_size: '%s'" % (fl_size))}
{action_respond_info("auto_z_offset: '%s'" % (ena_auto_z_offset))}
{action_respond_info("bed_mesh: '%s'" % (ena_bed_mesh))}
{action_respond_info("ena_z_tilt: '%s'" % (ena_z_tilt))}
{action_respond_info("quad_gantry_level: '%s'" % (ena_quad_gantry_level))}
{action_respond_info("===============")}
{% endif %}

Expand All @@ -47,11 +45,6 @@ gcode:
RESPOND MSG="Calibrating Z"
M117 Calibrating Z
CALIBRATE_Z
{% elif ena_auto_z_offset == "flexplate" and ena_flexplate == "true" and printer.save_variables.variables.plate_array[printer.save_variables.variables.plate_index|int] %}
RESPOND MSG="Setting Z Offset"
M117 Setting Z Offset
_DISPLAY_PLATE DEBUG={debug}
_SET_PLATE_OFFSET DEBUG={debug}
{% endif %}

{% if ena_bed_mesh == "true" %}
Expand All @@ -61,15 +54,9 @@ gcode:
BED_MESH_PROFILE LOAD={printer.bed_mesh.profile_name}
{% else %}
_SET_LED_STATE_BY_NAME STATE="calibrate_mesh"
{% if ena_adaptive_bed_mesh == "true" %}
RESPOND MSG="Adaptive Bed Mesh"
M117 Adaptive Bed Mesh
_ADAPTIVE_BED_MESH SIZE={fl_size} DEBUG={debug}
{% else %}
RESPOND MSG="Bed Mesh"
M117 Bed Mesh
BED_MESH_CALIBRATE
{% endif %}
RESPOND MSG="Bed Mesh"
M117 Bed Mesh
BED_MESH_CALIBRATE
{% endif %}
{% endif %}
RESPOND MSG="Calibration Complete"
Expand Down
12 changes: 3 additions & 9 deletions macros/common_variable.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,10 @@ gcode:
{% set min_soak_time = printer.save_variables.variables.min_soak_time|default(0)|int %}
# features
{% set ena_debug = printer.save_variables.variables.debug|default("false")|lower %}
{% set b2b_state = printer.save_variables.variables.b2b_state|default("false")|lower %}
{% set ena_adaptive_bed_mesh = printer.save_variables.variables.adaptive_bed_mesh|default("false")|lower %}
# {% set b2b_state = printer.save_variables.variables.b2b_state|default("false")|lower %}
# {% set ena_adaptive_bed_mesh = printer.save_variables.variables.adaptive_bed_mesh|default("false")|lower %}
{% set ena_beeper = printer.save_variables.variables.beeper|default("true")|lower %}
{% set ena_flexplate = printer.save_variables.variables.flexplate|default("true")|lower %}
{% set ena_nozzle_clean = printer.save_variables.variables.nozzle_clean|default("false")|lower %}
# {% set ena_flexplate = printer.save_variables.variables.flexplate|default("false")|lower %}
{% set ena_nozzle_purge = printer.save_variables.variables.nozzle_purge|default("false")|lower %}

{% if ena_debug == "true" %}
Expand All @@ -71,13 +70,8 @@ gcode:
{action_respond_info("min_soak_time: '%s'" % (min_soak_time))}

{action_respond_info("=========== Features =============")}
{action_respond_info("adaptive_bed_mesh: '%s'" % (ena_adaptive_bed_mesh))}
{action_respond_info("b2b_state: '%s'" % (b2b_state))}
{action_respond_info("beeper: '%s'" % (ena_beeper))}
{action_respond_info("debug: '%s'" % (ena_debug))}
{action_respond_info("flexplate: '%s'" % (ena_flexplate))}
{action_respond_info("nozzle: [clean: '%s', purge: '%s']" % (ena_nozzle_clean,ena_nozzle_purge))}

{action_respond_info('==================================')}

[delayed_gcode INIT_COMMON_VARIABLE]
Expand Down
12 changes: 9 additions & 3 deletions macros/fans.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@ gcode:

{% if ena_debug == "true" or debug == 1 %}
{action_respond_info("==== _CIRCULATION_START ====")}
{action_respond_info("features: [exhaust_fan: '%s', nevermore_fan: '%s', bed_fans: '%s']" % (ena_exhaust_fan,ena_nevermore_fan,ena_bed_fans))}
{action_respond_info("speed: [nevermore: '%s', exhaust: '%s', bed: '%s']" % (nevermore_speed,exhaust_speed,bed_fans_speed))}
{action_respond_info("exhaust_fan: '%s'" % (ena_exhaust_fan))}
{action_respond_info("nevermore_fan: '%s'" % (ena_nevermore_fan))}
{action_respond_info("bed_fans: '%s'" % (ena_bed_fans))}
{action_respond_info("nevermore_speed: '%s'" % (nevermore_speed))}
{action_respond_info("exhaust_speed: '%s'" % (exhaust_speed))}
{action_respond_info("bed_fans_speed: '%s'" % (bed_fans_speed))}
{action_respond_info("filament_type: '%s'" % (filament_type))}
{action_respond_info("nevermore_filament_types: '%s'" % (nevermore_filament_types))}
{action_respond_info("===============")}
Expand Down Expand Up @@ -60,7 +64,9 @@ gcode:

{% if ena_debug == "true" or debug == 1 %}
{action_respond_info("==== _CIRCULATION_END ====")}
{action_respond_info("features: [exhaust_fan: '%s', nevermore_fan: '%s', bed_fans: '%s']" % (ena_exhaust_fan,ena_nevermore_fan,ena_bed_fans))}
{action_respond_info("exhaust_fan: '%s'" % (ena_exhaust_fan))}
{action_respond_info("nevermore_fan: '%s'" % (ena_nevermore_fan))}
{action_respond_info("bed_fans: '%s'" % (ena_bed_fans))}
{action_respond_info("filament_type: '%s'" % (filament_type))}
{action_respond_info("cooldown_bed_temperature: '%s'" % (cooldown_bed_temperature))}
{action_respond_info("nevermore_cooldown_speed: '%s'" % (nevermore_cooldown_speed))}
Expand Down
Loading