Update 6.0.0

This commit is contained in:
Cyril 2024-05-01 16:10:07 +02:00
parent bb0b7539a0
commit c8db437b79
63 changed files with 3667 additions and 737 deletions

View file

@ -1,5 +1,5 @@
###########################################
# Adaptive Meshing for Creality K1 Series
# Adaptive Bed Meshing Macros
###########################################
[gcode_macro BED_MESH_CALIBRATE]
@ -50,44 +50,26 @@ gcode:
{% set points_y = [points_y , probe_count[1]]|min %}
{% if verbose_enable == True %}
{% if printer.exclude_object.objects != [] %}
RESPOND TYPE=command MSG="Algorithm: {algorithm}"
RESPOND TYPE=command MSG="Default probe count: {probe_count[0]},{probe_count[1]}"
RESPOND TYPE=command MSG="Adapted probe count: {points_x},{points_y}"
RESPOND TYPE=command MSG="Default mesh bounds: {bed_mesh_min[0]},{bed_mesh_min[1]}, {bed_mesh_max[0]},{bed_mesh_max[1]}"
{% if mesh_margin > 0 %}
RESPOND TYPE=command MSG="Mesh margin is {mesh_margin}, mesh bounds extended by {mesh_margin}mm."
{% else %}
RESPOND TYPE=command MSG="Mesh margin is 0, margin not increased."
{% endif %}
{% if fuzz_amount > 0 %}
RESPOND TYPE=command MSG="Mesh point fuzzing enabled, points fuzzed up to {fuzz_amount}mm"
{% else %}
RESPOND TYPE=command MSG="Fuzz amount is 0, mesh points not fuzzed."
{% endif %}
RESPOND TYPE=command MSG="Adapted mesh bounds: {adapted_x_min},{adapted_y_min}, {adapted_x_max},{adapted_y_max}"
RESPOND TYPE=command MSG="KAMP adjustments successful. Happy KAMPing!"
{% else %}
RESPOND TYPE=command MSG="No object detected! Make sure you have enabled Exclude Objets setting in your slicer. Using Full Bed Mesh."
G4 P5000
{% endif %}
{% endif %}
_BED_MESH_CALIBRATE mesh_min={adapted_x_min},{adapted_y_min} mesh_max={adapted_x_max},{adapted_y_max} ALGORITHM={algorithm} PROBE_COUNT={points_x},{points_y}

View file

@ -1,5 +1,5 @@
###########################################
# KAMP Settings for Creality K1 Series
# KAMP Settings
###########################################
# Below you can enable or disable specific configuration files depending on what you want KAMP to do:
@ -37,4 +37,4 @@ variable_flow_rate: 12 # Flow rate of purge in mm3/s. Defau
variable_smart_park_height: 10 # Z position for Smart Park. Default is 10.
gcode:
RESPOND TYPE=command MSG="Running the KAMP_Settings macro does nothing, it's only used for storing KAMP settings."
RESPOND TYPE=command MSG="Running the _KAMP_Settings macro does nothing, it's only used for storing KAMP settings."

View file

