resurection
This commit is contained in:
parent
1495af7916
commit
ec4b4dffb5
11 changed files with 93 additions and 101 deletions
|
@ -6,6 +6,7 @@ gcode:
|
|||
{% set DWELL = params.DWELL|default(300)|int %}
|
||||
{% set X = 200 %}
|
||||
|
||||
SET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000 SQUARE_CORNER_VELOCITY=8
|
||||
M104 S{hotendTemp|float*0.6} # set extruder pre warm temp
|
||||
M140 S{bedTemp} # set bed temp to warm while starting up
|
||||
G28 # home after setting temps
|
||||
|
@ -16,9 +17,11 @@ gcode:
|
|||
#ATTACH_PROBE # Have probe ready for calibration
|
||||
CLEAN_NOZZLE # Clean before getting offsets
|
||||
#BED_MESH_CALIBRATE AREA_START={params.AREA_START} AREA_END={params.AREA_END}
|
||||
G28 Z
|
||||
CALIBRATE_Z # Auto calibrate the bed height
|
||||
GO_TO_BUCKET # No cleanup from nozzle ooze
|
||||
M109 S{hotendTemp} # Set extruder to printing temperature
|
||||
HEATSOAK DWELL=15 # Wait for nozzle to actually hit temp
|
||||
CLEAN_NOZZLE # Final clean before print
|
||||
G90
|
||||
G1 X{X} F6000 # Avoid brush
|
||||
|
@ -101,16 +104,16 @@ gcode:
|
|||
[gcode_macro GO_TO_BUCKET]
|
||||
gcode:
|
||||
#Edit this#
|
||||
{% set X = 290 %}
|
||||
{% set Y = 331 %}
|
||||
{% set X = 55 %}
|
||||
{% set Y = 325 %}
|
||||
{% set Z = 2 %}
|
||||
###########
|
||||
SAFE_RETRACT
|
||||
G91
|
||||
G1 Z{Z}
|
||||
G90
|
||||
G1 X{X} F6000
|
||||
G1 Y{Y} F6000
|
||||
G1 X{X} F4000
|
||||
G1 Y{Y} F4000
|
||||
G91
|
||||
|
||||
[gcode_macro safe_retract]
|
||||
|
|
13
fans.cfg
13
fans.cfg
|
@ -1,3 +1,11 @@
|
|||
[multi_pin driver_fan_pins]
|
||||
pins: PD12, PD13
|
||||
|
||||
[temperature_sensor mcu_temp]
|
||||
sensor_type: temperature_mcu
|
||||
min_temp: 10
|
||||
max_temp: 100
|
||||
|
||||
[fan]
|
||||
## Print Cooling Fan - FAN0 Connector
|
||||
pin: PA8
|
||||
|
@ -17,8 +25,9 @@ fan_speed: 0.9
|
|||
[controller_fan driver_fan]
|
||||
## Controller Fan - FAN2 Connector
|
||||
stepper: stepper_x
|
||||
pin: PD12
|
||||
max_power: 0.6
|
||||
pin: multi_pin:driver_fan_pins
|
||||
max_power: 0.8
|
||||
shutdown_speed: 0
|
||||
kick_start_time: 0.1
|
||||
off_below: 0.10
|
||||
|
||||
|
|
10
printer.cfg
10
printer.cfg
|
@ -3,8 +3,6 @@
|
|||
[include timelapse.cfg]
|
||||
[include kiauh_macros.cfg]
|
||||
[include steppers.cfg]
|
||||
[include stepper2209.cfg]
|
||||
[include stepperz.cfg]
|
||||
[include sherpa_mini.cfg]
|
||||
[include fans.cfg]
|
||||
[include calibration_macros.cfg]
|
||||
|
@ -21,15 +19,15 @@ path: ~/gcode_files
|
|||
|
||||
[printer]
|
||||
kinematics: corexy
|
||||
max_velocity: 800
|
||||
max_accel: 10000
|
||||
max_accel_to_decel: 10000
|
||||
max_velocity: 500
|
||||
max_accel: 2000
|
||||
max_accel_to_decel: 2000
|
||||
max_z_velocity: 80
|
||||
max_z_accel: 1000
|
||||
square_corner_velocity: 8
|
||||
|
||||
[mcu]
|
||||
serial: /dev/serial/by-id/usb-Klipper_stm32f446xx_2B0016000B50534E4E313120-if00
|
||||
serial: /dev/serial/by-id/usb-Klipper_stm32f446xx_3F003E001650534E4E313420-if00
|
||||
|
||||
[heater_bed]
|
||||
heater_pin: PA3
|
||||
|
|
18
probe.cfg
18
probe.cfg
|
@ -30,25 +30,25 @@ samples_tolerance_retries: 3
|
|||
speed: 5
|
||||
lift_speed: 20
|
||||
|
||||
dock_position: 321,316, 15
|
||||
dock_position: 322,313, 15
|
||||
safe_z_position: 165,165
|
||||
approach_position: 290,316, 15
|
||||
detach_position: 321,260
|
||||
approach_position: 290,319, 15
|
||||
detach_position: 322,260
|
||||
attach_speed: 30
|
||||
detach_speed: 30
|
||||
travel_speed: 500
|
||||
check_open_attach: True
|
||||
dock_fixed_z: True
|
||||
dock_retries: 1
|
||||
allow_delayed_detach: True
|
||||
allow_delayed_detach: False
|
||||
|
||||
[z_calibration]
|
||||
nozzle_xy_position: 332,245
|
||||
switch_xy_position: 305,184
|
||||
nozzle_xy_position: 331,249
|
||||
switch_xy_position: 305,187
|
||||
bed_xy_position: 150,150
|
||||
switch_offset: .9 # Lower number is farther from bed
|
||||
switch_offset: .5 # Lower number is farther from bed
|
||||
max_deviation: 10
|
||||
speed: 800
|
||||
speed: 300
|
||||
samples: 3
|
||||
samples_result: median
|
||||
samples_tolerance: 0.04
|
||||
|
@ -61,7 +61,7 @@ end_gcode: DETACH_PROBE
|
|||
speed: 500
|
||||
horizontal_move_z: 7
|
||||
mesh_min: 26, 66
|
||||
mesh_max: 320, 305
|
||||
mesh_max: 320, 300
|
||||
probe_count: 6, 6
|
||||
algorithm: bicubic
|
||||
fade_start: 1
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
# If you are putting your purge bucket at the rear left of the bed as per default installation, enable True on your location_bucket_rear
|
||||
# variable. If you want to put your purge bucket elsewhere (perhaps the front), then set it to False. See diagrams and description
|
||||
# further below on how to set your XY position.
|
||||
variable_location_bucket_rear: True
|
||||
variable_location_bucket_rear: False
|
||||
|
||||
# If you want the purging routine in your bucket enabled, set to True (and vice versa).
|
||||
variable_enable_purge: True
|
||||
|
@ -18,7 +18,7 @@ variable_purge_ret: 0 ; Retract length, in mm, after
|
|||
variable_ooze_dwell: 1 ; Dwell/wait time, in seconds, after purging and retracting.
|
||||
|
||||
# Adjust this so that your nozzle scrubs within the brush. Currently defaulted to be a lot higher for safety. Be careful not to go too low!
|
||||
variable_brush_top: 4
|
||||
variable_brush_top: 7
|
||||
|
||||
# These parameters define your scrubbing, travel speeds, safe z clearance and how many times you want to wipe. Update as necessary. Wipe
|
||||
# direction is randomized based off whether the left or right bucket is randomly selected in the purge & scrubbing routine.
|
||||
|
@ -44,14 +44,14 @@ variable_wipe_spd_xy: 5000 ; Nozzle wipe speed in mm/min.
|
|||
#
|
||||
#
|
||||
## For V1.8, you may need to measure where your brush is on the x axis and input manually into any of the variable_brush_start uncommented.
|
||||
variable_brush_start: 230
|
||||
variable_brush_start: 72
|
||||
|
||||
# This value is defaulted from brush location in CAD (rear left). Change if your brush width is different.
|
||||
variable_brush_width: 30
|
||||
|
||||
## These are only used if location_bucket_rear is False. You specify a custom location in y axis for your brush - see diagram above. ##
|
||||
variable_brush_front: 320
|
||||
variable_brush_depth: 243
|
||||
variable_brush_front: 320
|
||||
variable_brush_depth: 4
|
||||
|
||||
|
||||
# These parameters define the size of your purge bucket. Update as necessary. If you decided to not enable purge, you can ignore
|
||||
|
@ -81,7 +81,7 @@ variable_bucket_gap: 22
|
|||
|
||||
# For V1.8, you may need to measure where your bucket start is and input into bucket_start. Otherwise, a value of 0 is for a default
|
||||
# installation of purge bucket at rear left.
|
||||
variable_bucket_start: 212
|
||||
variable_bucket_start: 38
|
||||
|
||||
|
||||
###############################################################################################################################################
|
||||
|
@ -165,7 +165,7 @@ gcode:
|
|||
G1 Z{brush_top + clearance_z} F{prep_spd_z}
|
||||
|
||||
## Restore the gcode state to how it was before the macro.
|
||||
RESTORE_GCODE_STATE NAME=clean_nozzle MOVE=1 MOVE_SPEED=800
|
||||
RESTORE_GCODE_STATE NAME=clean_nozzle MOVE=1 MOVE_SPEED=500
|
||||
|
||||
{% else %}
|
||||
|
||||
|
|
|
@ -11,12 +11,13 @@ gcode:
|
|||
SET_TMC_CURRENT STEPPER=stepper_x CURRENT={HOME_CUR}
|
||||
#SET_TMC_CURRENT STEPPER=stepper_x1 CURRENT={HOME_CUR} # AWD
|
||||
# Pause to ensure driver stall flag is clear
|
||||
G4 P2000
|
||||
G4 P2100
|
||||
# Home
|
||||
G28 x0
|
||||
G28 X0
|
||||
# Move away
|
||||
G90
|
||||
G1 x20 F1200
|
||||
G91
|
||||
# Set current during print
|
||||
SET_TMC_CURRENT STEPPER=stepper_x CURRENT={RUN_CUR}
|
||||
#SET_TMC_CURRENT STEPPER=stepper_x1 CURRENT={RUN_CUR} # AWD
|
||||
|
@ -59,14 +60,13 @@ gcode:
|
|||
{% set home_all = params.X is not defined and params.Y is not defined and params.Z is not defined %}
|
||||
|
||||
{% if params.X is defined or home_all %}
|
||||
# Double home. If not backed off, it can cause issues
|
||||
SENSORLESS_HOME_X
|
||||
SENSORLESS_HOME_X
|
||||
{% endif %}
|
||||
|
||||
{% if params.Y is defined or home_all %}
|
||||
# Double home. If not backed off, it can cause issues
|
||||
SENSORLESS_HOME_Y
|
||||
SENSORLESS_HOME_X
|
||||
SENSORLESS_HOME_Y
|
||||
|
||||
{% endif %}
|
||||
|
@ -74,9 +74,8 @@ gcode:
|
|||
{% if params.Z is defined or home_all %}
|
||||
{action_respond_info("Doing G28 Z0")}
|
||||
# You can do your logic for safe z here
|
||||
DETACH_PROBE
|
||||
G90
|
||||
G1 x332 y245 F30000
|
||||
G1 x331 y249 F20000
|
||||
G28 Z0
|
||||
G1 Z{Z}
|
||||
G91
|
||||
|
|
|
@ -26,9 +26,9 @@ sensor_pin: PF4
|
|||
control: pid
|
||||
|
||||
# Dragon HF
|
||||
pid_Kp=19.645
|
||||
pid_Ki=1.031
|
||||
pid_Kd=93.558
|
||||
pid_Kp=19.814
|
||||
pid_Ki=1.083
|
||||
pid_Kd=90.649
|
||||
|
||||
# Alu
|
||||
# pid_Kp = 21.956
|
||||
|
@ -45,5 +45,5 @@ pid_Kd=93.558
|
|||
uart_pin: PC7
|
||||
#Run current is listed in RMS
|
||||
#run_current: 0.30 #min current, equivalent to 0.42A peak (Peak = RMS/0.707)
|
||||
#run_current: 0.35 #max current, equivalent to 0.49A peak (Peak = RMS/0.707)
|
||||
run_current: 0.45
|
||||
run_current: 0.35 #max current, equivalent to 0.49A peak (Peak = RMS/0.707)
|
||||
#run_current: 0.45
|
||||
|
|
|
@ -1,25 +0,0 @@
|
|||
#LDO 48mm 1.8 42STH48-2004AC - 1.4Ohm 3mH
|
||||
[tmc2209 stepper_x]
|
||||
uart_pin: PC4
|
||||
run_current: 2.0
|
||||
sense_resistor: 0.110
|
||||
stealthchop_threshold: 0
|
||||
diag_pin: ^PG6 # Set to MCU pin connected to TMC DIAG pin
|
||||
driver_SGTHRS: 30 # 255 is most sensitive value, 0 is least sensitive
|
||||
driver_TBL: 1
|
||||
driver_TOFF: 3
|
||||
driver_HSTRT: 1
|
||||
driver_HEND: 3
|
||||
|
||||
#LDO 48mm 1.8 42STH48-2004AC - 1.4Ohm 3mH
|
||||
[tmc2209 stepper_y]
|
||||
uart_pin: PD11
|
||||
run_current: 2.0
|
||||
sense_resistor: 0.110
|
||||
stealthchop_threshold: 0
|
||||
diag_pin: ^PG9 # Set to MCU pin connected to TMC DIAG pin
|
||||
driver_SGTHRS: 30 # 255 is most sensitive value, 0 is least sensitive
|
||||
driver_TBL: 1
|
||||
driver_TOFF: 3
|
||||
driver_HSTRT: 1
|
||||
driver_HEND: 3
|
|
@ -1,17 +0,0 @@
|
|||
[tmc5160 stepper_x]
|
||||
interpolate: false
|
||||
cs_pin: PC4
|
||||
#diag1_pin: PG12
|
||||
run_current: 1.8
|
||||
spi_bus: spi3
|
||||
driver_SGT: 1
|
||||
sense_resistor: 0.075
|
||||
|
||||
[tmc5160 stepper_y]
|
||||
interpolate: false
|
||||
cs_pin: PF12
|
||||
#diag1_pin: PG11
|
||||
run_current: 1.8
|
||||
spi_bus: spi3
|
||||
driver_SGT: 1
|
||||
sense_resistor: 0.075
|
53
steppers.cfg
53
steppers.cfg
|
@ -14,14 +14,27 @@ homing_retract_dist: 0
|
|||
homing_positive_dir: false
|
||||
step_pulse_duration: 0.000001
|
||||
|
||||
#LDO 48mm 1.8 42STH48-2004AC - 1.4Ohm 3mH
|
||||
[tmc2209 stepper_x]
|
||||
uart_pin: PC4
|
||||
run_current: 2
|
||||
sense_resistor: 0.110
|
||||
stealthchop_threshold: 0
|
||||
diag_pin: ^PG6 # Set to MCU pin connected to TMC DIAG pin
|
||||
driver_SGTHRS: 18 # 255 is most sensitive value, 0 is least sensitive
|
||||
driver_TBL: 1
|
||||
driver_TOFF: 3
|
||||
driver_HSTRT: 1
|
||||
driver_HEND: 3
|
||||
|
||||
[stepper_y]
|
||||
step_pin: PG0 # Drive1
|
||||
dir_pin: PG1
|
||||
enable_pin: !PF15
|
||||
step_pin: PF9 # Drive4
|
||||
dir_pin: PF10
|
||||
enable_pin: !PG2
|
||||
endstop_pin: tmc2209_stepper_y:virtual_endstop
|
||||
microsteps: 32
|
||||
rotation_distance: 40
|
||||
position_endstop: 331
|
||||
position_endstop: 328
|
||||
position_min: 0
|
||||
position_max: 331
|
||||
homing_speed: 40
|
||||
|
@ -30,15 +43,28 @@ homing_retract_dist: 0
|
|||
homing_positive_dir: true
|
||||
step_pulse_duration: 0.000001
|
||||
|
||||
#LDO 48mm 1.8 42STH48-2004AC - 1.4Ohm 3mH
|
||||
[tmc2209 stepper_y]
|
||||
uart_pin: PF2
|
||||
run_current: 2
|
||||
sense_resistor: 0.110
|
||||
stealthchop_threshold: 0
|
||||
diag_pin: ^PG12 # Set to MCU pin connected to TMC DIAG pin
|
||||
driver_SGTHRS: 30 # 255 is most sensitive value, 0 is least sensitive
|
||||
driver_TBL: 1
|
||||
driver_TOFF: 3
|
||||
driver_HSTRT: 1
|
||||
driver_HEND: 3
|
||||
|
||||
[stepper_z]
|
||||
step_pin: PF11
|
||||
dir_pin: !PG3
|
||||
enable_pin: !PG5
|
||||
step_pin: PC13 # Drive5
|
||||
dir_pin: !PF0
|
||||
enable_pin: !PF1
|
||||
microsteps: 16
|
||||
rotation_distance: 4
|
||||
#endstop_pin: PG11 # Bed Endstop
|
||||
endstop_pin: PG10 # Nozzle Endstop
|
||||
position_endstop: -0.319
|
||||
position_endstop: 3.081
|
||||
position_min: -4
|
||||
position_max: 400
|
||||
full_steps_per_rotation: 200
|
||||
|
@ -47,3 +73,14 @@ homing_positive_dir: false
|
|||
homing_speed: 8
|
||||
second_homing_speed: 3
|
||||
step_pulse_duration: 0.000004
|
||||
|
||||
[tmc2209 stepper_z]
|
||||
interpolate: false
|
||||
uart_pin: PE4
|
||||
run_current: 1.0
|
||||
sense_resistor: 0.110
|
||||
stealthchop_threshold: 0
|
||||
driver_TBL: 1
|
||||
driver_TOFF: 3
|
||||
driver_HSTRT: 0
|
||||
driver_HEND: 3
|
||||
|
|
12
stepperz.cfg
12
stepperz.cfg
|
@ -1,12 +0,0 @@
|
|||
[endstop_phase]
|
||||
|
||||
[tmc2209 stepper_z]
|
||||
interpolate: false
|
||||
uart_pin: PC6
|
||||
run_current: 1.0
|
||||
sense_resistor: 0.110
|
||||
stealthchop_threshold: 0
|
||||
driver_TBL: 1
|
||||
driver_TOFF: 3
|
||||
driver_HSTRT: 0
|
||||
driver_HEND: 3
|
Loading…
Add table
Reference in a new issue