v2.4: restructure all the things

This commit is contained in:
Konstantin Koslowski 2021-11-01 21:24:21 +01:00
parent b67abe3a17
commit a8f3ab247a
13 changed files with 822 additions and 737 deletions

View file

@ -32,6 +32,25 @@ restart_method: command
##--------------------------------------------------------------------
[gcode_macro zc]
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:
{% set speed = params.SPEED|default(300)|int %}
{action_respond_info("moving with F%d" % speed)}
G0 Z30 F{speed}
G0 Z10 F{speed}
[printer]
kinematics: corexy
max_velocity: 300
@ -51,7 +70,7 @@ square_corner_velocity: 5.0
#####################################################################
[include fluidd.cfg]
[include macros.cfg]
[include macros/_init.cfg]
[include neopixel.cfg]
[include fans.cfg]
[include input_shaper.cfg]
@ -75,7 +94,7 @@ endstop_pin: PG6
position_min: 0
position_endstop: 300
position_max: 300
homing_speed: 30 # Max 100
homing_speed: 30 # speed: mm/sec, feedrate: mm/min
homing_retract_dist: 5
homing_positive_dir: true
@ -96,7 +115,7 @@ rotation_distance: 40
microsteps: 16
full_steps_per_rotation: 400 # 200: 1.8 deg stepper, 400: 0.9 deg stepper
endstop_pin: PG9
position_min: 15 # Camera
position_min: 0
position_endstop: 305
position_max: 305
homing_speed: 30 # Max 100
@ -125,16 +144,13 @@ rotation_distance: 40
gear_ratio: 80:16
microsteps: 16
endstop_pin: PG10
## Z-position of nozzle (in mm) to z-endstop trigger point relative to print surface (Z0)
## (+) value = endstop above Z0, (-) value = endstop below
## Increasing position_endstop brings nozzle closer to the bed
## After you run Z_ENDSTOP_CALIBRATE, position_endstop will be stored at the very end of your config
#position_endstop: -0.5
## actual_position = measured_position_endstop - position_endstop
position_endstop: 0.5
position_max: 290
position_min: -5
homing_speed: 11.0 # speed: mm/sec, feedrate: mm/min
second_homing_speed: 3
homing_retract_dist: 3
homing_speed: 13.0 # speed: mm/sec, feedrate: mm/min
second_homing_speed: 4
homing_retract_dist: 13
[tmc2209 stepper_z]
uart_pin: PC6
@ -276,7 +292,7 @@ max_temp: 120
pin: ^PG11
x_offset: 0
y_offset: 25.0
#z_offset: 0
z_offset: 10
speed: 6
lift_speed: 11
samples: 5
@ -329,7 +345,7 @@ timeout: 1800
## replaced with homing_override in klicky-probe.cfg
# [safe_z_home]
# ## XY Location of the Z Endstop Switch
# home_xy_position: 208, 305
# home_xy_position: 205, 305
# speed: 100
# z_hop: 10
# z_hop_speed: 25
@ -356,9 +372,9 @@ points:
50,225
250,225
250,40
speed: 100
speed: 150
horizontal_move_z: 15
retries: 8
retries: 5
retry_tolerance: 0.0075
max_adjust: 10
@ -380,11 +396,11 @@ max_adjust: 10
#*# [bed_mesh default]
#*# version = 1
#*# points =
#*# -0.002500, -0.015000, -0.002500, -0.005000, -0.045000
#*# -0.000000, -0.012500, 0.002500, -0.005000, -0.040000
#*# -0.002500, 0.002500, 0.000000, 0.012500, -0.032500
#*# -0.012500, -0.007500, 0.025000, 0.017500, 0.000000
#*# 0.057500, 0.072500, 0.042500, 0.075000, 0.027500
#*# -0.032500, 0.002500, 0.015000, 0.015000, -0.042500
#*# -0.032500, -0.015000, 0.002500, 0.002500, -0.055000
#*# -0.040000, -0.015000, 0.000000, 0.000000, -0.060000
#*# -0.030000, -0.022500, 0.010000, 0.010000, -0.055000
#*# 0.075000, 0.015000, 0.052500, 0.055000, -0.007500
#*# tension = 0.2
#*# min_x = 40.0
#*# algo = bicubic
@ -395,9 +411,3 @@ max_adjust: 10
#*# max_y = 280.0
#*# mesh_x_pps = 2
#*# max_x = 260.0
#*#
#*# [stepper_z]
#*# position_endstop = 0.817
#*#
#*# [probe]
#*# z_offset = 7.660