Compare commits

..

No commits in common. "c4ded7b4cb0c478e5b8c7072b2aed56412136f29" and "dedcecd944e8370d7e921c32fdcb66313f1612e6" have entirely different histories.

17 changed files with 119 additions and 154 deletions

View File

@ -5,7 +5,6 @@ klippy_uds_address = /home/biqu/printer_data/comms/klippy.sock
[file_manager] [file_manager]
enable_object_processing = True enable_object_processing = True
default_metadata_parser_timeout = 30
[authorization] [authorization]
trusted_clients = trusted_clients =
@ -25,16 +24,6 @@ cors_domains =
[update_manager] [update_manager]
channel = dev channel = dev
refresh_interval = 168 refresh_interval = 168
enable_auto_refresh = False
[update_manager klipper_tmc_autotune]
type = git_repo
channel = dev
path = ~/klipper_tmc_autotune
origin = https://github.com/andrewmcgr/klipper_tmc_autotune.git
managed_services = klipper
primary_branch = main
install_script = install.sh
[update_manager mainsail-config] [update_manager mainsail-config]
type = git_repo type = git_repo
@ -80,7 +69,7 @@ is_system_service = False
[update_manager KlipperScreen] [update_manager KlipperScreen]
type = git_repo type = git_repo
path = ~/KlipperScreen path = ~/KlipperScreen
origin = https://github.com/KlipperScreen/KlipperScreen.git origin = https://github.com/jordanruthe/KlipperScreen.git
virtualenv = ~/.KlipperScreen-env virtualenv = ~/.KlipperScreen-env
requirements = scripts/KlipperScreen-requirements.txt requirements = scripts/KlipperScreen-requirements.txt
system_dependencies = scripts/system-dependencies.json system_dependencies = scripts/system-dependencies.json

View File

@ -7,22 +7,14 @@
#~# --- Do not edit below this line. This section is auto generated --- #~# #~# --- Do not edit below this line. This section is auto generated --- #~#
#~# #~#
#~# [main] #~# [main]
#~# theme = colorized
#~# screen_blanking = 300 #~# screen_blanking = 300
#~# show_heater_power = True #~# show_heater_power = True
#~# move_speed_xy = 491 #~# move_speed_xy = 491
#~# move_speed_z = 300 #~# move_speed_z = 300
#~# print_sort_dir = date_desc
#~# print_view = list #~# print_view = list
#~# #~#
#~# [graph Printer] #~# [graph Printer]
#~# temperature_fan ebay_fans = False
#~# extruder = False
#~# temperature_sensor frame-front-right = False
#~# temperature_sensor frame-rear-left = False
#~# temperature_sensor mcu = False #~# temperature_sensor mcu = False
#~# temperature_sensor cb2 = False
#~# heater_bed = False #~# heater_bed = False
#~# temperature_sensor t0 = False
#~# temperature_sensor t0_motor = False
#~# temperature_sensor stepper_x = False
#~# #~#

View File

@ -1 +1 @@
#[include firmware-retraction.cfg] [include firmware-retraction.cfg]

View File

View File

@ -50,17 +50,10 @@ max_delta: 5
sensor_type: temperature_host sensor_type: temperature_host
min_temp: 15 min_temp: 15
max_temp: 80 max_temp: 80
target_temp: 45 target_temp: 35
max_power: 0.5 max_power: 0.5
shutdown_speed: 0 shutdown_speed: 0
[fan_generic bed_fans]
# Print Cooling Fan - CNC_FAN0
pin: PF6
hardware_pwm: false
[fan_generic exhaust] [fan_generic exhaust]
pin: PF9 pin: PF9
hardware_pwm: false hardware_pwm: false
@ -87,12 +80,7 @@ speed: 500
horizontal_move_z: 12 horizontal_move_z: 12
retries: 5 retries: 5
retry_tolerance: 0.025 retry_tolerance: 0.025
max_adjust: 15 max_adjust: 10
[led daylight]
white_pin: PA0
initial_WHITE: 0.2
[board_pins] [board_pins]
aliases: aliases:

