Updates and fixes

update /macros folder

Update *bltouch.cfg

Fix Z and Y pins

Fix Y direction

Update MKSRN-Sv1.3 pins

Clean obsolete comments
This commit is contained in:
oducceu
2021-10-13 15:07:13 +03:00
parent 5935bfa7f1
commit 31ac02031d
14 changed files with 452 additions and 79 deletions

View File

@@ -62,7 +62,7 @@ home_xy_position: 127.5,105
speed: 100
z_hop: 10
z_hop_speed: 12
# move_to_previous: True # return back to previous X/Y after Z-home
# move_to_previous: True # return back to previous X/Y after Z-home
################################################################################
# Bed leveling
@@ -87,8 +87,8 @@ screw3: 229,206
screw3_name: back right screw
screw4: 26,206
screw4_name: back left screw
horizontal_move_z: 10
speed: 100
horizontal_move_z: 10
screw_thread: CW-M3
################################################################################
@@ -100,7 +100,6 @@ gcode:
{% if printer.toolhead.homed_axes != "xyz" %} G28 {% endif %} # home if not homed
BED_MESH_CALIBRATE
G0 X0 Y0 F6000
SAVE_AFTER_ALL
[gcode_macro PROBE_CALIBRATE] # Calibrate Z-offset
rename_existing: BASE_PROBE_CALIBRATE
@@ -108,19 +107,45 @@ gcode:
{% if printer.toolhead.homed_axes != "xyz" %} G28 {% endif %} # home if not homed
BASE_PROBE_CALIBRATE
# Save Mesh to Config ##########################################################
## Replace START_PRINT macro ###################################################
[gcode_macro SAVE_AFTER_ALL]
variable_save: 0
[gcode_macro START_PRINT]
## PrusaSliser:
# M190 S0
# M109 S0
# START_PRINT EXTRUDER_TEMP={first_layer_temperature[0]} BED_TEMP={first_layer_bed_temperature} MESH_DO=<1|0>
## Cura:
# M190 S0
# M109 S0
# START_PRINT EXTRUDER_TEMP={material_print_temperature_layer_0} BED_TEMP={material_bed_temperature_layer_0} MESH_DO=<1|0>
description: Start routine for the print
variable_retract: 10
gcode:
SET_GCODE_VARIABLE MACRO=SAVE_AFTER_ALL VARIABLE=save VALUE=1
[gcode_macro SAVE_IF_SET]
gcode:
{% if printer["gcode_macro SAVE_AFTER_ALL"].save == 1 %}
G4 P2000 # dwell 2 seconds
{action_respond_info("Saving and restarting now")}
SAVE_CONFIG
{% set extruder_temp = params.EXTRUDER_TEMP|default(240)|float %}
{% set bed_temp = params.BED_TEMP|default(70)|float %}
{% set E = printer["gcode_macro START_PRINT"].retract|float %}
{% set mesh = params.MESH_DO|default(0)|int %}
CLEAR_PAUSE
M220 S100 # reset feedrate
M221 S100 # reset flowrate
G90 # absolute positioning
M82 # relative extrusion mode
SET_HEATER_TEMPERATURE HEATER=heater_bed TARGET={bed_temp} # set bed temp
TEMPERATURE_WAIT SENSOR=heater_bed MINIMUM={bed_temp} # wait for bed temp
SET_HEATER_TEMPERATURE HEATER=extruder TARGET={extruder_temp} # set extruder temp
G28 # home
{% if 'MESH_DO' in params %}
{% if mesh == 0 %}
BED_MESH_PROFILE LOAD={bed_temp} # load existing mesh
{% else %}
G29 # do G29 while heating extruder
BED_MESH_PROFILE SAVE={bed_temp}
{% endif %}
{% endif %}
TEMPERATURE_WAIT SENSOR=extruder MINIMUM={extruder_temp} # wait for extruder temp
G0 Z10 F1500 # raise Z
G92 E0 # reset extruder
G1 E{E} F1500 # prime
G92 E0 # reset extruder
################################################################################

View File

