Merge branch 'VoronDesign:Voron2.4' into Voron2.4

This commit is contained in:
shiftingtech 2021-07-11 16:58:22 -06:00 committed by GitHub
commit 7dcd95e984
Signed by: GitHub
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 144 additions and 139 deletions

Binary file not shown.

Binary file not shown.

View File

@ -3,7 +3,8 @@
## *** THINGS TO CHANGE/CHECK: ***
## MCU paths [mcu] section
## Thermistor types [extruder] and [heater_bed] sections - See 'sensor types' list at end of file
## Z Endstop Switch location [homing_override] section
## Z Endstop Switch location [safe_z_home] section
## Homing end position [gcode_macro G32] section
## Z Endstop Switch offset for Z0 [stepper_z] section
## Probe points [quad_gantry_level] section
## Min & Max gantry corner postions [quad_gantry_level] section
@ -63,9 +64,9 @@
## [X in X] - B Motor
## [Y in Y] - A Motor
## [E in E0] - Extruder
## Obtain definition by "ls -l /dev/serial/by-path/" then unplug to verify
## Obtain definition by "ls -l /dev/serial/by-id/" then unplug to verify
##--------------------------------------------------------------------
serial: /dev/serial/by-path/platform-3f980000.usb-usb-0:1.1.2:1.0
serial: /dev/serial/by-id/usb-Klipper_lpc1768_00000-if00
##--------------------------------------------------------------------
[mcu z]
@ -74,9 +75,9 @@ serial: /dev/serial/by-path/platform-3f980000.usb-usb-0:1.1.2:1.0
## [Z1 in Y] - Rear Left
## [Z2 in Z] - Rear Right
## [Z3 in E0]- Front Right
## Obtain definition by "ls -l /dev/serial/by-path/" then unplug to verify
## Obtain definition by "ls -l /dev/serial/by-id/" then unplug to verify
##--------------------------------------------------------------------
serial: /dev/serial/by-path/platform-3f980000.usb-usb-0:1.1.3:1.0
serial: /dev/serial/by-id/usb-Klipper_lpc1768_00000-if00
##--------------------------------------------------------------------
[printer]
@ -84,8 +85,8 @@ kinematics: corexy
max_velocity: 300
max_accel: 3000 #Max 4000
max_z_velocity: 15 #Max 15 for 12V TMC Drivers, can increase for 24V
max_z_accel: 350 #Max ?
square_corner_velocity: 5.0 #Can experiment with 8.0, default 5.0
max_z_accel: 350
square_corner_velocity: 5.0
#####################################################################
# X/Y Stepper Settings
@ -96,7 +97,9 @@ square_corner_velocity: 5.0 #Can experiment with 8.0, default 5.0
step_pin: P2.2
dir_pin: !P2.6
enable_pin: !P2.1
step_distance: 0.0125
rotation_distance: 40
microsteps: 16
full_steps_per_rotation:200 #set to 400 for 0.9 degree stepper
endstop_pin: P1.28
position_min: 0
##--------------------------------------------------------------------
@ -119,9 +122,8 @@ homing_retract_dist: 5
homing_positive_dir: true
## Make sure to update below for your relevant driver (2208 or 2209)
[tmcXXXX stepper_x]
[tmc2209 stepper_x]
uart_pin: P1.17
microsteps: 16
interpolate: True
run_current: 0.8
hold_current: 0.7
@ -133,7 +135,9 @@ stealthchop_threshold: 0
step_pin: P0.19
dir_pin: !P0.20
enable_pin: !P2.8
step_distance: 0.0125
rotation_distance: 40
microsteps: 16
full_steps_per_rotation:200 #set to 400 for 0.9 degree stepper
endstop_pin: P1.26
position_min: 0
##--------------------------------------------------------------------
@ -156,9 +160,8 @@ homing_retract_dist: 5
homing_positive_dir: true
## Make sure to update below for your relevant driver (2208 or 2209)
[tmcXXXX stepper_y]
[tmc2209 stepper_y]
uart_pin: P1.15
microsteps: 16
interpolate: True
run_current: 0.8
hold_current: 0.7
@ -175,7 +178,9 @@ stealthchop_threshold: 0
step_pin: z:P2.2
dir_pin: !z:P2.6
enable_pin: !z:P2.1
step_distance: 0.00250
rotation_distance: 40
gear_ratio: 80:16
microsteps: 16
endstop_pin: z:P1.25
## Z-position of nozzle (in mm) to z-endstop trigger point relative to print surface (Z0)
## (+) value = endstop above Z0, (-) value = endstop below
@ -195,14 +200,13 @@ position_endstop: -0.5
##--------------------------------------------------------------------
position_min: -5
homing_speed: 15.0
second_homing_speed: 3.0
homing_retract_dist: 3.0
homing_speed: 8
second_homing_speed: 3
homing_retract_dist: 3
## Make sure to update below for your relevant driver (2208 or 2209)
[tmcXXXX stepper_z]
[tmc2209 stepper_z]
uart_pin: z:P1.17
microsteps: 16
interpolate: true
run_current: 0.8
hold_current: 0.8
@ -215,12 +219,13 @@ stealthchop_threshold: 0
step_pin: z:P0.19
dir_pin: z:P0.20
enable_pin: !z:P2.8
step_distance: 0.00250
rotation_distance: 40
gear_ratio: 80:16
microsteps: 16
## Make sure to update below for your relevant driver (2208 or 2209)
[tmcXXXX stepper_z1]
[tmc2209 stepper_z1]
uart_pin: z:P1.15
microsteps: 16
interpolate: true
run_current: 0.8
hold_current: 0.80
@ -233,12 +238,13 @@ stealthchop_threshold: 0
step_pin: z:P0.22
dir_pin: !z:P2.11
enable_pin: !z:P0.21
step_distance: 0.00250
rotation_distance: 40
gear_ratio: 80:16
microsteps: 16
## Make sure to update below for your relevant driver (2208 or 2209)
[tmcXXXX stepper_z2]
[tmc2209 stepper_z2]
uart_pin: z:P1.10
microsteps: 16
interpolate: true
run_current: 0.8
hold_current: 0.80
@ -251,12 +257,13 @@ stealthchop_threshold: 0
step_pin: z:P2.13
dir_pin: z:P0.11
enable_pin: !z:P2.12
step_distance: 0.00250
rotation_distance: 40
gear_ratio: 80:16
microsteps: 16
## Make sure to update below for your relevant driver (2208 or 2209)
[tmcXXXX stepper_z3]
[tmc2209 stepper_z3]
uart_pin: z:P1.8
microsteps: 16
interpolate: true
run_current: 0.8
hold_current: 0.80
@ -273,13 +280,17 @@ stealthchop_threshold: 0
step_pin: P2.13
dir_pin: P0.11
enable_pin: !P2.12
## 16 microsteps Mobius 3 ~= 0.00180
## Update value below when you perform extruder calibration
## Higher value means less filament extruded
## If you ask for 100mm of filament, but in reality it is 98mm:
## step_distance = 98 / 100 * step_distance_old
## 0.00240 a good starting value for Afterburner, 0.00180 for Mobius
step_distance: 0.00240
## rotation_distance = <previous_rotation_distance> * <actual_extrude_distance> / 100
## 22.6789511 is a good starting point
rotation_distance: 22.6789511 #Bondtech 5mm Drive Gears
## Update Gear Ratio depending on your Extruder Type
## Use 50:17 for Afterburner/Clockwork (BMG Gear Ratio)
## Use 80:20 for M4, M3.1
gear_ratio: 50:17
microsteps: 16
full_steps_per_rotation: 200 #200 for 1.8 degree, 400 for 0.9 degree
nozzle_diameter: 0.400
filament_diameter: 1.75
heater_pin: P2.7
@ -301,9 +312,8 @@ pressure_advance_smooth_time: 0.040
## E0 on MCU X/Y
## Make sure to update below for your relevant driver (2208 or 2209)
[tmcXXXX extruder]
[tmc2209 extruder]
uart_pin: P1.9
microsteps: 16
interpolate: false
run_current: 0.5
hold_current: 0.4
@ -317,7 +327,7 @@ stealthchop_threshold: 0
[heater_bed]
## SSR Pin - Z board, Fan Pin
heater_pin: z:P2.3
sensor_type: NTC 100K MGB18-104F39050L32
sensor_type: NTC 100K beta 3950
sensor_pin: z:P0.23
## Adjust Max Power so your heater doesn't warp your bed
max_power: 0.6
@ -392,11 +402,13 @@ heater_temp: 45.0
# LED Control
#####################################################################
#[output_pin caselight ]
#[output_pin caselight]
# Chamber Lighting - Bed Connector (Optional)
#pin: P2.5
#pwm: true
#value: 0
#scale: 10
#pwm:true
#shutdown_value: 0
#value:1
#cycle_time: 0.01
#####################################################################
# Homing and Gantry Adjustment Routines
@ -405,33 +417,14 @@ heater_temp: 45.0
[idle_timeout]
timeout: 1800
[homing_override]
axes: z
set_position_z: 0
gcode:
G90
G0 Z5 F600
G28 X Y
## XY Location of the Z Endstop Switch
## Update X0 and Y0 to your values (such as X157, Y305) after going through
## Z Endstop Pin Location Definition step.
G0 X0 Y0 F3600
G28 Z
G0 Z10 F1800
## Uncomment for for your size printer:
#--------------------------------------------------------------------
## Uncomment for 250mm build
#G0 X125 Y125 Z30 F3600
## Uncomment for 300 build
#G0 X150 Y150 Z30 F3600
## Uncomment for 350mm build
#G0 X175 Y175 Z30 F3600
#--------------------------------------------------------------------
[safe_z_home]
## XY Location of the Z Endstop Switch
## Update -10,-10 to the XY coordinates of your endstop pin
## (such as 157,305) after going through Z Endstop Pin
## Location Definition step.
home_xy_position:-10,-10
speed:100
z_hop:10
[quad_gantry_level]
## Use QUAD_GANTRY_LEVEL to level a gantry.
@ -546,12 +539,22 @@ gcode:
G28
QUAD_GANTRY_LEVEL
G28
G0 X150 Y150 Z20 F6000
## Uncomment for for your size printer:
#--------------------------------------------------------------------
## Uncomment for 250mm build
#G0 X125 Y125 Z30 F3600
## Uncomment for 300 build
#G0 X150 Y150 Z30 F3600
## Uncomment for 350mm build
#G0 X175 Y175 Z30 F3600
#--------------------------------------------------------------------
[gcode_macro PRINT_START]
# Use PRINT_START for the slicer starting script - please customise for your slicer of choice
gcode:
G28 ; home all axes
G32 ; home all axes
G1 Z20 F3000 ; move nozzle away from bed

