From febcd7440b074853d28c862a2a86c34f03d39b8a Mon Sep 17 00:00:00 2001 From: Bassam Husain Date: Tue, 31 Dec 2024 17:47:56 -0500 Subject: [PATCH 1/6] Adjust PRINT_END to account for paused state, should fix cancel bug when extruder temp lower than min extrude temp. --- cfgs/misc-macros.cfg | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cfgs/misc-macros.cfg b/cfgs/misc-macros.cfg index 85f7cba..2ca7e69 100644 --- a/cfgs/misc-macros.cfg +++ b/cfgs/misc-macros.cfg @@ -189,7 +189,11 @@ gcode: M400 ; wait for buffer to clear G92 E0 ; zero the extruder - G1 E-{PRE_PURGE_PRIME_LENGTH} F400 ; retract filament + + {% if not printer['pause_resume'].is_paused %} + G1 E-{PRE_PURGE_PRIME_LENGTH} F400 ; retract filament + {% endif %} + G91 ; relative positioning # Set safe speeds From a0ad64f90139cb5c4acf095c314275674568ee0a Mon Sep 17 00:00:00 2001 From: Bassam Husain Date: Wed, 1 Jan 2025 20:48:19 -0500 Subject: [PATCH 2/6] Adjust axis twist. --- printer.cfg | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/printer.cfg b/printer.cfg index 0e496af..61556d6 100644 --- a/printer.cfg +++ b/printer.cfg @@ -250,18 +250,18 @@ runout_gcode: #*# z_offset = 1.420 #*# #*# [axis_twist_compensation] -#*# z_compensations = 0.080937, -0.024688, -0.056250 +#*# z_compensations = 0.089427, -0.035573, -0.053854 #*# compensation_start_x = 27.0 #*# compensation_end_x = 195.0 #*# #*# [bed_mesh default-0] #*# version = 1 #*# 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 +#*# 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 @@ -276,11 +276,11 @@ runout_gcode: #*# [bed_mesh default] #*# version = 1 #*# points = -#*# 0.038482, 0.061556, 0.047131, 0.009098, -0.055469 -#*# -0.033862, 0.002963, 0.008381, -0.014808, -0.099375 -#*# -0.095737, -0.047819, -0.040213, -0.062620, -0.132031 -#*# -0.102768, -0.048131, -0.042088, -0.064808, -0.124688 -#*# -0.036206, 0.030931, 0.037131, 0.011598, -0.052656 +#*# 0.038482, 0.061556, 0.047131, 0.009098, -0.055469 +#*# -0.033862, 0.002963, 0.008381, -0.014808, -0.099375 +#*# -0.095737, -0.047819, -0.040213, -0.062620, -0.132031 +#*# -0.102768, -0.048131, -0.042088, -0.064808, -0.124688 +#*# -0.036206, 0.030931, 0.037131, 0.011598, -0.052656 #*# x_count = 5 #*# y_count = 5 #*# mesh_x_pps = 2 From 047830936557dce5ee2d01e0758cff04941131d1 Mon Sep 17 00:00:00 2001 From: Bassam Husain Date: Wed, 1 Jan 2025 21:02:03 -0500 Subject: [PATCH 3/6] Adjust axis twist. --- printer.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/printer.cfg b/printer.cfg index 61556d6..11ca0f6 100644 --- a/printer.cfg +++ b/printer.cfg @@ -250,7 +250,7 @@ runout_gcode: #*# z_offset = 1.420 #*# #*# [axis_twist_compensation] -#*# z_compensations = 0.089427, -0.035573, -0.053854 +#*# z_compensations = 0.083802, -0.029167, -0.054635 #*# compensation_start_x = 27.0 #*# compensation_end_x = 195.0 #*# From 5da31f9b346e43da7b884b55aab6388e5b14bec6 Mon Sep 17 00:00:00 2001 From: Bassam Husain Date: Wed, 1 Jan 2025 21:08:35 -0500 Subject: [PATCH 4/6] Adjust z_offset. --- printer.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/printer.cfg b/printer.cfg index 11ca0f6..d404bc1 100644 --- a/printer.cfg +++ b/printer.cfg @@ -247,7 +247,7 @@ runout_gcode: #*# pid_kd = 854.657 #*# #*# [probe] -#*# z_offset = 1.420 +#*# z_offset = 1.300 #*# #*# [axis_twist_compensation] #*# z_compensations = 0.083802, -0.029167, -0.054635 From f031abd7f6efa04fbd3016be14d7415990af04e6 Mon Sep 17 00:00:00 2001 From: Bassam Husain Date: Wed, 1 Jan 2025 21:17:05 -0500 Subject: [PATCH 5/6] New mesh. --- printer.cfg | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/printer.cfg b/printer.cfg index d404bc1..d80ed66 100644 --- a/printer.cfg +++ b/printer.cfg @@ -254,7 +254,7 @@ runout_gcode: #*# compensation_start_x = 27.0 #*# compensation_end_x = 195.0 #*# -#*# [bed_mesh default-0] +#*# [bed_mesh default-1] #*# version = 1 #*# points = #*# 0.017700, 0.039838, 0.034162, 0.012223, -0.046875 @@ -273,7 +273,7 @@ runout_gcode: #*# algo = bicubic #*# tension = 0.2 #*# -#*# [bed_mesh default] +#*# [bed_mesh default-0] #*# version = 1 #*# points = #*# 0.038482, 0.061556, 0.047131, 0.009098, -0.055469 @@ -281,6 +281,25 @@ runout_gcode: #*# -0.095737, -0.047819, -0.040213, -0.062620, -0.132031 #*# -0.102768, -0.048131, -0.042088, -0.064808, -0.124688 #*# -0.036206, 0.030931, 0.037131, 0.011598, -0.052656 +#*# 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.037145, 0.055020, 0.034770, -0.006886, -0.072291 +#*# -0.035980, -0.003730, 0.000395, -0.026104, -0.109323 +#*# -0.095512, -0.047480, -0.047261, -0.073292, -0.135573 +#*# -0.091918, -0.042793, -0.043824, -0.073136, -0.132760 +#*# -0.026449, 0.032520, 0.031801, -0.001886, -0.079010 #*# x_count = 5 #*# y_count = 5 #*# mesh_x_pps = 2 From 033fdd7ee77daccb8baf22e7ea546230b6c984ef Mon Sep 17 00:00:00 2001 From: Bassam Husain Date: Thu, 2 Jan 2025 02:36:14 -0500 Subject: [PATCH 6/6] Adjust PRINT_END again to account for paused state. --- cfgs/misc-macros.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cfgs/misc-macros.cfg b/cfgs/misc-macros.cfg index 2ca7e69..e852c18 100644 --- a/cfgs/misc-macros.cfg +++ b/cfgs/misc-macros.cfg @@ -190,7 +190,8 @@ gcode: M400 ; wait for buffer to clear G92 E0 ; zero the extruder - {% if not printer['pause_resume'].is_paused %} + {% 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 {% endif %}