View File

@ -1,3 +1,27 @@
[motor_constants 17hs19-2004s-ab]
# Coil resistance, Ohms
resistance: 1.30
# Coil inductance, Henries
inductance: 0.0027
# Holding torque, Nm
holding_torque: 0.67
# Nominal rated current, Amps
max_current: 2.00
# Steps per revolution (1.8deg motors use 200, 0.9deg motors use 400)
steps_per_revolution: 200
[motor_constants 17hs19-2004s-c]
# Coil resistance, Ohms
resistance: 1.30
# Coil inductance, Henries
inductance: 0.003
# Holding torque, Nm
holding_torque: 0.59
# Nominal rated current, Amps
max_current: 2.00
# Steps per revolution (1.8deg motors use 200, 0.9deg motors use 400)
steps_per_revolution: 200
##################################################################### #####################################################################
# X/Y Stepper Settings # X/Y Stepper Settings
##################################################################### #####################################################################
@ -14,10 +38,13 @@ endstop_pin: tmc2209_stepper_x:virtual_endstop
position_min: 0 position_min: 0
position_endstop: 350 position_endstop: 350
position_max: 350 position_max: 350
homing_speed: 100 #Max 100 homing_speed: 150 #Max 100
homing_retract_dist: 5 homing_retract_dist: 5
homing_positive_dir: true homing_positive_dir: true
#[autotune_tmc stepper_x]
#motor: 17hs19-2004s-ab
[temperature_sensor stepper_x] [temperature_sensor stepper_x]
sensor_type: Generic 3950 sensor_type: Generic 3950
sensor_pin: PA7 sensor_pin: PA7
@ -28,9 +55,12 @@ gcode_id: X Stepper
## Make sure to update below for your relevant driver (2208 or 2209) ## Make sure to update below for your relevant driver (2208 or 2209)
[tmc2209 stepper_x] [tmc2209 stepper_x]
uart_pin: PC13 uart_pin: PC13
interpolate: false
run_current: 1 run_current: 1
sense_resistor: 0.110
stealthchop_threshold: 0
driver_SGTHRS: 60
diag_pin: PF4 diag_pin: PF4
interpolate: true
## Y Stepper on Motor2 (A Motor) ## Y Stepper on Motor2 (A Motor)
[stepper_y] [stepper_y]
@ -44,18 +74,22 @@ full_steps_per_rotation:200 #set to 400 for 0.9 degree stepper
position_min: 0 position_min: 0
position_endstop: 350 position_endstop: 350
position_max: 350 position_max: 350
homing_speed: 100 #Max 100 homing_speed: 150 #Max 100
homing_retract_dist: 5 homing_retract_dist: 5
homing_positive_dir: true homing_positive_dir: true
#[autotune_tmc stepper_y]
#motor: 17hs19-2004s-ab
## Make sure to update below for your relevant driver (2208 or 2209) ## Make sure to update below for your relevant driver (2208 or 2209)
[tmc2209 stepper_y] [tmc2209 stepper_y]
uart_pin: PE3 uart_pin: PE3
interpolate: false
run_current: 1 run_current: 1
sense_resistor: 0.110
stealthchop_threshold: 0
diag_pin: PF3 diag_pin: PF3
interpolate: true driver_SGTHRS: 60
##################################################################### #####################################################################
# Z Stepper Settings # Z Stepper Settings
@ -70,17 +104,25 @@ rotation_distance: 40
gear_ratio: 80:16 gear_ratio: 80:16
microsteps: 16 microsteps: 16
endstop_pin: probe:z_virtual_endstop endstop_pin: probe:z_virtual_endstop
#endstop_pin: ^PF5
position_max: 310 position_max: 310
position_min: -5 position_min: -5
homing_speed: 8 homing_speed: 8
second_homing_speed: 3 second_homing_speed: 3
homing_retract_dist: 3 homing_retract_dist: 3
#position_endstop: 0
## Make sure to update below for your relevant driver (2208 or 2209) ## Make sure to update below for your relevant driver (2208 or 2209)
[tmc2209 stepper_z] [tmc2209 stepper_z]
uart_pin: PB9 uart_pin: PB9
interpolate: true interpolate: true
run_current: 0.8 run_current: 0.8
sense_resistor: 0.110
stealthchop_threshold: 0
#[autotune_tmc stepper_z]
#motor: 17hs19-2004s-c
## Z1 Stepper - Rear Left on Motor5 ## Z1 Stepper - Rear Left on Motor5
@ -97,6 +139,8 @@ microsteps: 16
uart_pin: PG14 uart_pin: PG14
interpolate: true interpolate: true
run_current: 0.8 run_current: 0.8
sense_resistor: 0.110
stealthchop_threshold: 0
#[autotune_tmc stepper_z1] #[autotune_tmc stepper_z1]
#motor: 17hs19-2004s-c #motor: 17hs19-2004s-c
@ -115,6 +159,11 @@ microsteps: 16
uart_pin: PG10 uart_pin: PG10
interpolate: true interpolate: true
run_current: 0.8 run_current: 0.8
sense_resistor: 0.110
stealthchop_threshold: 0
#[autotune_tmc stepper_z2]
#motor: 17hs19-2004s-c
## Z3 Stepper - Front Right on Motor7 ## Z3 Stepper - Front Right on Motor7
[stepper_z3] [stepper_z3]
@ -130,3 +179,8 @@ microsteps: 16
uart_pin: PD5 uart_pin: PD5
interpolate: true interpolate: true
run_current: 0.8 run_current: 0.8
sense_resistor: 0.110
stealthchop_threshold: 0
#[autotune_tmc stepper_z3]
#motor: 17hs19-2004s-c