View File

@ -3,7 +3,8 @@
## *** THINGS TO CHANGE/CHECK: ***
## MCU paths [mcu] section
## Thermistor types [extruder] and [heater_bed] sections - See 'sensor types' list at end of file
## Z Endstop Switch location [homing_override] section
## Z Endstop Switch location [safe_z_home] section
## Homing end position [gcode_macro G32] section
## Z Endstop Switch offset for Z0 [stepper_z] section
## Probe points [quad_gantry_level] section
## Min & Max gantry corner postions [quad_gantry_level] section
@ -63,9 +64,9 @@
## [X in X] - B Motor
## [Y in Y] - A Motor
## [E in E0] - Extruder
## Obtain definition by "ls -l /dev/serial/by-path/" then unplug to verify
## Obtain definition by "ls -l /dev/serial/by-id/" then unplug to verify
##--------------------------------------------------------------------
serial: /dev/serial/by-path/platform-3f980000.usb-usb-0:1.1.2:1.0
serial: /dev/serial/by-id/usb-Klipper_lpc1768_00000-if00
##--------------------------------------------------------------------
[mcu z]
@ -74,9 +75,9 @@ serial: /dev/serial/by-path/platform-3f980000.usb-usb-0:1.1.2:1.0
## [Z1 in Y] - Rear Left
## [Z2 in Z] - Rear Right
## [Z3 in E0]- Front Right
## Obtain definition by "ls -l /dev/serial/by-path/" then unplug to verify
## Obtain definition by "ls -l /dev/serial/by-id/" then unplug to verify
##--------------------------------------------------------------------
serial: /dev/serial/by-path/platform-3f980000.usb-usb-0:1.1.3:1.0
serial: /dev/serial/by-id/usb-Klipper_lpc1768_00000-if00
##--------------------------------------------------------------------
[printer]
@ -84,8 +85,8 @@ kinematics: corexy
max_velocity: 300
max_accel: 3000 #Max 4000
max_z_velocity: 15 #Max 15 for 12V TMC Drivers, can increase for 24V
max_z_accel: 350 #Max ?
square_corner_velocity: 5.0 #Can experiment with 8.0, default 5.0
max_z_accel: 350
square_corner_velocity: 5.0
#####################################################################
# X/Y Stepper Settings
@ -96,7 +97,9 @@ square_corner_velocity: 5.0 #Can experiment with 8.0, default 5.0
step_pin: P2.2
dir_pin: !P2.6
enable_pin: !P2.1
step_distance: 0.0125
rotation_distance: 40
microsteps: 16
full_steps_per_rotation:200 #set to 400 for 0.9 degree stepper
endstop_pin: P1.29
position_min: 0
##--------------------------------------------------------------------
@ -119,9 +122,8 @@ homing_retract_dist: 5
homing_positive_dir: true
## Make sure to update below for your relevant driver (2208 or 2209)
[tmcXXXX stepper_x]
[tmc2209 stepper_x]
uart_pin: P1.10
microsteps: 16
interpolate: True
run_current: 0.8
hold_current: 0.7
@ -133,7 +135,9 @@ stealthchop_threshold: 0
step_pin: P0.19
dir_pin: !P0.20
enable_pin: !P2.8
step_distance: 0.0125
rotation_distance: 40
microsteps: 16
full_steps_per_rotation:200 #set to 400 for 0.9 degree stepper
endstop_pin: P1.28
position_min: 0
##--------------------------------------------------------------------
@ -156,9 +160,8 @@ homing_retract_dist: 5
homing_positive_dir: true
## Make sure to update below for your relevant driver (2208 or 2209)
[tmcXXXX stepper_y]
[tmc2209 stepper_y]
uart_pin: P1.9
microsteps: 16
interpolate: True
run_current: 0.8
hold_current: 0.7
@ -175,7 +178,9 @@ stealthchop_threshold: 0
step_pin: z:P2.2
dir_pin: !z:P2.6
enable_pin: !z:P2.1
step_distance: 0.00250
rotation_distance: 40
gear_ratio: 80:16
microsteps: 16
endstop_pin: z:P1.27
## Z-position of nozzle (in mm) to z-endstop trigger point relative to print surface (Z0)
## (+) value = endstop above Z0, (-) value = endstop below
@ -195,14 +200,13 @@ position_endstop: -0.5
##--------------------------------------------------------------------
position_min: -5
homing_speed: 15.0
second_homing_speed: 3.0
homing_retract_dist: 3.0
homing_speed: 8
second_homing_speed: 3
homing_retract_dist: 3
## Make sure to update below for your relevant driver (2208 or 2209)
[tmcXXXX stepper_z]
[tmc2209 stepper_z]
uart_pin: z:P1.10
microsteps: 16
interpolate: true
run_current: 0.8
hold_current: 0.8
@ -215,12 +219,13 @@ stealthchop_threshold: 0
step_pin: z:P0.19
dir_pin: z:P0.20
enable_pin: !z:P2.8
step_distance: 0.00250
rotation_distance: 40
gear_ratio: 80:16
microsteps: 16
## Make sure to update below for your relevant driver (2208 or 2209)
[tmcXXXX stepper_z1]
[tmc2209 stepper_z1]
uart_pin: z:P1.9
microsteps: 16
interpolate: true
run_current: 0.8
hold_current: 0.8
@ -233,12 +238,13 @@ stealthchop_threshold: 0
step_pin: z:P0.22
dir_pin: !z:P2.11
enable_pin: !z:P0.21
step_distance: 0.00250
rotation_distance: 40
gear_ratio: 80:16
microsteps: 16
## Make sure to update below for your relevant driver (2208 or 2209)
[tmcXXXX stepper_z2]
[tmc2209 stepper_z2]
uart_pin: z:P1.8
microsteps: 16
interpolate: true
run_current: 0.8
hold_current: 0.80
@ -251,12 +257,13 @@ stealthchop_threshold: 0
step_pin: z:P2.13
dir_pin: z:P0.11
enable_pin: !z:P2.12
step_distance: 0.00250
rotation_distance: 40
gear_ratio: 80:16
microsteps: 16
## Make sure to update below for your relevant driver (2208 or 2209)
[tmcXXXX stepper_z3]
[tmc2209 stepper_z3]
uart_pin: z:P1.4
microsteps: 16
interpolate: true
run_current: 0.8
hold_current: 0.80
@ -273,13 +280,17 @@ stealthchop_threshold: 0
step_pin: P2.13
dir_pin: P0.11
enable_pin: !P2.12
## 16 microsteps Mobius 3 ~= 0.00180
## Update value below when you perform extruder calibration
## Higher value means less filament extruded
## If you ask for 100mm of filament, but in reality it is 98mm:
## step_distance = 98 / 100 * step_distance_old
## 0.00240 a good starting value for Afterburner, 0.00180 for Mobius
step_distance: 0.00240
## rotation_distance = <previous_rotation_distance> * <actual_extrude_distance> / 100
## 22.6789511 is a good starting point
rotation_distance: 22.6789511 #Bondtech 5mm Drive Gears
## Update Gear Ratio depending on your Extruder Type
## Use 50:17 for Afterburner/Clockwork (BMG Gear Ratio)
## Use 80:20 for M4, M3.1
gear_ratio: 50:17 #BMG Gear Ratio
microsteps: 16
full_steps_per_rotation: 200 #200 for 1.8 degree, 400 for 0.9 degree
nozzle_diameter: 0.400
filament_diameter: 1.75
heater_pin: P2.7
@ -301,9 +312,8 @@ pressure_advance_smooth_time: 0.040
## E0 on MCU X/Y
## Make sure to update below for your relevant driver (2208 or 2209)
[tmcXXXX extruder]
[tmc2209 extruder]
uart_pin: P1.4
microsteps: 16
interpolate: false
run_current: 0.5
hold_current: 0.4
@ -317,7 +327,7 @@ stealthchop_threshold: 0
[heater_bed]
## SSR Pin - Z board, Fan Pin
heater_pin: z:P2.3
sensor_type: NTC 100K MGB18-104F39050L32
sensor_type: NTC 100K beta 3950
sensor_pin: z:P0.25
## Adjust Max Power so your heater doesn't warp your bed
max_power: 0.6
@ -348,7 +358,6 @@ sample_retract_dist: 3.0
samples_tolerance: 0.006
samples_tolerance_retries: 3
#####################################################################
# Fan Control
#####################################################################
@ -393,11 +402,13 @@ heater_temp: 45.0
# LED Control
#####################################################################
#[output_pin caselight ]
#[output_pin caselight]
# Chamber Lighting - Bed Connector (Optional)
#pin: P2.5
#pwm: true
#value: 0
#scale: 10
#pwm:true
#shutdown_value: 0
#value:1
#cycle_time: 0.01
#####################################################################
# Homing and Gantry Adjustment Routines
@ -406,34 +417,15 @@ heater_temp: 45.0
[idle_timeout]
timeout: 1800
[homing_override]
axes: z
set_position_z: 0
gcode:
G90
G0 Z5 F600
G28 X Y
## XY Location of the Z Endstop Switch
## Update X0 and Y0 to your values (such as X157, Y305) after going through
## Z Endstop Pin Location Definition step.
G0 X0 Y0 F3600
G28 Z
G0 Z10 F1800
## Uncomment for for your size printer:
#--------------------------------------------------------------------
## Uncomment for 250mm build
#G0 X125 Y125 Z30 F3600
## Uncomment for 300 build
#G0 X150 Y150 Z30 F3600
## Uncomment for 350mm build
#G0 X175 Y175 Z30 F3600
#--------------------------------------------------------------------
[safe_z_home]
## XY Location of the Z Endstop Switch
## Update -10,-10 to the XY coordinates of your endstop pin
## (such as 157,305) after going through Z Endstop Pin
## Location Definition step.
home_xy_position:-10,-10
speed:100
z_hop:10
[quad_gantry_level]
## Use QUAD_GANTRY_LEVEL to level a gantry.
## Min & Max gantry corners - measure from nozzle at MIN (0,0) and
@ -546,12 +538,22 @@ gcode:
G28
QUAD_GANTRY_LEVEL
G28
G0 X150 Y150 Z20 F6000
## Uncomment for for your size printer:
#--------------------------------------------------------------------
## Uncomment for 250mm build
#G0 X125 Y125 Z30 F3600
## Uncomment for 300 build
#G0 X150 Y150 Z30 F3600
## Uncomment for 350mm build
#G0 X175 Y175 Z30 F3600
#--------------------------------------------------------------------
[gcode_macro PRINT_START]
# Use PRINT_START for the slicer starting script - please customise for your slicer of choice
gcode:
G28 ; home all axes
G32 ; home all axes
G1 Z20 F3000 ; move nozzle away from bed