Merging with master.

This commit is contained in:
Bassam Husain
2023-04-07 09:57:21 -04:00
parent 688193903b
commit 4c3ae83f19
2 changed files with 16 additions and 11 deletions

View File

@@ -121,19 +121,23 @@ gcode:
{% set hotendtemp = params.HOTEND|int %} {% set hotendtemp = params.HOTEND|int %}
{% set chambertemp = params.CHAMBER|default(0)|int %} {% set chambertemp = params.CHAMBER|default(0)|int %}
# Set safe speeds
{% set maxVelocity = printer.configfile.settings.printer.max_velocity|default(200)|int %}
{% set maxVelocityAdjusted = (0.95 * maxVelocity * 60)|int %}
ADJUST_FILAMENT_SENSOR_STATUS ENABLE=1 ADJUST_FILAMENT_SENSOR_STATUS ENABLE=1
G28 X Y G90
# <insert your routines here>
M140 S{bedtemp} ; set & don't wait for bed temp M140 S{bedtemp} ; set & don't wait for bed temp
M104 S{hotendtemp} ; set & don't wait for hotend temp G28 X Y
M190 S{bedtemp} ; set & wait for bed temp M190 S{bedtemp} ; set & wait for bed temp
# TEMPERATURE_WAIT SENSOR="temperature_sensor chamber" MINIMUM={chambertemp} ; wait for chamber temp M104 S{hotendtemp} ; set & don't wait for hotend temp
# <insert your routines here>
M109 S{hotendtemp} ; set & wait for hotend temp
# <insert your routines here>
G28 Z ; final z homing G28 Z ; final z homing
G1 X0 Y0 F{maxVelocityAdjusted}
M109 S{hotendtemp} ; set & wait for hotend temp
BED_MESH_PROFILE LOAD=default BED_MESH_PROFILE LOAD=default
G1 Z20 F3000 ; move nozzle away from bed G1 Z20 F3000 ; move nozzle away from bed

View File

@@ -23,6 +23,7 @@ max_velocity: 200
max_accel: 3000 max_accel: 3000
max_z_velocity: 15 max_z_velocity: 15
max_z_accel: 45 max_z_accel: 45
square_corner_velocity: 8.0
##################################################################### #####################################################################
# X/Y/Z Stepper Settings # X/Y/Z Stepper Settings
@@ -32,7 +33,7 @@ max_z_accel: 45
step_pin: PC2 step_pin: PC2
dir_pin: !PB9 dir_pin: !PB9
enable_pin: !PC3 enable_pin: !PC3
microsteps: 64 microsteps: 128
rotation_distance: 40 rotation_distance: 40
endstop_pin: tmc2209_stepper_x:virtual_endstop endstop_pin: tmc2209_stepper_x:virtual_endstop
position_endstop: 0 position_endstop: 0
@@ -54,7 +55,7 @@ diag_pin: PA5
step_pin: PB8 step_pin: PB8
dir_pin: PB7 dir_pin: PB7
enable_pin: !PC3 enable_pin: !PC3
microsteps: 64 microsteps: 128
rotation_distance: 40 rotation_distance: 40
endstop_pin: tmc2209_stepper_y:virtual_endstop endstop_pin: tmc2209_stepper_y:virtual_endstop
position_endstop: 0 position_endstop: 0
@@ -76,7 +77,7 @@ diag_pin: PA6
step_pin: PB6 step_pin: PB6
dir_pin: !PB5 dir_pin: !PB5
enable_pin: !PC3 enable_pin: !PC3
microsteps: 64 microsteps: 128
rotation_distance: 4 rotation_distance: 4
endstop_pin: probe:z_virtual_endstop endstop_pin: probe:z_virtual_endstop
position_min: -4 position_min: -4
@@ -100,7 +101,7 @@ diag_pin: PA7
step_pin: PB4 step_pin: PB4
dir_pin: !PB3 dir_pin: !PB3
enable_pin: !PC3 enable_pin: !PC3
microsteps: 64 microsteps: 128
rotation_distance: 4.65 # NOTE Calibrate e-steps and adjust https://www.klipper3d.org/Rotation_Distance.html rotation_distance: 4.65 # NOTE Calibrate e-steps and adjust https://www.klipper3d.org/Rotation_Distance.html
nozzle_diameter: 0.400 nozzle_diameter: 0.400
filament_diameter: 1.750 filament_diameter: 1.750