View File

@ -3,7 +3,6 @@
gcode: gcode:
SAVE_GCODE_STATE NAME=STATE_PRINT_END SAVE_GCODE_STATE NAME=STATE_PRINT_END
SET_FAN_SPEED FAN=exhaust SPEED=1 SET_FAN_SPEED FAN=exhaust SPEED=1
SET_FAN_SPEED FAN=bed_fans SPEED=0
M400 ; wait for buffer to clear M400 ; wait for buffer to clear
G92 E0 ; zero the extruder G92 E0 ; zero the extruder
G1 E-10.0 F3600 ; retract filament G1 E-10.0 F3600 ; retract filament
@ -24,6 +23,4 @@ gcode:
# moves when restoring the state, explicitly set MOVE=0. # moves when restoring the state, explicitly set MOVE=0.
SET_SKEW CLEAR=1 SET_SKEW CLEAR=1
RESTORE_GCODE_STATE NAME=STATE_PRINT_END MOVE=0 RESTORE_GCODE_STATE NAME=STATE_PRINT_END MOVE=0
# disable motors
M84

View File

@ -35,10 +35,10 @@ gcode:
## Uncomment if you have a Nevermore. ## Uncomment if you have a Nevermore.
#SET_PIN PIN=nevermore VALUE=1 # Turns on the nevermore #SET_PIN PIN=nevermore VALUE=1 # Turns on the nevermore
G1 X{x_wait} Y{y_wait} Z15 F9000 # Goes to center of the bed G1 X{x_wait} Y{y_wait} Z15 F9000 # Goes to center of the bed
M190 S{target_bed} # Sets the target temp for the bed M190 S{target_bed} # Sets the target temp for the bed
SET_DISPLAY_TEXT MSG="Heatsoak: {target_chamber}c" # Displays info SET_DISPLAY_TEXT MSG="Heatsoak: {target_chamber}c" # Displays info
SET_FAN_SPEED FAN=bed_fans SPEED=1
TEMPERATURE_WAIT SENSOR="temperature_sensor chamber" MINIMUM={target_chamber} # Waits for chamber to reach desired temp TEMPERATURE_WAIT SENSOR="temperature_sensor chamber" MINIMUM={target_chamber} # Waits for chamber to reach desired temp
# If the bed temp is not over 90c, then it skips the heatsoak and just heats up to set temp with a 5min soak # If the bed temp is not over 90c, then it skips the heatsoak and just heats up to set temp with a 5min soak