@ -1,5 +1,5 @@
###########################################
# Line Purge for Creality K1 Series
# Purge Line Macros
###########################################
[gcode_macro _LINE_PURGE]
@ -44,70 +44,28 @@ gcode:
{% set purge_move_speed = (flow_rate / 5.0) * 60 | float %}
{% if cross_section < 5 %}
RESPOND TYPE=command MSG="[Extruder] max_extrude_cross_section is insufficient for line purge, please set it to 5 or greater. Purge skipped."
{% else %}
{% if verbose_enable == True %}
RESPOND TYPE=command MSG="Moving filament tip {tip_distance}mm"
{% endif %}
{% if detect_object == 0 %}
RESPOND TYPE=command MSG="No object detected! Using classic purge line."
{% elif purge_y_origin_low > 0 %}
RESPOND TYPE=command MSG="KAMP line purge starting at {purge_x_center}, {purge_y_origin_low} and purging {purge_amount}mm of filament, requested flow rate is {flow_rate}mm3/s."
{% elif purge_x_origin_low > 0 %}
RESPOND TYPE=command MSG="KAMP line purge starting at {purge_x_origin_low}, {purge_y_center} and purging {purge_amount}mm of filament, requested flow rate is {flow_rate}mm3/s."
{% elif purge_y_origin_high < bed_y_max %}
RESPOND TYPE=command MSG="KAMP line purge starting at {purge_x_center}, {purge_y_origin_high} and purging {purge_amount}mm of filament, requested flow rate is {flow_rate}mm3/s."
{% elif purge_x_origin_high < bed_x_max %}
RESPOND TYPE=command MSG="KAMP line purge starting at {purge_x_origin_high}, {purge_y_center} and purging {purge_amount}mm of filament, requested flow rate is {flow_rate}mm3/s."
{% else %}
RESPOND TYPE=command MSG="No space for purge line! Using classic purge line."
{% endif %}
SAVE_GCODE_STATE NAME=Prepurge_State
{% if detect_object == 0 %}
G92 E0
G1 Z0.1 F600
M83
{RETRACT}
SET_VELOCITY_LIMIT SQUARE_CORNER_VELOCITY=5
M204 S12000
SET_VELOCITY_LIMIT ACCEL_TO_DECEL=6000
M220 S100
M221 S100
G1 Z2.0 F1200
G1 X0.1 Y20 Z0.3 F6000.0
G1 X0.1 Y180.0 Z0.3 F3000.0 E10.0
G1 X0.4 Y180.0 Z0.3 F3000.0
G1 X0.4 Y20.0 Z0.3 F3000.0 E10.0
G1 Y10.0 F3000.0
G1 Z2.0 F3000.0
G92 E0
M82
G1 F12000
G21
CX_PRINT_DRAW_ONE_LINE
{% elif purge_y_origin_low > 0 %}
G92 E0
G0 F{travel_speed}
G90
@ -121,9 +79,7 @@ gcode:
G92 E0
M82
G0 Z{purge_height * 2} F{travel_speed}
{% elif purge_x_origin_low > 0 %}
G92 E0
G0 F{travel_speed}
G90
@ -137,9 +93,7 @@ gcode:
G92 E0
M82
G0 Z{purge_height * 2} F{travel_speed}
{% elif purge_y_origin_high < bed_y_max %}
G92 E0
G0 F{travel_speed}
G90
@ -153,9 +107,7 @@ gcode:
G92 E0
M82
G0 Z{purge_height * 2} F{travel_speed}
{% elif purge_x_origin_high < bed_x_max %}
G92 E0
G0 F{travel_speed}
G90
@ -169,32 +121,8 @@ gcode:
G92 E0
M82
G0 Z{purge_height * 2} F{travel_speed}
{% else %}
G92 E0
G1 Z0.1 F600
M83
{RETRACT}
SET_VELOCITY_LIMIT SQUARE_CORNER_VELOCITY=5
M204 S12000
SET_VELOCITY_LIMIT ACCEL_TO_DECEL=6000
M220 S100
M221 S100
G1 Z2.0 F1200
G1 X0.1 Y20 Z0.3 F6000.0
G1 X0.1 Y180.0 Z0.3 F3000.0 E10.0
G1 X0.4 Y180.0 Z0.3 F3000.0
G1 X0.4 Y20.0 Z0.3 F3000.0 E10.0
G1 Y10.0 F3000.0
G1 Z2.0 F3000.0
G92 E0
M82
G1 F12000
G21
CX_PRINT_DRAW_ONE_LINE
{% endif %}
RESTORE_GCODE_STATE NAME=Prepurge_State
{% endif %}

View file

@ -1,32 +1,38 @@
###########################################
# PrusaSlicer Macros for Creality K1 Series
# PrusaSlicer Macros
###########################################
[gcode_macro DEFINE_OBJECT]
description: Needed macro for Exclude Objects
gcode:
EXCLUDE_OBJECT_DEFINE {rawparams}
[gcode_macro START_CURRENT_OBJECT]
description: Needed macro for Exclude Objects
gcode:
EXCLUDE_OBJECT_START NAME={params.NAME}
[gcode_macro END_CURRENT_OBJECT]
description: Needed macro for Exclude Objects
gcode:
EXCLUDE_OBJECT_END {% if params.NAME %}NAME={params.NAME}{% endif %}
[gcode_macro LIST_OBJECTS]
description: Needed macro for Exclude Objects
gcode:
EXCLUDE_OBJECT_DEFINE
[gcode_macro LIST_EXCLUDED_OBJECTS]
description: Needed macro for Exclude Objects
gcode:
EXCLUDE_OBJECT
[gcode_macro REMOVE_ALL_EXCLUDED]
description: Needed macro for Exclude Objects
gcode:
EXCLUDE_OBJECT RESET=1

