7 Commits

4 changed files with 50 additions and 38 deletions

View File

@@ -20,6 +20,7 @@
"Klipper", "Klipper",
"Klipperized", "Klipperized",
"lrwxrwxrwx", "lrwxrwxrwx",
"microsteps",
"moonraker", "moonraker",
"normalsize", "normalsize",
"octahedroflake", "octahedroflake",

View File

@@ -29,9 +29,11 @@ gcode:
SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=0 SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=0
[gcode_macro _globals] [gcode_macro _globals]
# NOTE 0 = false; 1 = true
variable_filament_sensor_enabled: 1 # NOTE Enable(1) or disable(0) the filament sensor, if one is connected variable_filament_sensor_enabled: 1 # NOTE Enable(1) or disable(0) the filament sensor, if one is connected
variable_beeping_enabled: 1 # NOTE Enable(1) or disable(0) beeping everywhere except during gantry calibration variable_beeping_enabled: 1 # NOTE Enable(1) or disable(0) beeping everywhere except during gantry calibration
variable_bed_temp_over: 10 # NOTE Start print if bed temperature is over by this amount, otherwise wait for temperature drop variable_bed_temp_over: 10 # NOTE Start print if bed temperature is over by this amount, otherwise wait for temperature drop
variable_bed_temp_not_exact: 1 # NOTE Start print if bed temperature is `target temperature - 1` but continue to heat until target is reached
variable_kamp_enable: 0 # NOTE Enable(1) or disable(0) KAMP (adaptive mesh) variable_kamp_enable: 0 # NOTE Enable(1) or disable(0) KAMP (adaptive mesh)
variable_pre_purge_prime_length: 1.40 variable_pre_purge_prime_length: 1.40
gcode: gcode:
@@ -75,12 +77,20 @@ gcode:
[gcode_macro M190] [gcode_macro M190]
rename_existing: M99190 rename_existing: M99190
gcode: gcode:
# Variables
{% set bedtempNotExact = printer["gcode_macro _globals"].bed_temp_not_exact|default(1)|int %}
# Parameters # Parameters
{% set s = params.S|float %} {% set s = params.S|float %}
M140 {% for p in params %}{'%s%s' % (p, params[p])}{% endfor %} ; Set bed temp M140 {% for p in params %}{'%s%s' % (p, params[p])}{% endfor %} ; Set bed temp
{% if s != 0 %} {% if s != 0 %}
TEMPERATURE_WAIT SENSOR=heater_bed MINIMUM={s} MAXIMUM={s+1} ; Wait for bed temp (within 1 degree) {% if bedtempNotExact == 1 %}
TEMPERATURE_WAIT SENSOR=heater_bed MINIMUM={s-1} MAXIMUM={s+1} ; set & wait for bed temp (within -1 or +1 degree)
M140 {% for p in params %}{'%s%s' % (p, params[p])}{% endfor %} ; set & don't wait for bed temp
{% else %}
TEMPERATURE_WAIT SENSOR=heater_bed MINIMUM={s} MAXIMUM={s+1} ; Wait for bed temp (within +1 degree)
{% endif %}
{% endif %} {% endif %}
[gcode_macro PURGE_LINE] [gcode_macro PURGE_LINE]
@@ -189,12 +199,7 @@ gcode:
M400 ; wait for buffer to clear M400 ; wait for buffer to clear
G92 E0 ; zero the extruder G92 E0 ; zero the extruder
{% if printer['pause_resume'].is_paused|int == 0 %}
CONDITIONAL_BEEP i=3 dur=300 freq=400
G1 E-{PRE_PURGE_PRIME_LENGTH} F400 ; retract filament G1 E-{PRE_PURGE_PRIME_LENGTH} F400 ; retract filament
{% endif %}
G91 ; relative positioning G91 ; relative positioning
# Set safe speeds # Set safe speeds

6
differences.md Normal file
View File

@@ -0,0 +1,6 @@
# Differences
| Property | Marlin | OSS Klipper Config |
| ------------------------- | ------ | ------------------ |
| `stepper_z` `run_current` | 0.800 | 0.900 |
| `microsteps` | 16 | 128 |

View File