View File

@ -10,10 +10,11 @@ gcode:
SET_TMC_CURRENT STEPPER=stepper_y CURRENT={HOME_CURRENT} SET_TMC_CURRENT STEPPER=stepper_y CURRENT={HOME_CURRENT}
# Home # Home
G28 X F2400 G28 X
# Move away # Move away
G91 G91
G1 X-10 G1 X-10 F1200
# Wait just a second… (give StallGuard registers time to clear) # Wait just a second… (give StallGuard registers time to clear)
G4 P1000 G4 P1000
# Set current during print # Set current during print
@ -32,10 +33,10 @@ gcode:
SET_TMC_CURRENT STEPPER=stepper_y CURRENT={HOME_CURRENT} SET_TMC_CURRENT STEPPER=stepper_y CURRENT={HOME_CURRENT}
# Home # Home
G28 Y F2400 G28 Y
# Move away # Move away
G91 G91
G1 Y-10 G1 Y-10 F1200
# Wait just a second… (give StallGuard registers time to clear) # Wait just a second… (give StallGuard registers time to clear)
G4 P1000 G4 P1000

View File

@ -3,7 +3,7 @@ axes: xyz
set_position_z: 0 set_position_z: 0
gcode: gcode:
G0 Z15 G0 Z5
{% set home_all = 'X' not in params and 'Y' not in params and 'Z' not in params %} {% set home_all = 'X' not in params and 'Y' not in params and 'Z' not in params %}
{% if home_all or 'X' in params %} {% if home_all or 'X' in params %}
@ -15,6 +15,7 @@ gcode:
{% endif %} {% endif %}
{% if home_all or 'Z' in params %} {% if home_all or 'Z' in params %}
G0 X175 Y175 F18000
G28 Z G28 Z
G1 Z10 G1 Z10
{% endif %} {% endif %}

View File

@ -1,8 +1,8 @@
[input_shaper] [input_shaper]
shaper_freq_x: 93 shaper_freq_x: 58.6
shaper_type_x: 3hump_ei shaper_type_x: mzv
damping_ratio_x: 0.094 damping_ratio_x: 0.073
shaper_freq_y: 48 shaper_freq_y: 65.4
shaper_type_y: ei shaper_type_y: 2hump_ei
damping_ratio_y: 0.142 damping_ratio_y: 0.051

View File

@ -1,8 +1,7 @@
[include bed_mesh.cfg] [include bed_mesh.cfg]
[include input-shaper.cfg] [include input-shaper.cfg]
[include shake-n-tune.cfg] [include shake-n-tune.cfg]
#[include firmware-retraction.cfg] [include firmware-retraction.cfg]
[include homing-override.cfg] [include homing-override.cfg]
[include arcs.cfg] [include arcs.cfg]
[include skew.cfg] [include skew.cfg]
[include tmc-autotune.cfg]

View File