View file

@ -1,5 +1,5 @@
###########################################
# Smart Park for Creality K1 Series
# Smart Park Macros
###########################################
[gcode_macro _SMART_PARK]
@ -59,21 +59,13 @@ gcode:
{% endif %}
{% if verbose_enable == True %}
RESPOND TYPE=command MSG="Smart Park location: {x_min},{y_min}"
{% endif %}
SAVE_GCODE_STATE NAME=Presmartpark_State
G90
{% if printer.toolhead.position.z < z_height %}
G0 Z{z_height}
{% endif %}
G0 X{x_min} Y{y_min} F{travel_speed}
G0 Z{z_height}
RESTORE_GCODE_STATE NAME=Presmartpark_State

View file

@ -0,0 +1,131 @@
###########################################
# Additional Macros for Creality Ender-3 V3
###########################################
[respond]
[virtual_pins]
[output_pin ADAPTIVE_BED_MESH]
pin: virtual_pin:ADAPTIVE_BED_MESH_pin
value: 1
[output_pin FULL_BED_MESH]
pin: virtual_pin:FULL_BED_MESH_pin
value: 0
[output_pin ADAPTIVE_PURGE_LINE]
pin: virtual_pin:ADAPTIVE_PURGE_LINE_pin
value: 1
[gcode_macro _ADAPTIVE_BED_MESH_ON]
description: Enable Adaptive Bed Mesh and Disable Full Bed Mesh
gcode:
SET_PIN PIN=ADAPTIVE_BED_MESH VALUE=1
SET_PIN PIN=FULL_BED_MESH VALUE=0
RESPOND TYPE=command MSG="action:prompt_end"
[gcode_macro _FULL_BED_MESH_ON]
description: Disable Adaptive Bed Mesh and Enable Full Bed Mesh
gcode:
SET_PIN PIN=ADAPTIVE_BED_MESH VALUE=0
SET_PIN PIN=FULL_BED_MESH VALUE=1
RESPOND TYPE=command MSG="action:prompt_end"
[gcode_macro _BED_MESH_OFF]
description: Disable Adaptive Bed Mesh and Enable Full Bed Mesh
gcode:
SET_PIN PIN=ADAPTIVE_BED_MESH VALUE=0
SET_PIN PIN=FULL_BED_MESH VALUE=0
RESPOND TYPE=command MSG="action:prompt_end"
[gcode_macro _ADAPTIVE_PURGE_LINE_ON]
description: Enable Adaptive Purge Line
gcode:
SET_PIN PIN=ADAPTIVE_PURGE_LINE VALUE=1
RESPOND TYPE=command MSG="action:prompt_end"
[gcode_macro _ADAPTIVE_PURGE_LINE_OFF]
description: Disable Adaptive Purge Line
gcode:
SET_PIN PIN=ADAPTIVE_PURGE_LINE VALUE=0
RESPOND TYPE=command MSG="action:prompt_end"
[gcode_macro KAMP_BED_MESH_SETTINGS]
description: Configure Bed Mesh type
gcode:
RESPOND TYPE=command MSG="action:prompt_begin Bed Mesh Settings"
RESPOND TYPE=command MSG="action:prompt_text What type of bed mesh do you want to use when you start printing?"
RESPOND TYPE=command MSG="action:prompt_button ADAPTIVE BED MESH|_ADAPTIVE_BED_MESH_ON|primary"
RESPOND TYPE=command MSG="action:prompt_button FULL BED MESH|_FULL_BED_MESH_ON|primary"
RESPOND TYPE=command MSG="action:prompt_button NONE|_BED_MESH_OFF|primary"
RESPOND TYPE=command MSG="action:prompt_show"
[gcode_macro KAMP_PURGE_LINE_SETTINGS]
description: Configure Purge Line type
gcode:
RESPOND TYPE=command MSG="action:prompt_begin Purge Line Settings"
RESPOND TYPE=command MSG="action:prompt_text What type of purge line do you want to use when you start printing?"
RESPOND TYPE=command MSG="action:prompt_button ADAPTIVE PURGE LINE|_ADAPTIVE_PURGE_LINE_ON|primary"
RESPOND TYPE=command MSG="action:prompt_button CLASSIC PURGE LINE|_ADAPTIVE_PURGE_LINE_OFF|primary"
RESPOND TYPE=command MSG="action:prompt_show"
[gcode_macro START_PRINT]
variable_prepare: 0
variable_z_sensorless: 0
gcode:
SET_GCODE_VARIABLE MACRO=M106 VARIABLE=user_flag VALUE=0
WAIT_TEMP_END
CLEAR_PAUSE
SET_TEMPERATURE_FAN_TARGET temperature_fan=soc_fan target=5
{% set g28_extruder_temp = printer.custom_macro.g28_ext_temp %}
{% set bed_temp = printer.custom_macro.default_bed_temp %}
{% set extruder_temp = printer.custom_macro.default_extruder_temp %}
{% if 'BED_TEMP' in params|upper and (params.BED_TEMP|float) %}
{% set bed_temp = params.BED_TEMP %}
{% endif %}
{% if 'EXTRUDER_TEMP' in params|upper and (params.EXTRUDER_TEMP|float) %}
{% set extruder_temp = params.EXTRUDER_TEMP %}
{% endif %}
{% if printer['gcode_macro START_PRINT'].prepare|int == 0 %}
{action_respond_info("not prepare.\n")}
PRINT_PREPARE_CLEAR
CX_ROUGH_G28 EXTRUDER_TEMP={extruder_temp} BED_TEMP={bed_temp}
CX_NOZZLE_CLEAR
Z_SENSORLESS_SET
ACCURATE_G28
{% if printer['output_pin ADAPTIVE_BED_MESH'].value == 1 %}
RESPOND TYPE=command MSG="Starting Adaptative Bed Mesh..."
BED_MESH_CLEAR
BED_MESH_CALIBRATE
BED_MESH_PROFILE SAVE=adaptive
BED_MESH_PROFILE LOAD=adaptive
{% else %}
{% if printer['output_pin FULL_BED_MESH'].value == 1 %}
RESPOND TYPE=command MSG="Starting Full Bed Mesh..."
CX_PRINT_LEVELING_CALIBRATION
{% endif %}
BED_MESH_PROFILE LOAD=default
{% endif %}
{% else %}
PRINT_PREPARE_CLEAR
{% endif %}
{% if printer['output_pin ADAPTIVE_PURGE_LINE'].value == 1 %}
_SMART_PARK
M109 S{extruder_temp}
M190 S{bed_temp}
RESPOND TYPE=command MSG="Starting Adaptive Purge Line..."
_LINE_PURGE
{% else %}
RESPOND TYPE=command MSG="Starting Classic Purge Line..."
CX_PRINT_DRAW_ONE_LINE
{% endif %}
SET_VELOCITY_LIMIT ACCEL={printer.configfile.settings.printer.max_accel}

