Skip to content

Commit

Permalink
refactored the multikinematics system and moved TMCs conf to mcu.cfg
Browse files Browse the repository at this point in the history
  • Loading branch information
Frix-x committed May 28, 2023
1 parent 6979609 commit e2e8408
Show file tree
Hide file tree
Showing 50 changed files with 241 additions and 287 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[stepper_z]
[stepper_x]
rotation_distance: 40
microsteps: 64
full_steps_per_rotation: 400
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@ rotation_distance: 40
microsteps: 64
full_steps_per_rotation: 200

[stepper_y]
rotation_distance: 40
microsteps: 64
full_steps_per_rotation: 200

# We also include the default wiring and speeds from here to avoid duplicating
[include default_wiring.cfg]
[include default_speed.cfg]
12 changes: 12 additions & 0 deletions config/hardware/axis/X/TMC/TMC2209.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# X TMC2209 definition

[gcode_macro _USER_VARIABLES]
variable_x_driver: "TMC2209"
gcode:

[tmc2209 stepper_x]
uart_pin: X_TMCUART
interpolate: False
run_current: 0.8
sense_resistor: 0.110
stealthchop_threshold: 0
19 changes: 19 additions & 0 deletions config/hardware/axis/X/TMC/TMC2209_V0specific.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# X TMC2209 definition with some custom TMC parameters to reduce the
# VFAs (Vertical Fine Artifacts) produced by the first V0 LDO motors kit


# Including first the default XY TMC2209 file
[include TMC2209.cfg]

# Then applying overrides for specific V0 parameters from LDO
[tmc2209 stepper_x]
run_current: 0.7
# stealthchop_threshold: 999999
driver_TBL: 2
driver_TOFF: 2
driver_HEND: 1
driver_HSTRT: 4
driver_PWM_LIM: 8
driver_PWM_GRAD: 8
driver_PWM_FREQ: 1
driver_PWM_REG: 4
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,3 @@
homing_speed: 60
homing_retract_dist: 0
homing_positive_dir: true

[stepper_z]
homing_speed: 15
second_homing_speed: 8
homing_retract_dist: 3.0
5 changes: 5 additions & 0 deletions config/hardware/axis/X/default_wiring.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[stepper_x]
step_pin: X_STEP
dir_pin: X_DIR
enable_pin: !X_ENABLE
endstop_pin: X_STOP
19 changes: 0 additions & 19 deletions config/hardware/axis/XY/TMC/xy_TMC2209.cfg

This file was deleted.

29 changes: 0 additions & 29 deletions config/hardware/axis/XY/TMC/xy_TMC2209_V0specific.cfg

This file was deleted.

9 changes: 0 additions & 9 deletions config/hardware/axis/XY/default_speed.cfg

This file was deleted.

11 changes: 0 additions & 11 deletions config/hardware/axis/XY/default_wiring.cfg

This file was deleted.

19 changes: 0 additions & 19 deletions config/hardware/axis/XZ/TMC/xz_TMC2209.cfg

This file was deleted.

11 changes: 0 additions & 11 deletions config/hardware/axis/XZ/default_wiring.cfg

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
[stepper_x]
rotation_distance: 40
microsteps: 64
full_steps_per_rotation: 400

[stepper_y]
rotation_distance: 40
microsteps: 64
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Y TMC2209 definition

[gcode_macro _USER_VARIABLES]
variable_ytmc_driver: "TMC2209"
variable_y_driver: "TMC2209"
gcode:

[tmc2209 stepper_y]
Expand Down
19 changes: 19 additions & 0 deletions config/hardware/axis/Y/TMC/TMC2209_V0specific.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Y TMC2209 definition with some custom TMC parameters to reduce the
# VFAs (Vertical Fine Artifacts) produced by the first V0 LDO motors kit


# Including first the default XY TMC2209 file
[include TMC2209.cfg]

# Then applying overrides for specific V0 parameters from LDO
[tmc2209 stepper_y]
run_current: 0.7
# stealthchop_threshold: 999999
driver_TBL: 2
driver_TOFF: 2
driver_HEND: 1
driver_HSTRT: 4
driver_PWM_LIM: 8
driver_PWM_GRAD: 8
driver_PWM_FREQ: 1
driver_PWM_REG: 4
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# User variable only needed here as they are called recursively
[gcode_macro _USER_VARIABLES]
variable_ztmc_driver: "TMC2209"
variable_z_driver: "TMC2209"
gcode:


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[include z_TMC2209_1-Motor.cfg]
[include TMC2209_1-Motor.cfg]

