diff --git a/KAMP_Settings.cfg b/KAMP_Settings.cfg index 0d03444..8f68066 100644 --- a/KAMP_Settings.cfg +++ b/KAMP_Settings.cfg @@ -1,7 +1,7 @@ # Below you can include specific configuration files depending on what you want KAMP to do: [include ./KAMP/Adaptive_Meshing.cfg] # Include to enable adaptive meshing configuration. -# [include ./KAMP/Line_Purge.cfg] # Include to enable adaptive line purging configuration. +# [include ./KAMP/Line_Purge.cfg] # Include to enable adaptive line purging configuration. [include ./KAMP/Voron_Purge.cfg] # Include to enable adaptive Voron logo purging configuration. [include ./KAMP/Smart_Park.cfg] # Include to enable the Smart Park function, which parks the printhead near the print area for final heating. diff --git a/basic_macros.cfg b/basic_macros.cfg index 87f8770..0f07c40 100644 --- a/basic_macros.cfg +++ b/basic_macros.cfg @@ -6,7 +6,10 @@ gcode: {% set bedTemp = params.BED|int %} {% set chamberTemp = params.CHAMBER|default(0)|int %} - SET_HEATER_TEMPERATURE HEATER=extruder TARGET={hotendTemp|float*0.6} # Set extruder chamber warm temp + BED_MESH_CLEAR + SET_GCODE_OFFSET Z=0 + SET_HEATER_TEMPERATURE HEATER=extruder TARGET=150 # Set extruder chamber warm temp + #SET_HEATER_TEMPERATURE HEATER=extruder TARGET={hotendTemp|float*0.6} # Set extruder chamber warm temp SET_HEATER_TEMPERATURE HEATER=heater_bed TARGET={bedTemp} # Set bed temp to warm while starting up G28 # home after setting temps M117 Waiting for bed temperature... @@ -15,12 +18,14 @@ gcode: SET_CHAMBER_TEMP CHAMBER={chamberTemp} # Set target chamber temp CHAMBER_WARMER TEMPERATURE={chamberTemp-5} # Prewarm chamber {% endif %} - SET_HEATER_TEMPERATURE HEATER=extruder TARGET={hotendTemp|float*0.6} # Set extruder don't drip temp + G4 P{60*100} # Let temps settle for 60s FAST_QGL # QGL after soak #BED_MESH_CALIBRATE G90 # Absolute positioning SMART_PARK M109 S{hotendTemp} # Set extruder to printing temperature + SET_GCODE_OFFSET Z=0.10 # add a little offset for hotend thermal expansion + # needs fine tuning, long meltzones require more G1 X{90} F{500*60} # Avoid brush VORON_PURGE # Purge M117 Printing... @@ -152,10 +157,10 @@ gcode: {% set z_offset = 2 %} # Home first if needed {% if printer.toolhead.homed_axes != "xyz" %} - G28 + G28 METHOD=PROXIMITY {% endif %} - QUAD_GANTRY_LEVEL horizontal_move_z=7 retry_tolerance=1 - QUAD_GANTRY_LEVEL horizontal_move_z={z_offset} + QUAD_GANTRY_LEVEL horizontal_move_z=7 retry_tolerance=1 PROBE_METHOD=PROXIMITY + QUAD_GANTRY_LEVEL horizontal_move_z={z_offset} PROBE_METHOD=PROXIMITY G28 Z [gcode_macro SAFE_RETRACT] diff --git a/beacon.cfg b/beacon.cfg index 9bcbe57..2398ebe 100644 --- a/beacon.cfg +++ b/beacon.cfg @@ -7,4 +7,17 @@ y_offset: 24.2 # update with offset from nozzle on your machine mesh_main_direction: x mesh_runs: 2 -default_model_name: dfhSmooth +default_model_name: default + +home_xy_position: 90, 90 # update with your bed center +home_z_hop: 3 +home_z_hop_speed: 30 +home_xy_move_speed: 25 +home_method: contact # use proximity for induction homing +home_method_when_homed: proximity # after initial calibration use induction +home_autocalibrate: unhomed # contact will calibrate beacon on first home + +home_gcode_pre_x: _HOME_PRE_AXIS AXIS=X +home_gcode_post_x: _HOME_POST_AXIS AXIS=X +home_gcode_pre_y: _HOME_PRE_AXIS AXIS=Y +home_gcode_post_y: _HOME_POST_AXIS AXIS=Y diff --git a/fans.cfg b/fans.cfg index 1d01cd6..02dbce0 100644 --- a/fans.cfg +++ b/fans.cfg @@ -38,7 +38,7 @@ sensor_type: temperature_mcu min_temp: 0 max_temp: 100 -[temperature_sensor mid_chamber] +[temperature_sensor _mid_chamber] sensor_type: Generic 3950 sensor_pin: PA3 # TH2 min_temp: 0 diff --git a/printer.cfg b/printer.cfg index d324948..e00e5e0 100644 --- a/printer.cfg +++ b/printer.cfg @@ -59,10 +59,10 @@ gantry_corners: -60.2,-10.4 244.1,234.5 points: - 13,2 - 13,150 - 160,150 - 160,2 + 13,5 + 13,146 + 150,146 + 150,5 speed: 600 horizontal_move_z: 10 @@ -74,18 +74,19 @@ max_adjust: 10 speed: 600 horizontal_move_z: 0 mesh_min: 15,28 -mesh_max: 165,146 +mesh_max: 150,146 zero_reference_position: 90, 90 -probe_count: 64,64 -mesh_pps: 2,2 +probe_count: 32,16 +#mesh_pps: 2,2 algorithm: bicubic -bicubic_tension: 0.2 -fade_end: 10 +#bicubic_tension: 0.2 +#fade_end: 10 [include steppers.cfg] [include fans.cfg] [include basic_macros.cfg] -[include sensorless.cfg] +#[include sensorless.cfg] +[include sensorless_contact.cfg] [include calibration_macros.cfg] [include force_move.cfg] [include timelapse.cfg] @@ -109,20 +110,20 @@ shaper_freq_y = 64.0 #*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated. #*# #*# [beacon model default] -#*# model_coef = 1.5395985279781224, -#*# 1.8746919758344793, -#*# 0.7211928692741341, -#*# 0.37863341299970016, -#*# 0.4288234773482902, -#*# -0.016636723047144728, -#*# -0.3392151005518095, -#*# 0.25655162255076586, -#*# 0.25043309664778046, -#*# -0.09109979574600278 -#*# model_domain = 3.25744307233467e-07,3.350944046610817e-07 +#*# model_coef = 1.6100259673885389, +#*# 1.9376348663935683, +#*# 0.7395871386879043, +#*# 0.29226082700302425, +#*# 0.2601348070014482, +#*# 0.319091274729962, +#*# -0.1711431052020036, +#*# -0.30633191875220134, +#*# 0.1628838399809095, +#*# 0.1606397177930352 +#*# model_domain = 3.2802121215684144e-07,3.352464164883853e-07 #*# model_range = 0.200000,5.000000 -#*# model_temp = 66.173741 -#*# model_offset = 0.00000 +#*# model_temp = 22.320787 +#*# model_offset = -0.47500 #*# #*# [beacon model prusaSmooth] #*# model_coef = 1.5567653645433952, @@ -158,15 +159,15 @@ shaper_freq_y = 64.0 #*# #*# [beacon model dfhSmooth] #*# model_coef = 1.603699926823906, -#*# 1.9192209938017089, -#*# 0.7356581743058401, -#*# 0.3578123658402552, -#*# 0.26364536335808125, -#*# 0.13126799276453163, -#*# -0.18239809965109963, -#*# -0.07930698695079087, -#*# 0.18033440108180993, -#*# 0.07354122366320748 +#*# 1.9192209938017089, +#*# 0.7356581743058401, +#*# 0.3578123658402552, +#*# 0.26364536335808125, +#*# 0.13126799276453163, +#*# -0.18239809965109963, +#*# -0.07930698695079087, +#*# 0.18033440108180993, +#*# 0.07354122366320748 #*# model_domain = 3.285743356454094e-07,3.355200041639115e-07 #*# model_range = 0.200000,5.000000 #*# model_temp = 67.883978 diff --git a/sensorless.cfg b/sensorless.cfg index 5157d2d..45bfa33 100644 --- a/sensorless.cfg +++ b/sensorless.cfg @@ -56,9 +56,9 @@ gcode: {% if home_all or 'Z' in params %} G90 # Absolute positioning # park above bed center - G1 X90 Y{90 - probe_offset} + G1 X90 Y{90 - probe_offset} # With probe G28 Z G91 G1 Z10 {% endif %} - G90 + diff --git a/sensorless_contact.cfg b/sensorless_contact.cfg new file mode 100644 index 0000000..694e203 --- /dev/null +++ b/sensorless_contact.cfg @@ -0,0 +1,25 @@ +[gcode_macro _HOME_PRE_AXIS] +gcode: + # Adapt this for your printer. + {% set HOME_CURRENT = 0.5 %} + SET_TMC_CURRENT STEPPER=stepper_x CURRENT={HOME_CURRENT} + SET_TMC_CURRENT STEPPER=stepper_y CURRENT={HOME_CURRENT} + +[gcode_macro _HOME_POST_AXIS] +gcode: + {% set axis = params.AXIS %} + {% set RUN_CURRENT_X = printer.configfile.settings['tmc2209 stepper_x'].run_current|float %} + {% set RUN_CURRENT_Y = printer.configfile.settings['tmc2209 stepper_y'].run_current|float %} + + # Move away + SAVE_GCODE_STATE NAME=home_post_axis + G91 + G0 {axis}-10 F3600 + RESTORE_GCODE_STATE NAME=home_post_axis + + # Make sure StallGuard registers are cleared + M400 + # Set current during print + SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CURRENT_X} + SET_TMC_CURRENT STEPPER=stepper_y CURRENT={RUN_CURRENT_Y} + diff --git a/steppers.cfg b/steppers.cfg index 375171c..900c589 100644 --- a/steppers.cfg +++ b/steppers.cfg @@ -13,9 +13,8 @@ rotation_distance: 32 microsteps: 32 full_steps_per_rotation:200 position_min: 0 -position_endstop: 0 +position_endstop: 172 position_max: 172 -homing_positive_dir: false homing_speed: 50 #Max 100 homing_retract_dist: 0 # Must set 0 for sensorless @@ -40,7 +39,6 @@ full_steps_per_rotation:200 position_min: 0 position_endstop: 188 position_max: 188 -homing_positive_dir: true homing_speed: 50 #Max 100 homing_retract_dist: 0 # Must set 0 for sensorless @@ -50,7 +48,7 @@ interpolate: false run_current: 1.3 diag_pin: ^PC2 -driver_SGTHRS: 110 # 255 is most sensitive value, 0 is least sensitive +driver_SGTHRS: 120 # 255 is most sensitive value, 0 is least sensitive ##################################################################### diff --git a/tinytemp.cfg b/tinytemp.cfg index 6687237..86f3585 100644 --- a/tinytemp.cfg +++ b/tinytemp.cfg @@ -24,18 +24,18 @@ aliases: [temperature_sensor chamber] sensor_type: temperature_combined -sensor_list: temperature_sensor bottom_chamber, temperature_sensor top_chamber, temperature_sensor mid_chamber +sensor_list: temperature_sensor _bottom_chamber, temperature_sensor _top_chamber, temperature_sensor _mid_chamber combination_method: mean maximum_deviation: 99999999999999 -[temperature_sensor bottom_chamber] +[temperature_sensor _bottom_chamber] sensor_type: Generic 3950 sensor_pin: tinytemp:T1 pullup_resistor: 4000 #min_temp: 0 #max_temp: 200 -[temperature_sensor top_chamber] +[temperature_sensor _top_chamber] sensor_type: Generic 3950 sensor_pin: tinytemp:T2 pullup_resistor: 4000