@@ -30,7 +30,7 @@ homing_retract_dist: 0
[stepper_y]
step_pin: Y_STEP_PIN
dir_pin: !Y_DIR_PIN
dir_pin: Y_DIR_PIN
enable_pin: !Y_ENABLE_PIN
rotation_distance: 40
microsteps: 16
@@ -42,12 +42,12 @@ homing_speed: 100
homing_retract_dist: 0 # disable for head retraction after homing
[stepper_z] # left stepper
step_pin: Z1_STEP_PIN
dir_pin: !Z1_DIR_PIN
enable_pin: !Z1_ENABLE_PIN
step_pin: Z_STEP_PIN
dir_pin: !Z_DIR_PIN
enable_pin: !Z_ENABLE_PIN
rotation_distance: 8
microsteps: 16
endstop_pin: !Z1_STOP_PIN
endstop_pin: !Z_STOP_PIN
position_max: 200 # Z-axis print volume size
homing_speed: 20
second_homing_speed: 5

View File

@@ -62,7 +62,7 @@ home_xy_position: 127.5,105
speed: 100
z_hop: 10
z_hop_speed: 12
# move_to_previous: True # return back to previous X/Y after Z-home
# move_to_previous: True # return back to previous X/Y after Z-home
################################################################################
# Bed leveling
@@ -87,8 +87,8 @@ screw3: 230,180
screw3_name: back right screw
screw4: 25,180
screw4_name: back left screw
horizontal_move_z: 10
speed: 100
horizontal_move_z: 10
screw_thread: CW-M4
################################################################################
@@ -100,7 +100,6 @@ gcode:
{% if printer.toolhead.homed_axes != "xyz" %} G28 {% endif %} # home if not homed
BED_MESH_CALIBRATE
G0 X0 Y0 F6000
SAVE_AFTER_ALL
[gcode_macro PROBE_CALIBRATE] # Calibrate Z-offset
rename_existing: BASE_PROBE_CALIBRATE
@@ -108,19 +107,45 @@ gcode:
{% if printer.toolhead.homed_axes != "xyz" %} G28 {% endif %} # home if not homed
BASE_PROBE_CALIBRATE
# Save Mesh to Config ##########################################################
## Replace START_PRINT macro ###################################################
[gcode_macro SAVE_AFTER_ALL]
variable_save: 0
[gcode_macro START_PRINT]
## PrusaSliser:
# M190 S0
# M109 S0
# START_PRINT EXTRUDER_TEMP={first_layer_temperature[0]} BED_TEMP={first_layer_bed_temperature} MESH_DO=<1|0>
## Cura:
# M190 S0
# M109 S0
# START_PRINT EXTRUDER_TEMP={material_print_temperature_layer_0} BED_TEMP={material_bed_temperature_layer_0} MESH_DO=<1|0>
description: Start routine for the print
variable_retract: 10
gcode:
SET_GCODE_VARIABLE MACRO=SAVE_AFTER_ALL VARIABLE=save VALUE=1
[gcode_macro SAVE_IF_SET]
gcode:
{% if printer["gcode_macro SAVE_AFTER_ALL"].save == 1 %}
G4 P2000 # dwell 2 seconds
{action_respond_info("Saving and restarting now")}
SAVE_CONFIG
{% set extruder_temp = params.EXTRUDER_TEMP|default(240)|float %}
{% set bed_temp = params.BED_TEMP|default(70)|float %}
{% set E = printer["gcode_macro START_PRINT"].retract|float %}
{% set mesh = params.MESH_DO|default(0)|int %}
CLEAR_PAUSE
M220 S100 # reset feedrate
M221 S100 # reset flowrate
G90 # absolute positioning
M82 # relative extrusion mode
SET_HEATER_TEMPERATURE HEATER=heater_bed TARGET={bed_temp} # set bed temp
TEMPERATURE_WAIT SENSOR=heater_bed MINIMUM={bed_temp} # wait for bed temp
SET_HEATER_TEMPERATURE HEATER=extruder TARGET={extruder_temp} # set extruder temp
G28 # home
{% if 'MESH_DO' in params %}
{% if mesh == 0 %}
BED_MESH_PROFILE LOAD={bed_temp} # load existing mesh
{% else %}
G29 # do G29 while heating extruder
BED_MESH_PROFILE SAVE={bed_temp}
{% endif %}
{% endif %}
TEMPERATURE_WAIT SENSOR=extruder MINIMUM={extruder_temp} # wait for extruder temp
G0 Z10 F1500 # raise Z
G92 E0 # reset extruder
G1 E{E} F1500 # prime
G92 E0 # reset extruder
################################################################################

View File