@@ -39,10 +39,10 @@ homing_retract_dist: 0
[tmc2209 stepper_x] [tmc2209 stepper_x]
uart_pin: PC1 uart_pin: PC1
run_current: 0.900 run_current: 0.900 # 0.860 marlin & master
stealthchop_threshold: 0 stealthchop_threshold: 0
interpolate: False interpolate: False
sense_resistor: 0.150 sense_resistor: 0.110 # 0.150
uart_address: 3 uart_address: 3
driver_SGTHRS: 81 driver_SGTHRS: 81
diag_pin: PA5 diag_pin: PA5
@@ -64,7 +64,7 @@ uart_pin: PC0
run_current: 0.900 run_current: 0.900
stealthchop_threshold: 0 stealthchop_threshold: 0
interpolate: False interpolate: False
sense_resistor: 0.150 sense_resistor: 0.110 # 0.150
uart_address: 3 uart_address: 3
driver_SGTHRS: 81 driver_SGTHRS: 81
diag_pin: PA6 diag_pin: PA6
@@ -82,10 +82,10 @@ homing_speed: 5
[tmc2209 stepper_z] [tmc2209 stepper_z]
uart_pin: PA15 uart_pin: PA15
run_current: 0.900 run_current: 0.800 # 0.900 prev personal # 0.800 marlin # 1.000 master
stealthchop_threshold: 0 stealthchop_threshold: 0
interpolate: False interpolate: False
sense_resistor: 0.150 sense_resistor: 0.110 # 0.150
uart_address: 3 uart_address: 3
diag_pin: PA7 diag_pin: PA7
@@ -250,32 +250,13 @@ runout_gcode:
#*# z_offset = 1.300 #*# z_offset = 1.300
#*# #*#
#*# [axis_twist_compensation] #*# [axis_twist_compensation]
#*# z_compensations = 0.083802, -0.029167, -0.054635 #*# z_compensations = 0.086615, -0.020885, -0.065729
#*# compensation_start_x = 27.0 #*# compensation_start_x = 27.0
#*# compensation_end_x = 195.0 #*# compensation_end_x = 195.0
#*# #*#
#*# [bed_mesh default-1] #*# [bed_mesh default-1]
#*# version = 1 #*# version = 1
#*# points = #*# points =
#*# 0.017700, 0.039838, 0.034162, 0.012223, -0.046875
#*# -0.056675, -0.012819, 0.009631, -0.006839, -0.086094
#*# -0.116831, -0.054850, -0.040056, -0.055433, -0.120625
#*# -0.121362, -0.051100, -0.034588, -0.050745, -0.111094
#*# -0.059643, 0.010619, 0.036506, 0.014255, -0.039375
#*# min_x = 27.0
#*# max_x = 222.0
#*# min_y = 6.0
#*# max_y = 203.0
#*# x_count = 5
#*# y_count = 5
#*# mesh_x_pps = 2
#*# mesh_y_pps = 2
#*# algo = bicubic
#*# tension = 0.2
#*#
#*# [bed_mesh default-0]
#*# version = 1
#*# points =
#*# 0.038482, 0.061556, 0.047131, 0.009098, -0.055469 #*# 0.038482, 0.061556, 0.047131, 0.009098, -0.055469
#*# -0.033862, 0.002963, 0.008381, -0.014808, -0.099375 #*# -0.033862, 0.002963, 0.008381, -0.014808, -0.099375
#*# -0.095737, -0.047819, -0.040213, -0.062620, -0.132031 #*# -0.095737, -0.047819, -0.040213, -0.062620, -0.132031
@@ -292,7 +273,7 @@ runout_gcode:
#*# algo = lagrange #*# algo = lagrange
#*# tension = 0.2 #*# tension = 0.2
#*# #*#
#*# [bed_mesh default] #*# [bed_mesh default-0]
#*# version = 1 #*# version = 1
#*# points = #*# points =
#*# 0.037145, 0.055020, 0.034770, -0.006886, -0.072291 #*# 0.037145, 0.055020, 0.034770, -0.006886, -0.072291
@@ -300,6 +281,25 @@ runout_gcode:
#*# -0.095512, -0.047480, -0.047261, -0.073292, -0.135573 #*# -0.095512, -0.047480, -0.047261, -0.073292, -0.135573
#*# -0.091918, -0.042793, -0.043824, -0.073136, -0.132760 #*# -0.091918, -0.042793, -0.043824, -0.073136, -0.132760
#*# -0.026449, 0.032520, 0.031801, -0.001886, -0.079010 #*# -0.026449, 0.032520, 0.031801, -0.001886, -0.079010
#*# min_x = 27.0
#*# max_x = 222.0
#*# min_y = 6.0
#*# max_y = 203.0
#*# x_count = 5
#*# y_count = 5
#*# mesh_x_pps = 2
#*# mesh_y_pps = 2
#*# algo = lagrange
#*# tension = 0.2
#*#
#*# [bed_mesh default]
#*# version = 1
#*# points =
#*# 0.029919, 0.051593, 0.042329, -0.005485, -0.076198
#*# -0.035550, 0.010968, 0.015923, -0.012203, -0.101979
#*# -0.095706, -0.038564, -0.032827, -0.059860, -0.134323
#*# -0.098988, -0.036220, -0.031733, -0.060641, -0.127292
#*# -0.035238, 0.039718, 0.042954, 0.004047, -0.067135
#*# x_count = 5 #*# x_count = 5
#*# y_count = 5 #*# y_count = 5
#*# mesh_x_pps = 2 #*# mesh_x_pps = 2