@ -1,39 +1,27 @@
[motor_constants 17hs19-2004s-ab] [motor_constants 17hS19-2004s-ab]
resistance: 1.30 resistance: 1.30
# Coil inductance, Henries
inductance: 0.0027 inductance: 0.0027
# Holding torque, Nm
holding_torque: 0.67 holding_torque: 0.67
# Nominal rated current, Amps
max_current: 2.00 max_current: 2.00
steps_per_revolution: 200 # Steps per revolution (1.8deg motors use 200, 0.9deg motors use 400)
[motor_constants 17hs19-2004s-c]
resistance: 1.40
inductance: 0.003
holding_torque: 0.59
max_current: 2.00
steps_per_revolution: 200 steps_per_revolution: 200
[autotune_tmc stepper_x] [autotune_tmc stepper_x]
motor: 17hs19-2004s-ab motor: ldo-42sth48-2004mah
sg4_thrs: 150
tuning_goal: performance
[autotune_tmc stepper_y] [autotune_tmc stepper_y]
motor: 17hs19-2004s-ab motor: ldo-42sth48-2004mah
sg4_thrs: 100
tuning_goal: performance
[autotune_tmc stepper_z] [autotune_tmc stepper_z]
motor: 17hs19-2004s-c motor: ldo-42sth48-2004ac
tuning_goal: performance
[autotune_tmc stepper_z1] [autotune_tmc stepper_z1]
motor: 17hs19-2004s-c motor: ldo-42sth48-2004ac
tuning_goal: performance
[autotune_tmc stepper_z2] [autotune_tmc stepper_z2]
motor: 17hs19-2004s-c motor: ldo-42sth48-2004ac
tuning_goal: performance
[autotune_tmc stepper_z3] [autotune_tmc stepper_z3]
motor: 17hs19-2004s-c motor: ldo-42sth48-2004ac
tuning_goal: performance
[autotune_tmc extruder]
motor: ldo-36sth20-1004ahg

View File

@ -37,7 +37,7 @@ enable_auto_refresh: False
type: git_repo type: git_repo
channel: dev channel: dev
path: ~/klipper_tmc_autotune path: ~/klipper_tmc_autotune
origin: https://github.com/andrewmcgr/klipper_tmc_autotune.git #origin: https://github.com/andrewmcgr/klipper_tmc_autotune.git
managed_services: klipper managed_services: klipper
primary_branch: main primary_branch: main
install_script: install.sh install_script: install.sh
@ -89,7 +89,7 @@ is_system_service: False
[update_manager KlipperScreen] [update_manager KlipperScreen]
type: git_repo type: git_repo
path: ~/KlipperScreen path: ~/KlipperScreen
origin: https://github.com/KlipperScreen/KlipperScreen.git origin: https://github.com/jordanruthe/KlipperScreen.git
virtualenv: ~/.KlipperScreen-env virtualenv: ~/.KlipperScreen-env
requirements: scripts/KlipperScreen-requirements.txt requirements: scripts/KlipperScreen-requirements.txt
system_dependencies: scripts/system-dependencies.json system_dependencies: scripts/system-dependencies.json

View File

@ -1,38 +0,0 @@
[include mainsail.cfg]
[include hardware/hardware.cfg]
[include toolhead/toolhead.cfg]
[include misc/misc.cfg]
[include macros/macros.cfg]
[include config/config.cfg]
[printer]
max_velocity: 500
max_accel: 9000
kinematics: corexy
max_z_velocity: 300 #Max 15 for 12V TMC Drivers, can increase for 24V
max_z_accel: 1000
square_corner_velocity: 5.0
[exclude_object]
#*# <---------------------- SAVE_CONFIG ---------------------->
#*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated.
#*#
#*# [bed_mesh default]
#*# version = 1
#*# points =
#*# -0.005000, -0.037500, -0.097500, -0.085000
#*# -0.020000, -0.025000, 0.002500, -0.105000
#*# 0.027500, -0.012500, -0.020000, -0.170000
#*# -0.065000, -0.070000, -0.075000, -0.072500
#*# x_count = 4
#*# y_count = 4
#*# mesh_x_pps = 2
#*# mesh_y_pps = 2
#*# algo = lagrange
#*# tension = 0.2
#*# min_x = 69.89
#*# max_x = 280.37
#*# min_y = 98.00800000000001
#*# max_y = 252.65800000000002

View File