View file

@ -1,20 +1,83 @@
###########################################
# Start Print Macro for Creality K1 Series
# Additional Macros for Creality K1 Series
###########################################
[respond]
[virtual_pins]
[output_pin KAMP]
pin: virtual_pin:KAMP_pin
[output_pin ADAPTIVE_BED_MESH]
pin: virtual_pin:ADAPTIVE_BED_MESH_pin
value: 1
[output_pin BED_LEVELING]
pin: virtual_pin:BED_LEVELING_pin
[output_pin FULL_BED_MESH]
pin: virtual_pin:FULL_BED_MESH_pin
value: 0
[output_pin ADAPTIVE_PURGE_LINE]
pin: virtual_pin:ADAPTIVE_PURGE_LINE_pin
value: 1
[gcode_macro _ADAPTIVE_BED_MESH_ON]
description: Enable Adaptive Bed Mesh and Disable Full Bed Mesh
gcode:
SET_PIN PIN=ADAPTIVE_BED_MESH VALUE=1
SET_PIN PIN=FULL_BED_MESH VALUE=0
RESPOND TYPE=command MSG="action:prompt_end"
[gcode_macro _FULL_BED_MESH_ON]
description: Disable Adaptive Bed Mesh and Enable Full Bed Mesh
gcode:
SET_PIN PIN=ADAPTIVE_BED_MESH VALUE=0
SET_PIN PIN=FULL_BED_MESH VALUE=1
RESPOND TYPE=command MSG="action:prompt_end"
[gcode_macro _BED_MESH_OFF]
description: Disable Adaptive Bed Mesh and Enable Full Bed Mesh
gcode:
SET_PIN PIN=ADAPTIVE_BED_MESH VALUE=0
SET_PIN PIN=FULL_BED_MESH VALUE=0
RESPOND TYPE=command MSG="action:prompt_end"
[gcode_macro _ADAPTIVE_PURGE_LINE_ON]
description: Enable Adaptive Purge Line
gcode:
SET_PIN PIN=ADAPTIVE_PURGE_LINE VALUE=1
RESPOND TYPE=command MSG="action:prompt_end"
[gcode_macro _ADAPTIVE_PURGE_LINE_OFF]
description: Disable Adaptive Purge Line
gcode:
SET_PIN PIN=ADAPTIVE_PURGE_LINE VALUE=0
RESPOND TYPE=command MSG="action:prompt_end"
[gcode_macro KAMP_BED_MESH_SETTINGS]
description: Configure Bed Mesh type
gcode:
RESPOND TYPE=command MSG="action:prompt_begin Bed Mesh Settings"
RESPOND TYPE=command MSG="action:prompt_text What type of bed mesh do you want to use when you start printing?"
RESPOND TYPE=command MSG="action:prompt_button ADAPTIVE BED MESH|_ADAPTIVE_BED_MESH_ON|primary"
RESPOND TYPE=command MSG="action:prompt_button FULL BED MESH|_FULL_BED_MESH_ON|primary"
RESPOND TYPE=command MSG="action:prompt_button NONE|_BED_MESH_OFF|primary"
RESPOND TYPE=command MSG="action:prompt_show"
[gcode_macro KAMP_PURGE_LINE_SETTINGS]
description: Configure Purge Line type
gcode:
RESPOND TYPE=command MSG="action:prompt_begin Purge Line Settings"
RESPOND TYPE=command MSG="action:prompt_text What type of purge line do you want to use when you start printing?"
RESPOND TYPE=command MSG="action:prompt_button ADAPTIVE PURGE LINE|_ADAPTIVE_PURGE_LINE_ON|primary"
RESPOND TYPE=command MSG="action:prompt_button CLASSIC PURGE LINE|_ADAPTIVE_PURGE_LINE_OFF|primary"
RESPOND TYPE=command MSG="action:prompt_show"
[gcode_macro START_PRINT]
variable_prepare: 0
gcode:
@ -34,14 +97,14 @@ gcode:
CX_ROUGH_G28 EXTRUDER_TEMP={extruder_temp} BED_TEMP={bed_temp}
CX_NOZZLE_CLEAR
ACCURATE_G28
{% if printer['output_pin KAMP'].value == 1 %}
RESPOND TYPE=command MSG="Starting KAMP Bed Mesh..."
{% if printer['output_pin ADAPTIVE_BED_MESH'].value == 1 %}
RESPOND TYPE=command MSG="Starting Adaptive Bed Mesh..."
BED_MESH_CLEAR
BED_MESH_CALIBRATE
BED_MESH_PROFILE SAVE=kamp
BED_MESH_PROFILE LOAD=kamp
BED_MESH_PROFILE SAVE=adaptive
BED_MESH_PROFILE LOAD=adaptive
{% else %}
{% if printer['output_pin BED_LEVELING'].value == 1 %}
{% if printer['output_pin FULL_BED_MESH'].value == 1 %}
RESPOND TYPE=command MSG="Starting Full Bed Mesh..."
CX_PRINT_LEVELING_CALIBRATION
{% endif %}
@ -50,14 +113,14 @@ gcode:
{% else %}
PRINT_PREPARE_CLEAR
{% endif %}
{% if printer['output_pin KAMP'].value == 1 %}
{% if printer['output_pin ADAPTIVE_PURGE_LINE'].value == 1 %}
_SMART_PARK
M109 S{extruder_temp}
M190 S{bed_temp}
RESPOND TYPE=command MSG="Starting KAMP line purge..."
RESPOND TYPE=command MSG="Starting Adaptive Purge Line..."
_LINE_PURGE
{% else %}
RESPOND TYPE=command MSG="Starting classic line purge..."
RESPOND TYPE=command MSG="Starting Classic Purge Line..."
CX_PRINT_DRAW_ONE_LINE
{% endif %}
SET_VELOCITY_LIMIT ACCEL={printer.configfile.settings.printer.max_accel}