Merge remote-tracking branch 'origin/temp-ms' into personal

This commit is contained in:
Bassam Husain
2023-03-26 14:24:43 -04:00
2 changed files with 33 additions and 33 deletions

View File

@@ -52,27 +52,27 @@ gcode:
SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE={NEWSTATUS}
{% endif %}
[gcode_macro M109]
rename_existing: M99109
gcode:
#Parameters
{% set s = params.S|float %}
# [gcode_macro M109]
# rename_existing: M99109
# gcode:
# #Parameters
# {% set s = params.S|float %}
M104 {% for p in params %}{'%s%s' % (p, params[p])}{% endfor %} ; Set hotend temp
{% if s != 0 %}
TEMPERATURE_WAIT SENSOR=extruder MINIMUM={s} MAXIMUM={s+1} ; Wait for hotend temp (within 1 degree)
{% endif %}
# M104 {% for p in params %}{'%s%s' % (p, params[p])}{% endfor %} ; Set hotend temp
# {% if s != 0 %}
# TEMPERATURE_WAIT SENSOR=extruder MINIMUM={s} MAXIMUM={s+1} ; Wait for hotend temp (within 1 degree)
# {% endif %}
[gcode_macro M190]
rename_existing: M99190
gcode:
#Parameters
{% set s = params.S|float %}
# [gcode_macro M190]
# rename_existing: M99190
# gcode:
# #Parameters
# {% set s = params.S|float %}
M140 {% for p in params %}{'%s%s' % (p, params[p])}{% endfor %} ; Set bed temp
{% if s != 0 %}
TEMPERATURE_WAIT SENSOR=heater_bed MINIMUM={s} MAXIMUM={s+1} ; Wait for bed temp (within 1 degree)
{% endif %}
# M140 {% for p in params %}{'%s%s' % (p, params[p])}{% endfor %} ; Set bed temp
# {% if s != 0 %}
# TEMPERATURE_WAIT SENSOR=heater_bed MINIMUM={s} MAXIMUM={s+1} ; Wait for bed temp (within 1 degree)
# {% endif %}
[gcode_macro PURGE_LINE]
# https://github.com/JoeCat1207/V0.1-Purge-line-SuperSlicer/blob/main/Purgeline.txt

View File

@@ -34,7 +34,7 @@ square_corner_velocity: 8.0
step_pin: PC2
dir_pin: !PB9
enable_pin: !PC3
microsteps: 64
microsteps: 128
rotation_distance: 40
endstop_pin: tmc2209_stepper_x:virtual_endstop
position_endstop: 0
@@ -56,7 +56,7 @@ diag_pin: PA5
step_pin: PB8
dir_pin: PB7
enable_pin: !PC3
microsteps: 64
microsteps: 128
rotation_distance: 40
endstop_pin: tmc2209_stepper_y:virtual_endstop
position_endstop: 0
@@ -78,7 +78,7 @@ diag_pin: PA6
step_pin: PB6
dir_pin: !PB5
enable_pin: !PC3
microsteps: 64
microsteps: 128
rotation_distance: 4
endstop_pin: probe:z_virtual_endstop
position_min: -3
@@ -102,7 +102,7 @@ diag_pin: PA7
step_pin: PB4
dir_pin: !PB3
enable_pin: !PC3
microsteps: 64
microsteps: 128
rotation_distance: 4.65 # NOTE Calibrate e-steps and adjust https://www.klipper3d.org/Rotation_Distance.html
nozzle_diameter: 0.400
filament_diameter: 1.750
@@ -245,7 +245,7 @@ runout_gcode:
#*# pid_kd = 928.332
#*#
#*# [probe]
#*# z_offset = 1.665
#*# z_offset = 1.630
#*#
#*# [bed_mesh newbed]
#*# version = 1
@@ -288,11 +288,11 @@ runout_gcode:
#*# [bed_mesh default-v1]
#*# version = 1
#*# points =
#*# -0.219375, -0.138125, -0.072500, -0.067500, -0.108750
#*# -0.208125, -0.140625, -0.065625, -0.053125, -0.111250
#*# -0.220000, -0.124375, -0.058750, -0.051250, -0.100625
#*# -0.224375, -0.121250, -0.046250, -0.049375, -0.097500
#*# -0.184375, -0.072500, -0.006875, -0.008125, -0.043125
#*# -0.181250, -0.127500, -0.082500, -0.086875, -0.124375
#*# -0.182500, -0.123750, -0.063750, -0.069375, -0.132500
#*# -0.190000, -0.106250, -0.056250, -0.067500, -0.128125
#*# -0.185625, -0.100000, -0.042500, -0.063750, -0.128125
#*# -0.133125, -0.045625, 0.000000, -0.019375, -0.079375
#*# min_x = 27.0
#*# max_x = 222.0
#*# min_y = 5.0
@@ -307,11 +307,11 @@ runout_gcode:
#*# [bed_mesh default]
#*# version = 1
#*# points =
#*# -0.181250, -0.127500, -0.082500, -0.086875, -0.124375
#*# -0.182500, -0.123750, -0.063750, -0.069375, -0.132500
#*# -0.190000, -0.106250, -0.056250, -0.067500, -0.128125
#*# -0.185625, -0.100000, -0.042500, -0.063750, -0.128125
#*# -0.133125, -0.045625, 0.000000, -0.019375, -0.079375
#*# -0.147188, -0.085313, -0.033906, -0.025469, -0.035000
#*# -0.163594, -0.095313, -0.027344, -0.014219, -0.057813
#*# -0.187500, -0.087188, -0.030938, -0.019375, -0.063594
#*# -0.179844, -0.080625, -0.012813, -0.013750, -0.061406
#*# -0.126094, -0.026250, 0.033594, 0.030781, -0.010000
#*# x_count = 5
#*# y_count = 5
#*# mesh_x_pps = 2