diff --git a/steel_data/config/jschuh_klipper_macros.cfg b/steel_data/config/jschuh_klipper_macros.cfg index 2bc6596..8e7e102 100644 --- a/steel_data/config/jschuh_klipper_macros.cfg +++ b/steel_data/config/jschuh_klipper_macros.cfg @@ -21,7 +21,7 @@ gcode: # This line is required by Klipper. # for these macros. For example, you could uncomment the following line to # automatically adjust your bed surface offsets to account for any changes made # to your Z endstop or probe offset. - ADJUST_SURFACE_OFFSETS +# ADJUST_SURFACE_OFFSETS [gcode_macro update_git] gcode: @@ -46,9 +46,9 @@ verbose: True [include klipper-macros/*.cfg] # Uncomment to include features that require specific hardware support. # LCD menu support for features like bed surface selection and pause next layer. -#[include klipper-macros/optional/lcd_menus.cfg] +[include klipper-macros/optional/lcd_menus.cfg] # Optimized bed leveling -#[include klipper-macros/optional/bed_mesh.cfg] +[include klipper-macros/optional/bed_mesh.cfg] # The sections below here are required for the macros to work. If your config # already has some of these sections you should merge the duplicates into one @@ -70,4 +70,4 @@ on_error_gcode: CANCEL_PRINT [display_status] -[exclude_object] \ No newline at end of file +[exclude_object] diff --git a/steel_data/config/printer.cfg b/steel_data/config/printer.cfg index 7686e9d..1560e42 100644 --- a/steel_data/config/printer.cfg +++ b/steel_data/config/printer.cfg @@ -13,8 +13,8 @@ serial: /dev/ttySteel [bed_mesh] speed: 60 horizontal_move_z: 5 -mesh_min: 6,12 -mesh_max: 176,162 +mesh_min: 0,0 +mesh_max: 185,168 probe_count: 3, 3 mesh_pps: 2, 2 fade_start: 1 @@ -34,14 +34,10 @@ screw4_name: Rear right screw [screws_tilt_adjust] horizontal_move_z: 3 speed: 60 -screw1: 20,150 -screw1_name: back left +screw1: 20,0 screw2: 190,150 -screw2_name: back right -screw3: 20,0 -screw3_name: front left +screw3: 20,150 screw4: 190,0 -screw4_name: front right screw_thread: CW-M3 [bltouch] @@ -58,7 +54,7 @@ pin_up_reports_not_triggered: True pin_up_touch_mode_reports_triggered: True [safe_z_home] -home_xy_position: 105, 105# Change coordinates to the center of your print bed +home_xy_position: 96.5, 107.5# Change coordinates to the center of your print bed speed: 50 z_hop: 10 # Move up 10mm z_hop_speed: 5 @@ -70,8 +66,8 @@ enable_pin: !PD7 microsteps: 16 rotation_distance: 32 endstop_pin: ^!PE4 -position_endstop: 200 -position_max: 200 +position_endstop: 193 +position_max: 193 position_min: 0 homing_speed: 50 @@ -82,9 +78,9 @@ enable_pin: !PF2 microsteps: 16 rotation_distance: 32 endstop_pin: ^!PJ0 -position_endstop: 200 -position_max: 200 -position_min: 0 +position_endstop: 210 +position_max: 210 +position_min: -30 homing_speed: 50 [stepper_z] @@ -97,7 +93,7 @@ endstop_pin: ^!PD3 #position_endstop: 0.0 endstop_pin: probe:z_virtual_endstop position_max: 270 -position_min: -5 +position_min: -10 homing_speed: 20 [extruder] @@ -187,25 +183,22 @@ aliases: #*# pid_ki = 2.352 #*# pid_kd = 86.791 #*# -#*# [stepper_z] -#*# position_endstop = 4.180 -#*# #*# [bltouch] -#*# z_offset = 1.330 +#*# z_offset = 0.950 #*# #*# [bed_mesh default] #*# version = 1 #*# points = -#*# -0.161375, -0.108500, -0.073500 -#*# -0.004250, 0.004625, -0.081375 -#*# -0.114250, -0.068625, -0.141250 +#*# 0.003375, -0.020000, -0.053625 +#*# 0.030750, -0.001250, -0.051500 +#*# -0.005125, 0.000500, -0.040375 #*# x_count = 3 #*# y_count = 3 #*# mesh_x_pps = 2 #*# mesh_y_pps = 2 #*# algo = lagrange #*# tension = 0.2 -#*# min_x = 6.0 -#*# max_x = 176.0 -#*# min_y = 12.0 -#*# max_y = 162.0 +#*# min_x = 59.47019999999999 +#*# max_x = 140.5102 +#*# min_y = 59.470200000000006 +#*# max_y = 140.51020000000003