@ -8,11 +8,11 @@
[printer] [printer]
max_velocity: 500 max_velocity: 500
max_accel: 4000 max_accel: 9000
kinematics: corexy kinematics: corexy
max_z_velocity: 50 #Max 15 for 12V TMC Drivers, can increase for 24V max_z_velocity: 300 #Max 15 for 12V TMC Drivers, can increase for 24V
max_z_accel: 500 max_z_accel: 1000
square_corner_velocity: 12.0 square_corner_velocity: 5.0
[exclude_object] [exclude_object]
@ -22,10 +22,10 @@ square_corner_velocity: 12.0
#*# [bed_mesh default] #*# [bed_mesh default]
#*# version = 1 #*# version = 1
#*# points = #*# points =
#*# -0.005000, -0.037500, -0.097500, -0.085000 #*# -0.005000, -0.037500, -0.097500, -0.085000
#*# -0.020000, -0.025000, 0.002500, -0.105000 #*# -0.020000, -0.025000, 0.002500, -0.105000
#*# 0.027500, -0.012500, -0.020000, -0.170000 #*# 0.027500, -0.012500, -0.020000, -0.170000
#*# -0.065000, -0.070000, -0.075000, -0.072500 #*# -0.065000, -0.070000, -0.075000, -0.072500
#*# x_count = 4 #*# x_count = 4
#*# y_count = 4 #*# y_count = 4
#*# mesh_x_pps = 2 #*# mesh_x_pps = 2
@ -36,8 +36,3 @@ square_corner_velocity: 12.0
#*# max_x = 280.37 #*# max_x = 280.37
#*# min_y = 98.00800000000001 #*# min_y = 98.00800000000001
#*# max_y = 252.65800000000002 #*# max_y = 252.65800000000002
#*#
#*# [skew_correction basic]
#*# xy_skew = 0.003016262322809662
#*# xz_skew = 0.0
#*# yz_skew = 0.0

View File

@ -6,7 +6,7 @@
# See docs/Config_Reference.md for a description of parameters. # See docs/Config_Reference.md for a description of parameters.
[mcu t0] [mcu t0]
canbus_uuid: 09006bc75877 canbus_uuid: 336f4a59eb4e
[temperature_sensor t0] [temperature_sensor t0]
sensor_type: temperature_mcu sensor_type: temperature_mcu
@ -25,15 +25,13 @@ accel_chip: adxl345
probe_points: probe_points:
175, 175, 20 175, 175, 20
[temperature_sensor t0_motor]
sensor_type: Generic 3950
sensor_pin: t0: PA3
[extruder] [extruder]
step_pin: t0: PD0 step_pin: t0: PD0
dir_pin: t0: PD1 dir_pin: t0: PD1
enable_pin: !t0: PD2 enable_pin: !t0: PD2
heater_pin: t0: PB13 heater_pin: t0: PB13
sensor_type: Generic 3950
sensor_pin: t0: PA3
min_temp: 0 min_temp: 0
max_temp: 450 max_temp: 450
microsteps: 16 microsteps: 16
@ -43,28 +41,29 @@ pid_ki: 0.798
pid_kd: 119.265 pid_kd: 119.265
rotation_distance: 5.53014 rotation_distance: 5.53014
filament_diameter: 1.75 filament_diameter: 1.75
nozzle_diameter: 0.6 nozzle_diameter: 0.4
max_extrude_cross_section: 10 max_extrude_cross_section: 5
max_extrude_only_distance: 101 max_extrude_only_distance: 101
pressure_advance: 0.018 pressure_advance: 0.052
sensor_type:MAX31865 # sensor_type:MAX31865
sensor_pin: t0: PA4 # sensor_pin: t0: PA4
spi_bus: spi1 # spi_bus: spi1
rtd_nominal_r: 100 # rtd_nominal_r: 100
rtd_reference_r: 430 # rtd_reference_r: 430
rtd_num_of_wires: 2 # rtd_num_of_wires: 2
# Probe # Probe
##################################################################### #####################################################################
## Probe Port ## Probe Port
[probe] [probe]
pin: t0:PB6 pin: t0:PB6
z_offset: -1.5 z_offset: -1.1
[tmc2209 extruder] [tmc2209 extruder]
uart_pin: t0: PA15 uart_pin: t0: PA15
run_current: 0.9 run_current: 0.650
stealthchop_threshold: 999999
[fan] [fan]
pin: t0: PA0 pin: t0: PA0