@@ -30,7 +30,7 @@ homing_retract_dist: 0
[stepper_y]
step_pin: Y_STEP_PIN
dir_pin: !Y_DIR_PIN
dir_pin: Y_DIR_PIN
enable_pin: !Y_ENABLE_PIN
rotation_distance: 40
microsteps: 16
@@ -42,12 +42,12 @@ homing_speed: 100
homing_retract_dist: 0 # disable for head retraction after homing
[stepper_z] # left stepper
step_pin: Z1_STEP_PIN
dir_pin: !Z1_DIR_PIN
enable_pin: !Z1_ENABLE_PIN
step_pin: Z_STEP_PIN
dir_pin: !Z_DIR_PIN
enable_pin: !Z_ENABLE_PIN
rotation_distance: 8
microsteps: 16
endstop_pin: !Z1_STOP_PIN
endstop_pin: !Z_STOP_PIN
position_max: 200 # Z-axis print volume size
homing_speed: 20
second_homing_speed: 5

View File

@@ -65,7 +65,7 @@ home_xy_position: 175,155
speed: 100
z_hop: 10
z_hop_speed: 12
# move_to_previous: True # return back to previous X/Y after Z-home
# move_to_previous: True # return back to previous X/Y after Z-home
################################################################################
# Bed leveling
@@ -102,8 +102,8 @@ screw3: 305,267.5
screw3_name: back right screw
screw4: 45,267.5
screw4_name: back left screw
horizontal_move_z: 10
speed: 100
horizontal_move_z: 10
screw_thread: CW-M4
################################################################################
@@ -115,7 +115,6 @@ gcode:
{% if printer.toolhead.homed_axes != "xyz" %} G28 {% endif %} # home if not homed
BED_MESH_CALIBRATE
G0 X0 Y0 F6000
SAVE_AFTER_ALL
[gcode_macro PROBE_CALIBRATE] # Calibrate Z-offset
rename_existing: BASE_PROBE_CALIBRATE
@@ -123,19 +122,45 @@ gcode:
{% if printer.toolhead.homed_axes != "xyz" %} G28 {% endif %} # home if not homed
BASE_PROBE_CALIBRATE
# Save Mesh to Config ##########################################################
## Replace START_PRINT macro ###################################################
[gcode_macro SAVE_AFTER_ALL]
variable_save: 0
[gcode_macro START_PRINT]
## PrusaSliser:
# M190 S0
# M109 S0
# START_PRINT EXTRUDER_TEMP={first_layer_temperature[0]} BED_TEMP={first_layer_bed_temperature} MESH_DO=<1|0>
## Cura:
# M190 S0
# M109 S0
# START_PRINT EXTRUDER_TEMP={material_print_temperature_layer_0} BED_TEMP={material_bed_temperature_layer_0} MESH_DO=<1|0>
description: Start routine for the print
variable_retract: 10
gcode:
SET_GCODE_VARIABLE MACRO=SAVE_AFTER_ALL VARIABLE=save VALUE=1
[gcode_macro SAVE_IF_SET]
gcode:
{% if printer["gcode_macro SAVE_AFTER_ALL"].save == 1 %}
G4 P2000 # dwell 2 seconds
{action_respond_info("Saving and restarting now")}
SAVE_CONFIG
{% set extruder_temp = params.EXTRUDER_TEMP|default(240)|float %}
{% set bed_temp = params.BED_TEMP|default(70)|float %}
{% set E = printer["gcode_macro START_PRINT"].retract|float %}
{% set mesh = params.MESH_DO|default(0)|int %}
CLEAR_PAUSE
M220 S100 # reset feedrate
M221 S100 # reset flowrate
G90 # absolute positioning
M82 # relative extrusion mode
SET_HEATER_TEMPERATURE HEATER=heater_bed TARGET={bed_temp} # set bed temp
TEMPERATURE_WAIT SENSOR=heater_bed MINIMUM={bed_temp} # wait for bed temp
SET_HEATER_TEMPERATURE HEATER=extruder TARGET={extruder_temp} # set extruder temp
G28 # home
{% if 'MESH_DO' in params %}
{% if mesh == 0 %}
BED_MESH_PROFILE LOAD={bed_temp} # load existing mesh
{% else %}
G29 # do G29 while heating extruder
BED_MESH_PROFILE SAVE={bed_temp}
{% endif %}
{% endif %}
TEMPERATURE_WAIT SENSOR=extruder MINIMUM={extruder_temp} # wait for extruder temp
G0 Z10 F1500 # raise Z
G92 E0 # reset extruder
G1 E{E} F1500 # prime
G92 E0 # reset extruder
################################################################################