From c4ded7b4cb0c478e5b8c7072b2aed56412136f29 Mon Sep 17 00:00:00 2001 From: Frederik Hertzum Date: Thu, 1 May 2025 19:44:27 +0200 Subject: [PATCH] dump --- .moonraker.conf.bkp | 13 ++++++++++- KlipperScreen.conf | 10 +++++++- config/config.cfg | 2 +- hardware/manta.cfg | 10 ++++---- hardware/steppers.cfg | 36 +++-------------------------- macros/print-end.cfg | 5 +++- macros/print-start.cfg | 2 +- macros/sensorless-homing.cfg | 9 ++++---- misc/homing-override.cfg | 3 +-- misc/input-shaper.cfg | 12 +++++----- misc/misc.cfg | 3 ++- misc/tmc-autotune.cfg | 44 +++++++++++++++++++++++------------- moonraker.conf | 4 ++-- printer-20250127_233434.cfg | 38 +++++++++++++++++++++++++++++++ printer.cfg | 21 ++++++++++------- toolhead/t0.cfg | 31 +++++++++++++------------ 16 files changed, 144 insertions(+), 99 deletions(-) create mode 100644 printer-20250127_233434.cfg diff --git a/.moonraker.conf.bkp b/.moonraker.conf.bkp index 4d9b4af..8c49458 100644 --- a/.moonraker.conf.bkp +++ b/.moonraker.conf.bkp @@ -5,6 +5,7 @@ klippy_uds_address = /home/biqu/printer_data/comms/klippy.sock [file_manager] enable_object_processing = True +default_metadata_parser_timeout = 30 [authorization] trusted_clients = @@ -24,6 +25,16 @@ cors_domains = [update_manager] channel = dev 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] type = git_repo @@ -69,7 +80,7 @@ is_system_service = False [update_manager KlipperScreen] type = git_repo path = ~/KlipperScreen -origin = https://github.com/jordanruthe/KlipperScreen.git +origin = https://github.com/KlipperScreen/KlipperScreen.git virtualenv = ~/.KlipperScreen-env requirements = scripts/KlipperScreen-requirements.txt system_dependencies = scripts/system-dependencies.json diff --git a/KlipperScreen.conf b/KlipperScreen.conf index 321beb2..0b121ee 100644 --- a/KlipperScreen.conf +++ b/KlipperScreen.conf @@ -7,14 +7,22 @@ #~# --- Do not edit below this line. This section is auto generated --- #~# #~# #~# [main] +#~# theme = colorized #~# screen_blanking = 300 #~# show_heater_power = True #~# move_speed_xy = 491 #~# move_speed_z = 300 -#~# print_sort_dir = date_desc #~# print_view = list #~# #~# [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 cb2 = False #~# heater_bed = False +#~# temperature_sensor t0 = False +#~# temperature_sensor t0_motor = False +#~# temperature_sensor stepper_x = False #~# diff --git a/config/config.cfg b/config/config.cfg index 4f3497a..981776e 100644 --- a/config/config.cfg +++ b/config/config.cfg @@ -1 +1 @@ -[include firmware-retraction.cfg] \ No newline at end of file +#[include firmware-retraction.cfg] \ No newline at end of file diff --git a/hardware/manta.cfg b/hardware/manta.cfg index 768cd0a..449c50c 100644 --- a/hardware/manta.cfg +++ b/hardware/manta.cfg @@ -87,14 +87,12 @@ speed: 500 horizontal_move_z: 12 retries: 5 retry_tolerance: 0.025 -max_adjust: 10 +max_adjust: 15 -[output_pin daylight] -pin: PA0 -pwm: True -cycle_time: 0.01 - +[led daylight] +white_pin: PA0 +initial_WHITE: 0.2 [board_pins] aliases: diff --git a/hardware/steppers.cfg b/hardware/steppers.cfg index 36b5647..ebdd58a 100644 --- a/hardware/steppers.cfg +++ b/hardware/steppers.cfg @@ -18,9 +18,6 @@ homing_speed: 100 #Max 100 homing_retract_dist: 5 homing_positive_dir: true -#[autotune_tmc stepper_x] -#motor: 17hs19-2004s-ab - [temperature_sensor stepper_x] sensor_type: Generic 3950 sensor_pin: PA7 @@ -31,12 +28,9 @@ gcode_id: X Stepper ## Make sure to update below for your relevant driver (2208 or 2209) [tmc2209 stepper_x] uart_pin: PC13 -interpolate: false run_current: 1 -sense_resistor: 0.110 -stealthchop_threshold: 0 -driver_SGTHRS: 60 diag_pin: PF4 +interpolate: true ## Y Stepper on Motor2 (A Motor) [stepper_y] @@ -54,18 +48,14 @@ homing_speed: 100 #Max 100 homing_retract_dist: 5 homing_positive_dir: true -#[autotune_tmc stepper_y] -#motor: 17hs19-2004s-ab ## Make sure to update below for your relevant driver (2208 or 2209) [tmc2209 stepper_y] uart_pin: PE3 -interpolate: false run_current: 1 -sense_resistor: 0.110 -stealthchop_threshold: 0 diag_pin: PF3 -driver_SGTHRS: 60 +interpolate: true + ##################################################################### # Z Stepper Settings @@ -80,25 +70,17 @@ rotation_distance: 40 gear_ratio: 80:16 microsteps: 16 endstop_pin: probe:z_virtual_endstop -#endstop_pin: ^PF5 position_max: 310 position_min: -5 homing_speed: 8 second_homing_speed: 3 homing_retract_dist: 3 -#position_endstop: 0 - ## Make sure to update below for your relevant driver (2208 or 2209) [tmc2209 stepper_z] uart_pin: PB9 interpolate: true 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 @@ -115,8 +97,6 @@ microsteps: 16 uart_pin: PG14 interpolate: true run_current: 0.8 -sense_resistor: 0.110 -stealthchop_threshold: 0 #[autotune_tmc stepper_z1] #motor: 17hs19-2004s-c @@ -135,11 +115,6 @@ microsteps: 16 uart_pin: PG10 interpolate: true 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 [stepper_z3] @@ -155,8 +130,3 @@ microsteps: 16 uart_pin: PD5 interpolate: true run_current: 0.8 -sense_resistor: 0.110 -stealthchop_threshold: 0 - -#[autotune_tmc stepper_z3] -#motor: 17hs19-2004s-c \ No newline at end of file diff --git a/macros/print-end.cfg b/macros/print-end.cfg index 99e1f96..a494b75 100644 --- a/macros/print-end.cfg +++ b/macros/print-end.cfg @@ -3,6 +3,7 @@ gcode: SAVE_GCODE_STATE NAME=STATE_PRINT_END SET_FAN_SPEED FAN=exhaust SPEED=1 + SET_FAN_SPEED FAN=bed_fans SPEED=0 M400 ; wait for buffer to clear G92 E0 ; zero the extruder G1 E-10.0 F3600 ; retract filament @@ -23,4 +24,6 @@ gcode: # moves when restoring the state, explicitly set MOVE=0. SET_SKEW CLEAR=1 RESTORE_GCODE_STATE NAME=STATE_PRINT_END MOVE=0 - \ No newline at end of file + + # disable motors + M84 \ No newline at end of file diff --git a/macros/print-start.cfg b/macros/print-start.cfg index 06f15d5..a3fb2eb 100644 --- a/macros/print-start.cfg +++ b/macros/print-start.cfg @@ -35,10 +35,10 @@ gcode: ## Uncomment if you have a 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 M190 S{target_bed} # Sets the target temp for the bed 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 # If the bed temp is not over 90c, then it skips the heatsoak and just heats up to set temp with a 5min soak diff --git a/macros/sensorless-homing.cfg b/macros/sensorless-homing.cfg index 74669dc..89e1a8d 100644 --- a/macros/sensorless-homing.cfg +++ b/macros/sensorless-homing.cfg @@ -10,11 +10,10 @@ gcode: SET_TMC_CURRENT STEPPER=stepper_y CURRENT={HOME_CURRENT} # Home - G28 X + G28 X F2400 # Move away G91 - G1 X-10 F1200 - + G1 X-10 # Wait just a second… (give StallGuard registers time to clear) G4 P1000 # Set current during print @@ -33,10 +32,10 @@ gcode: SET_TMC_CURRENT STEPPER=stepper_y CURRENT={HOME_CURRENT} # Home - G28 Y + G28 Y F2400 # Move away G91 - G1 Y-10 F1200 + G1 Y-10 # Wait just a second… (give StallGuard registers time to clear) G4 P1000 diff --git a/misc/homing-override.cfg b/misc/homing-override.cfg index a00afae..e2f9ee2 100644 --- a/misc/homing-override.cfg +++ b/misc/homing-override.cfg @@ -3,7 +3,7 @@ axes: xyz set_position_z: 0 gcode: - G0 Z5 + G0 Z15 {% set home_all = 'X' not in params and 'Y' not in params and 'Z' not in params %} {% if home_all or 'X' in params %} @@ -15,7 +15,6 @@ gcode: {% endif %} {% if home_all or 'Z' in params %} - G0 X175 Y175 F18000 G28 Z G1 Z10 {% endif %} diff --git a/misc/input-shaper.cfg b/misc/input-shaper.cfg index 71d8fd0..31f0ae0 100644 --- a/misc/input-shaper.cfg +++ b/misc/input-shaper.cfg @@ -1,8 +1,8 @@ [input_shaper] -shaper_freq_x: 58.6 -shaper_type_x: mzv -damping_ratio_x: 0.073 +shaper_freq_x: 93 +shaper_type_x: 3hump_ei +damping_ratio_x: 0.094 -shaper_freq_y: 65.4 -shaper_type_y: 2hump_ei -damping_ratio_y: 0.051 \ No newline at end of file +shaper_freq_y: 48 +shaper_type_y: ei +damping_ratio_y: 0.142 \ No newline at end of file diff --git a/misc/misc.cfg b/misc/misc.cfg index c05fec7..48fa90e 100644 --- a/misc/misc.cfg +++ b/misc/misc.cfg @@ -1,7 +1,8 @@ [include bed_mesh.cfg] [include input-shaper.cfg] [include shake-n-tune.cfg] -[include firmware-retraction.cfg] +#[include firmware-retraction.cfg] [include homing-override.cfg] [include arcs.cfg] [include skew.cfg] +[include tmc-autotune.cfg] diff --git a/misc/tmc-autotune.cfg b/misc/tmc-autotune.cfg index 694ef10..a39f67d 100644 --- a/misc/tmc-autotune.cfg +++ b/misc/tmc-autotune.cfg @@ -1,27 +1,39 @@ -[motor_constants 17hS19-2004s-ab] +[motor_constants 17hs19-2004s-ab] 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] +resistance: 1.40 +inductance: 0.003 +holding_torque: 0.59 +max_current: 2.00 steps_per_revolution: 200 [autotune_tmc stepper_x] -motor: ldo-42sth48-2004mah +motor: 17hs19-2004s-ab +sg4_thrs: 150 +tuning_goal: performance + [autotune_tmc stepper_y] -motor: ldo-42sth48-2004mah +motor: 17hs19-2004s-ab +sg4_thrs: 100 +tuning_goal: performance [autotune_tmc stepper_z] -motor: ldo-42sth48-2004ac -[autotune_tmc stepper_z1] -motor: ldo-42sth48-2004ac -[autotune_tmc stepper_z2] -motor: ldo-42sth48-2004ac -[autotune_tmc stepper_z3] -motor: ldo-42sth48-2004ac +motor: 17hs19-2004s-c +tuning_goal: performance -[autotune_tmc extruder] -motor: ldo-36sth20-1004ahg \ No newline at end of file +[autotune_tmc stepper_z1] +motor: 17hs19-2004s-c +tuning_goal: performance + +[autotune_tmc stepper_z2] +motor: 17hs19-2004s-c +tuning_goal: performance + +[autotune_tmc stepper_z3] +motor: 17hs19-2004s-c +tuning_goal: performance diff --git a/moonraker.conf b/moonraker.conf index 1820e82..cd7ac59 100644 --- a/moonraker.conf +++ b/moonraker.conf @@ -37,7 +37,7 @@ enable_auto_refresh: False type: git_repo channel: dev 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 primary_branch: main install_script: install.sh @@ -89,7 +89,7 @@ is_system_service: False [update_manager KlipperScreen] type: git_repo path: ~/KlipperScreen -origin: https://github.com/jordanruthe/KlipperScreen.git +origin: https://github.com/KlipperScreen/KlipperScreen.git virtualenv: ~/.KlipperScreen-env requirements: scripts/KlipperScreen-requirements.txt system_dependencies: scripts/system-dependencies.json diff --git a/printer-20250127_233434.cfg b/printer-20250127_233434.cfg new file mode 100644 index 0000000..b47f69e --- /dev/null +++ b/printer-20250127_233434.cfg @@ -0,0 +1,38 @@ +[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 diff --git a/printer.cfg b/printer.cfg index b47f69e..23a3507 100644 --- a/printer.cfg +++ b/printer.cfg @@ -8,11 +8,11 @@ [printer] max_velocity: 500 -max_accel: 9000 +max_accel: 4000 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 +max_z_velocity: 50 #Max 15 for 12V TMC Drivers, can increase for 24V +max_z_accel: 500 +square_corner_velocity: 12.0 [exclude_object] @@ -22,10 +22,10 @@ square_corner_velocity: 5.0 #*# [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 +#*# -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 @@ -36,3 +36,8 @@ square_corner_velocity: 5.0 #*# max_x = 280.37 #*# min_y = 98.00800000000001 #*# max_y = 252.65800000000002 +#*# +#*# [skew_correction basic] +#*# xy_skew = 0.003016262322809662 +#*# xz_skew = 0.0 +#*# yz_skew = 0.0 diff --git a/toolhead/t0.cfg b/toolhead/t0.cfg index f1a8e90..300ce11 100644 --- a/toolhead/t0.cfg +++ b/toolhead/t0.cfg @@ -6,7 +6,7 @@ # See docs/Config_Reference.md for a description of parameters. [mcu t0] -canbus_uuid: 336f4a59eb4e +canbus_uuid: 09006bc75877 [temperature_sensor t0] sensor_type: temperature_mcu @@ -25,13 +25,15 @@ accel_chip: adxl345 probe_points: 175, 175, 20 +[temperature_sensor t0_motor] +sensor_type: Generic 3950 +sensor_pin: t0: PA3 + [extruder] step_pin: t0: PD0 dir_pin: t0: PD1 enable_pin: !t0: PD2 heater_pin: t0: PB13 -sensor_type: Generic 3950 -sensor_pin: t0: PA3 min_temp: 0 max_temp: 450 microsteps: 16 @@ -41,29 +43,28 @@ pid_ki: 0.798 pid_kd: 119.265 rotation_distance: 5.53014 filament_diameter: 1.75 -nozzle_diameter: 0.4 -max_extrude_cross_section: 5 +nozzle_diameter: 0.6 +max_extrude_cross_section: 10 max_extrude_only_distance: 101 -pressure_advance: 0.052 +pressure_advance: 0.018 -# sensor_type:MAX31865 -# sensor_pin: t0: PA4 -# spi_bus: spi1 -# rtd_nominal_r: 100 -# rtd_reference_r: 430 -# rtd_num_of_wires: 2 +sensor_type:MAX31865 +sensor_pin: t0: PA4 +spi_bus: spi1 +rtd_nominal_r: 100 +rtd_reference_r: 430 +rtd_num_of_wires: 2 # Probe ##################################################################### ## Probe Port [probe] pin: t0:PB6 -z_offset: -1.1 +z_offset: -1.5 [tmc2209 extruder] uart_pin: t0: PA15 -run_current: 0.650 -stealthchop_threshold: 999999 +run_current: 0.9 [fan] pin: t0: PA0