[tmc2209 stepper_z1]
uart_pin: Z1_TMCUART
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[include z_TMC2209_3-Motors.cfg]
[include TMC2209_3-Motors.cfg]

[tmc2209 stepper_z3]
uart_pin: Z3_TMCUART
Expand Down
File renamed without changes.
18 changes: 18 additions & 0 deletions config/hardware/axis/Z/TriZero_1.8deg.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[stepper_z]
rotation_distance: 32
microsteps: 32
full_steps_per_rotation: 200

[stepper_z1]
rotation_distance: 32
microsteps: 32
full_steps_per_rotation: 200

[stepper_z2]
rotation_distance: 32
microsteps: 32
full_steps_per_rotation: 200

# We also include the default wiring and speeds from here to avoid duplicating
[include default_wiring_3M.cfg]
[include default_speed.cfg]
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
[stepper_x]
rotation_distance: 40
microsteps: 64
full_steps_per_rotation: 400

[stepper_z]
rotation_distance: 40
microsteps: 64
full_steps_per_rotation: 400

# We also include the default wiring and speeds from here to avoid duplicating
[include default_wiring.cfg]
[include default_wiring_1M.cfg]
[include default_speed.cfg]
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
[stepper_x]
rotation_distance: 40
microsteps: 64
full_steps_per_rotation: 200

[stepper_z]
rotation_distance: 40
microsteps: 64
full_steps_per_rotation: 200

# We also include the default wiring and speeds from here to avoid duplicating
[include default_wiring.cfg]
[include default_wiring_1M.cfg]
[include default_speed.cfg]
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Extruder TMC2209 definition
[gcode_macro _USER_VARIABLES]
variable_etmc_driver: "TMC2209"
variable_e_driver: "TMC2209"
gcode:


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Extruder TMC2240 definition
[gcode_macro _USER_VARIABLES]
variable_etmc_driver: "TMC2240"
variable_e_driver: "TMC2240"
gcode:

[tmc2240 extruder]
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# This probe type is for a dockable probe (Klicky, Euclid, etc) used directly as a virtual
# Z endstop rather than with an existing physical endstop. This configuration is common
# Z endstop rather than with an existing physical endstop. This configuration is common
# if you are running a Voron Switchwire or other "bed slinger" that does not have a fixed Z
# endstop at bed height.

[gcode_macro _USER_VARIABLES]
variable_probe_type_enabled: "dockable_virtual_endstop"
variable_probe_type_enabled: "dockable_virtual"
variable_startprint_actions: "bed_soak", "extruder_preheating", "chamber_soak", "tilt_calib", "extruder_heating", "purge", "clean", "z_offset", "bedmesh", "primeline"
gcode:

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# This probe type is for an inductive probe used directly as a virtual Z endstop
# rather than with an existing physical endstop. This configuration is common
# rather than with an existing physical endstop. This configuration is common
# if you are running a Voron Switchwire or other "bed slinger" that does not
# have a fixed Z endstop at bed height.

[gcode_macro _USER_VARIABLES]
variable_probe_type_enabled: "inductive_virtual_endstop"
variable_probe_type_enabled: "inductive_virtual"
variable_startprint_actions: "bed_soak", "extruder_preheating", "chamber_soak", "tilt_calib", "extruder_heating", "purge", "clean", "z_offset", "bedmesh", "primeline"
gcode:

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[printer]
kinematics: cartesian
max_velocity: 200
max_accel: 1000
max_z_velocity: 50
max_accel: 3000
max_z_velocity: 30
max_z_accel: 500
square_corner_velocity: 5.0
square_corner_velocity: 5.0
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ max_velocity: 400
max_accel: 8000
max_z_velocity: 50
max_z_accel: 500
square_corner_velocity: 5.0
square_corner_velocity: 5.0
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[printer]
kinematics: corexz
max_velocity: 200
max_velocity: 400
max_accel: 1000
max_z_velocity: 200
max_z_accel: 1000
square_corner_velocity: 5.0
square_corner_velocity: 5.0
File renamed without changes.
Loading

0 comments on commit e2e8408

Please sign in to comment.