From 1dc39dba71585df90b65e4c77f12a5a889eaa5c0 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 16 Dec 2019 13:15:24 +0100 Subject: [PATCH] Move prime speed override to definition file To reduce the number of overrides. You'd only need to change it in one place, next time. It was being overridden in the quality profile in every supported configuration. --- resources/definitions/imade3d_jellybox.def.json | 4 ++++ resources/definitions/imade3d_jellybox_2.def.json | 4 ++++ .../quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg | 1 - .../quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg | 1 - .../quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg | 1 - .../imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg | 1 - .../quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg | 1 - resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg | 1 - .../quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg | 1 - .../quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg | 1 - 10 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/definitions/imade3d_jellybox.def.json b/resources/definitions/imade3d_jellybox.def.json index 635cb1fdd0..87f9155974 100644 --- a/resources/definitions/imade3d_jellybox.def.json +++ b/resources/definitions/imade3d_jellybox.def.json @@ -28,6 +28,10 @@ }, "machine_end_gcode": { "default_value": "\n;---------------------------------\n;;; Jellybox End Script Begin ;;;\n;_________________________________\n; end gcode last modified Nov 30, 2018\nM117 Finishing Up ;write Finishing Up\n\nM107 ;turn the fan off\nM104 S0 ;extruder heater off\nM140 S0 ;bed heater off (if you have it)\nG91 ;relative positioning (includes extruder)\nG1 E-1 F2500 ;retract the filament a bit before lifting the nozzle to release some of the pressure\nG1 Z0.5 E-4 X-10 F9000 ;get out and retract filament even more\nG1 E-25 F2500 ;retract even more\nG90 ;absolute positioning (includes extruder)\nG28 X ;home X so the head is out of the way\nG1 Y140 ;move Y forward, so the print is more accessible\nM84 ;steppers off\n\nM117 Print finished ;write Print finished\n;---------------------------------------\n;;; Jellybox End Script End ;;;\n;_______________________________________" + }, + + "retraction_prime_speed": { + "value": "max(retraction_speed - 30, 5)" } } } diff --git a/resources/definitions/imade3d_jellybox_2.def.json b/resources/definitions/imade3d_jellybox_2.def.json index 7d7b82e194..5fddf4e80d 100644 --- a/resources/definitions/imade3d_jellybox_2.def.json +++ b/resources/definitions/imade3d_jellybox_2.def.json @@ -31,6 +31,10 @@ }, "machine_end_gcode": { "default_value": "\n;---------------------------------\n;;; Jellybox End Script Begin ;;;\n;_________________________________\n; end gcode last modified Nov 30, 2018\nM117 Finishing Up ;write Finishing Up\n\nM107 ;turn the fan off\nM104 S0 ;extruder heater off\nM140 S0 ;bed heater off (if you have it)\nG91 ;relative positioning (includes extruder)\nG1 E-1 F2500 ;retract the filament a bit before lifting the nozzle to release some of the pressure\nG1 Z0.5 E-4 X-10 F9000 ;get out and retract filament even more\nG1 E-25 F2500 ;retract even more\nG90 ;absolute positioning (includes extruder)\nG28 X ;home X so the head is out of the way\nG1 Y140 ;move Y forward, so the print is more accessible\nM84 ;steppers off\n\nM117 Print finished ;write Print finished\n;---------------------------------------\n;;; Jellybox End Script End ;;;\n;_______________________________________" + }, + + "retraction_prime_speed": { + "value": "max(retraction_speed - 30, 5)" } } } diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg index ef45502137..e16c7742a7 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg @@ -35,7 +35,6 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg index 0f02c8936b..720ac1bc21 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg @@ -35,7 +35,6 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg index a32b10b6f0..1b21e17bb0 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg @@ -35,7 +35,6 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg index fcb09608a5..5cc0d2891f 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg @@ -35,7 +35,6 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg index 8c6ef45e14..8480d89044 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg @@ -35,7 +35,6 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg index 4a24435343..35764ec9e6 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg @@ -35,7 +35,6 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg index 2aa011b3a7..984bdad44f 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg @@ -35,7 +35,6 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2 diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg index 0faf4ba24d..dec5ec9af0 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg @@ -35,7 +35,6 @@ retraction_combing = noskin retraction_hop_enabled = True retraction_min_travel = =machine_nozzle_size * 3 retraction_retract_speed = =retraction_speed -retraction_prime_speed = =max(retraction_speed - 30, 5) roofing_layer_count = 1 skin_line_width = =line_width * 1.2 skin_outline_count = 2