From 3417a858b4869967752b59bba88f2e9d36948272 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 24 Oct 2023 16:11:41 +0200 Subject: [PATCH] Use default prime tower position for everyone This is necessary to ensure that all printers use a valid prime tower position, now that the position computation rule has changed and includes the base/brim. CURA-10783 --- resources/definitions/Mark2_for_Ultimaker2.def.json | 4 +--- resources/definitions/SV02.def.json | 4 +--- resources/definitions/atmat_signal_pro_base.def.json | 4 +--- resources/definitions/bibo2_dual.def.json | 4 +--- resources/definitions/builder_premium_large.def.json | 4 +--- resources/definitions/builder_premium_medium.def.json | 4 +--- resources/definitions/builder_premium_small.def.json | 4 +--- resources/definitions/cartesio.def.json | 4 +--- resources/definitions/deltacomb_base.def.json | 4 +--- resources/definitions/dxu.def.json | 4 +--- resources/definitions/felixpro2dual.def.json | 4 +--- resources/definitions/geeetech_A30M.def.json | 6 ++---- resources/definitions/geeetech_A30T.def.json | 6 ++---- resources/definitions/geeetech_I3ProC.def.json | 4 +--- resources/definitions/geeetech_MizarM.def.json | 6 ++---- resources/definitions/hms434.def.json | 4 +--- resources/definitions/leapfrog_bolt_pro.def.json | 4 +--- resources/definitions/lnl3d_d3.def.json | 6 ++---- resources/definitions/lnl3d_d3_vulcan.def.json | 6 ++---- resources/definitions/lnl3d_d5.def.json | 6 ++---- resources/definitions/lnl3d_d6.def.json | 6 ++---- resources/definitions/lotmaxx_sc60.def.json | 4 +--- resources/definitions/makeit_pro_l.def.json | 4 +--- resources/definitions/makeit_pro_m.def.json | 4 +--- resources/definitions/makeit_pro_mx.def.json | 4 +--- resources/definitions/raise3D_N2_dual.def.json | 4 +--- resources/definitions/raise3D_N2_plus_dual.def.json | 4 +--- resources/definitions/raise3D_N2_plus_single.def.json | 4 +--- resources/definitions/raise3D_N2_single.def.json | 4 +--- resources/definitions/skriware_2.def.json | 4 +--- resources/definitions/stereotech_ste320.def.json | 6 ++---- resources/definitions/strateo3d.def.json | 4 +--- resources/definitions/strateo3d_IDEX420.def.json | 4 +--- resources/definitions/ultimaker3.def.json | 3 +-- resources/definitions/ultimaker_original_dual.def.json | 6 ++---- ...Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg | 2 -- ...apfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg | 2 -- ...eapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg | 2 -- ...pfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg | 2 -- ...Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg | 2 -- ...apfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg | 2 -- .../gmax15plus/gmax15plus_global_dual_normal.inst.cfg | 2 -- .../gmax15plus/gmax15plus_global_dual_thick.inst.cfg | 2 -- .../quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg | 2 -- .../gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg | 2 -- .../tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg | 2 -- .../tizyx_evy_dual_global_Flex_Quality.inst.cfg | 2 -- .../tizyx_evy_dual_global_High_Quality.inst.cfg | 2 -- .../tizyx_evy_dual_global_Normal_Quality.inst.cfg | 2 -- .../tizyx_evy_dual_global_PVA_Quality.inst.cfg | 2 -- 50 files changed, 44 insertions(+), 143 deletions(-) diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json index 305a9b18da..f8da6e356c 100644 --- a/resources/definitions/Mark2_for_Ultimaker2.def.json +++ b/resources/definitions/Mark2_for_Ultimaker2.def.json @@ -137,8 +137,6 @@ "machine_start_gcode": { "value": "\"\" if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 Z0; home all\\nG28 X0 Y0\\nG0 Z20 F2400 ;move the platform to 20mm\\nG92 E0\\nM190 S{material_bed_temperature_layer_0}\\nM109 T0 S{material_standby_temperature, 0}\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nT1 ; move to the 2th head\\nG0 Z20 F2400\\nG92 E-7.0 ;prime distance\\nG1 E0 F45 ;purge nozzle\\nG1 E-5.1 F1500 ; retract\\nG1 X90 Z0.01 F5000 ; move away from the prime poop\\nG1 X50 F9000\\nG0 Z20 F2400\\nT0 ; move to the first head\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM104 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 X60 Z0.01 F5000 ; move away from the prime poop\\nG1 X20 F9000\\nM400 ;finish all moves\\nG92 E0\\n;end of startup sequence\\n\"" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": false }, "machine_width": { "default_value": 223 }, - "prime_tower_position_x": { "value": "185" }, - "prime_tower_position_y": { "value": "160" }, "retraction_amount": { "default_value": 5.1 }, "retraction_speed": { "default_value": 25 }, "speed_support": { "value": "speed_wall_0" }, @@ -164,4 +162,4 @@ "value": "retraction_speed" } } -} \ No newline at end of file +} diff --git a/resources/definitions/SV02.def.json b/resources/definitions/SV02.def.json index 728a6c6242..ecb5eea28e 100644 --- a/resources/definitions/SV02.def.json +++ b/resources/definitions/SV02.def.json @@ -60,8 +60,6 @@ "material_diameter": { "default_value": 1.75 }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "prime_tower_min_volume": { "value": "((resolveOrValue('layer_height'))/2" }, - "prime_tower_position_x": { "value": "240" }, - "prime_tower_position_y": { "value": "190" }, "prime_tower_size": { "value": "30" }, "prime_tower_wipe_enabled": { "default_value": true }, "retraction_amount": { "default_value": 5 }, @@ -73,4 +71,4 @@ "top_bottom_thickness": { "default_value": 1 }, "wall_0_wipe_dist": { "value": 0.0 } } -} \ No newline at end of file +} diff --git a/resources/definitions/atmat_signal_pro_base.def.json b/resources/definitions/atmat_signal_pro_base.def.json index 7d14fa6576..7dad5a121e 100644 --- a/resources/definitions/atmat_signal_pro_base.def.json +++ b/resources/definitions/atmat_signal_pro_base.def.json @@ -111,8 +111,6 @@ "minimum_polygon_circumference": { "value": "0.2" }, "optimize_wall_printing_order": { "value": "True" }, "prime_tower_enable": { "value": "True" }, - "prime_tower_position_x": { "value": "270" }, - "prime_tower_position_y": { "value": "270" }, "retraction_amount": { "value": "1" }, "retraction_combing": { "value": "'noskin'" }, "retraction_combing_max_distance": { "value": "10" }, @@ -173,4 +171,4 @@ "wall_overhang_speed_factor": { "value": "50" }, "zig_zaggify_infill": { "value": "True" } } -} \ No newline at end of file +} diff --git a/resources/definitions/bibo2_dual.def.json b/resources/definitions/bibo2_dual.def.json index 344fdbf3b9..19fc6be081 100644 --- a/resources/definitions/bibo2_dual.def.json +++ b/resources/definitions/bibo2_dual.def.json @@ -41,8 +41,6 @@ "machine_start_gcode": { "default_value": "M104 T0 165\nM104 T1 165\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z2.0 F400 ;move the platform down 2mm\nT0\nG92 E0\nG28\nG1 Y0 F1200 E0\nG92 E0\nT{initial_extruder_nr}\nM117 BIBO Printing..." }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, "machine_width": { "default_value": 214 }, - "prime_tower_position_x": { "value": "50" }, - "prime_tower_position_y": { "value": "50" }, "speed_print": { "default_value": 40 } } -} \ No newline at end of file +} diff --git a/resources/definitions/builder_premium_large.def.json b/resources/definitions/builder_premium_large.def.json index 1ba55471d3..0dd4b6661a 100644 --- a/resources/definitions/builder_premium_large.def.json +++ b/resources/definitions/builder_premium_large.def.json @@ -81,8 +81,6 @@ "material_standby_temperature": { "value": "material_print_temperature" }, "prime_blob_enable": { "enabled": true }, "prime_tower_min_volume": { "default_value": 50 }, - "prime_tower_position_x": { "value": "175" }, - "prime_tower_position_y": { "value": "178" }, "prime_tower_wipe_enabled": { "default_value": false }, "retraction_amount": { "default_value": 3 }, "retraction_speed": { "default_value": 15 }, @@ -102,4 +100,4 @@ "travel_retract_before_outer_wall": { "default_value": true }, "wall_thickness": { "value": "1.2" } } -} \ No newline at end of file +} diff --git a/resources/definitions/builder_premium_medium.def.json b/resources/definitions/builder_premium_medium.def.json index b8a3d8578d..e0525e1232 100644 --- a/resources/definitions/builder_premium_medium.def.json +++ b/resources/definitions/builder_premium_medium.def.json @@ -81,8 +81,6 @@ "material_standby_temperature": { "value": "material_print_temperature" }, "prime_blob_enable": { "enabled": true }, "prime_tower_min_volume": { "default_value": 50 }, - "prime_tower_position_x": { "value": "175" }, - "prime_tower_position_y": { "value": "178" }, "prime_tower_wipe_enabled": { "default_value": false }, "retraction_amount": { "default_value": 3 }, "retraction_speed": { "default_value": 15 }, @@ -102,4 +100,4 @@ "travel_retract_before_outer_wall": { "default_value": true }, "wall_thickness": { "value": "1.2" } } -} \ No newline at end of file +} diff --git a/resources/definitions/builder_premium_small.def.json b/resources/definitions/builder_premium_small.def.json index ab773a45d2..882d666284 100644 --- a/resources/definitions/builder_premium_small.def.json +++ b/resources/definitions/builder_premium_small.def.json @@ -80,8 +80,6 @@ "material_standby_temperature": { "value": "material_print_temperature" }, "prime_blob_enable": { "enabled": true }, "prime_tower_min_volume": { "default_value": 50 }, - "prime_tower_position_x": { "value": "175" }, - "prime_tower_position_y": { "value": "178" }, "prime_tower_wipe_enabled": { "default_value": false }, "retraction_amount": { "default_value": 3 }, "retraction_speed": { "default_value": 15 }, @@ -101,4 +99,4 @@ "travel_retract_before_outer_wall": { "default_value": true }, "wall_thickness": { "value": "1.2" } } -} \ No newline at end of file +} diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index db725f91ed..934995355f 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -66,9 +66,7 @@ "optimize_wall_printing_order": { "default_value": true }, "prime_blob_enable": { "default_value": false }, "prime_tower_min_volume": { "value": "0.7" }, - "prime_tower_position_x": { "value": "125" }, - "prime_tower_position_y": { "value": "70" }, "prime_tower_size": { "value": 24.0 }, "retraction_extra_prime_amount": { "minimum_value_warning": "-2.0" } } -} \ No newline at end of file +} diff --git a/resources/definitions/deltacomb_base.def.json b/resources/definitions/deltacomb_base.def.json index a4634bfcf1..f712c2c2cb 100644 --- a/resources/definitions/deltacomb_base.def.json +++ b/resources/definitions/deltacomb_base.def.json @@ -55,8 +55,6 @@ "machine_shape": { "default_value": "elliptic" }, "machine_start_gcode": { "default_value": ";---------------------------------------\n;Deltacomb start script\n;---------------------------------------\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nM420 S1; Bed Level Enable\nG92 E0 ;zero the extruded length\nG1 Z15.0 F9000 ;move to the platform down 15mm\nG1 F9000\n\n;Put printing message on LCD screen\nM117 In stampa...\nM140 S{print_bed_temperature} ;set the target bed temperature\n;---------------------------------------" }, "prime_tower_brim_enable": { "value": false }, - "prime_tower_position_x": { "value": "prime_tower_size / 2" }, - "prime_tower_position_y": { "value": "machine_depth / 2 - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" }, "prime_tower_size": { "value": "math.sqrt(extruders_enabled_count * prime_tower_min_volume / layer_height / math.pi) * 2" }, "retraction_amount": { "default_value": 3.5 }, "retraction_combing": { "value": "'noskin'" }, @@ -87,4 +85,4 @@ "travel_avoid_supports": { "value": "True" }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" } } -} \ No newline at end of file +} diff --git a/resources/definitions/dxu.def.json b/resources/definitions/dxu.def.json index 8513dd5f8e..004212b283 100644 --- a/resources/definitions/dxu.def.json +++ b/resources/definitions/dxu.def.json @@ -131,8 +131,6 @@ "machine_width": { "default_value": 238 }, "material_adhesion_tendency": { "enabled": true }, "material_diameter": { "default_value": 1.75 }, - "prime_tower_position_x": { "value": "180" }, - "prime_tower_position_y": { "value": "160" }, "retraction_amount": { "default_value": 6.5 }, "retraction_speed": { "default_value": 25 }, "speed_support": { "value": "speed_wall_0" }, @@ -158,4 +156,4 @@ "value": "retraction_speed" } } -} \ No newline at end of file +} diff --git a/resources/definitions/felixpro2dual.def.json b/resources/definitions/felixpro2dual.def.json index fd621f6073..3a18755b17 100644 --- a/resources/definitions/felixpro2dual.def.json +++ b/resources/definitions/felixpro2dual.def.json @@ -56,8 +56,6 @@ "default_value": 110, "value": "material_flow * 1.1" }, - "prime_tower_position_x": { "value": "250" }, - "prime_tower_position_y": { "value": "200" }, "retraction_amount": { "default_value": 1 }, "retraction_speed": { "default_value": 50 }, "skirt_brim_minimal_length": { "default_value": 130 }, @@ -66,4 +64,4 @@ "top_bottom_thickness": { "default_value": 1 }, "wall_thickness": { "value": "1" } } -} \ No newline at end of file +} diff --git a/resources/definitions/geeetech_A30M.def.json b/resources/definitions/geeetech_A30M.def.json index 8b6e6a703b..4526c5dbfa 100644 --- a/resources/definitions/geeetech_A30M.def.json +++ b/resources/definitions/geeetech_A30M.def.json @@ -30,8 +30,6 @@ "machine_height": { "default_value": 420 }, "machine_name": { "default_value": "Geeetech A30M" }, "machine_start_gcode": { "default_value": ";Geeetech A30M Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_width": { "default_value": 320 }, - "prime_tower_position_x": { "value": 290 }, - "prime_tower_position_y": { "value": 260 } + "machine_width": { "default_value": 320 } } -} \ No newline at end of file +} diff --git a/resources/definitions/geeetech_A30T.def.json b/resources/definitions/geeetech_A30T.def.json index 610ee35fa4..e734cf6451 100644 --- a/resources/definitions/geeetech_A30T.def.json +++ b/resources/definitions/geeetech_A30T.def.json @@ -31,8 +31,6 @@ "machine_height": { "default_value": 420 }, "machine_name": { "default_value": "Geeetech A30T" }, "machine_start_gcode": { "default_value": ";Geeetech A30T Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_width": { "default_value": 320 }, - "prime_tower_position_x": { "value": 290 }, - "prime_tower_position_y": { "value": 260 } + "machine_width": { "default_value": 320 } } -} \ No newline at end of file +} diff --git a/resources/definitions/geeetech_I3ProC.def.json b/resources/definitions/geeetech_I3ProC.def.json index f05185e5ba..bdad018e29 100644 --- a/resources/definitions/geeetech_I3ProC.def.json +++ b/resources/definitions/geeetech_I3ProC.def.json @@ -31,8 +31,6 @@ "machine_name": { "default_value": "Geeetech I3ProC" }, "machine_start_gcode": { "default_value": ";Geeetech I3ProC Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y180.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y180.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_width": { "default_value": 200 }, - "prime_tower_position_x": { "value": 170 }, - "prime_tower_position_y": { "value": 140 }, "retraction_amount": { "value": 2 } } -} \ No newline at end of file +} diff --git a/resources/definitions/geeetech_MizarM.def.json b/resources/definitions/geeetech_MizarM.def.json index d4182ebb62..4ca8c9cf2a 100644 --- a/resources/definitions/geeetech_MizarM.def.json +++ b/resources/definitions/geeetech_MizarM.def.json @@ -31,8 +31,6 @@ "machine_name": { "default_value": "Geeetech MizarM" }, "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarM: https://github.com/Geeetech3D/Mizar-M \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_width": { "default_value": 255 }, - "material_standby_temperature": { "value": 200 }, - "prime_tower_position_x": { "value": 225 }, - "prime_tower_position_y": { "value": 195 } + "material_standby_temperature": { "value": 200 } } -} \ No newline at end of file +} diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index 5250df5d73..60eb4cbeec 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -137,8 +137,6 @@ "minimum_polygon_circumference": { "value": 0.05 }, "optimize_wall_printing_order": { "default_value": true }, "prime_blob_enable": { "default_value": false }, - "prime_tower_position_x": { "value": 125 }, - "prime_tower_position_y": { "value": 70 }, "prime_tower_size": { "value": 20.6 }, "retract_at_layer_change": { "value": false }, "retraction_combing": { "value": "'off'" }, @@ -184,4 +182,4 @@ "z_seam_x": { "value": "300" }, "z_seam_y": { "value": "325" } } -} \ No newline at end of file +} diff --git a/resources/definitions/leapfrog_bolt_pro.def.json b/resources/definitions/leapfrog_bolt_pro.def.json index c880eef16c..0e4d3c3bfd 100644 --- a/resources/definitions/leapfrog_bolt_pro.def.json +++ b/resources/definitions/leapfrog_bolt_pro.def.json @@ -81,11 +81,9 @@ "material_initial_print_temperature": { "value": "default_material_print_temperature" }, "material_standby_temperature": { "enabled": false }, "prime_tower_enable": { "resolve": "extruders_enabled_count > 1" }, - "prime_tower_position_x": { "value": "169" }, - "prime_tower_position_y": { "value": "25" }, "retraction_amount": { "default_value": 2 }, "retraction_combing": { "value": "'all'" }, "skirt_line_count": { "default_value": 3 }, "speed_travel": { "value": "200" } } -} \ No newline at end of file +} diff --git a/resources/definitions/lnl3d_d3.def.json b/resources/definitions/lnl3d_d3.def.json index 52e8042306..0c0bfacd41 100755 --- a/resources/definitions/lnl3d_d3.def.json +++ b/resources/definitions/lnl3d_d3.def.json @@ -17,8 +17,6 @@ "machine_depth": { "default_value": 300 }, "machine_height": { "default_value": 350 }, "machine_name": { "default_value": "LNL3D D3" }, - "machine_width": { "default_value": 300 }, - "prime_tower_position_x": { "value": "155" }, - "prime_tower_position_y": { "value": "155" } + "machine_width": { "default_value": 300 } } -} \ No newline at end of file +} diff --git a/resources/definitions/lnl3d_d3_vulcan.def.json b/resources/definitions/lnl3d_d3_vulcan.def.json index f81cae81c5..fe0d2aea29 100755 --- a/resources/definitions/lnl3d_d3_vulcan.def.json +++ b/resources/definitions/lnl3d_d3_vulcan.def.json @@ -17,8 +17,6 @@ "machine_depth": { "default_value": 300 }, "machine_height": { "default_value": 320 }, "machine_name": { "default_value": "LNL3D D3 Vulcan" }, - "machine_width": { "default_value": 295 }, - "prime_tower_position_x": { "value": "155" }, - "prime_tower_position_y": { "value": "155" } + "machine_width": { "default_value": 295 } } -} \ No newline at end of file +} diff --git a/resources/definitions/lnl3d_d5.def.json b/resources/definitions/lnl3d_d5.def.json index 535341166f..6b1e966737 100755 --- a/resources/definitions/lnl3d_d5.def.json +++ b/resources/definitions/lnl3d_d5.def.json @@ -17,8 +17,6 @@ "machine_depth": { "default_value": 500 }, "machine_height": { "default_value": 600 }, "machine_name": { "default_value": "LNL3D D5" }, - "machine_width": { "default_value": 500 }, - "prime_tower_position_x": { "value": "155" }, - "prime_tower_position_y": { "value": "155" } + "machine_width": { "default_value": 500 } } -} \ No newline at end of file +} diff --git a/resources/definitions/lnl3d_d6.def.json b/resources/definitions/lnl3d_d6.def.json index b6f99a13ae..2f2f8ef008 100644 --- a/resources/definitions/lnl3d_d6.def.json +++ b/resources/definitions/lnl3d_d6.def.json @@ -17,8 +17,6 @@ "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 600 }, "machine_name": { "default_value": "LNL3D D6" }, - "machine_width": { "default_value": 600 }, - "prime_tower_position_x": { "value": "155" }, - "prime_tower_position_y": { "value": "155" } + "machine_width": { "default_value": 600 } } -} \ No newline at end of file +} diff --git a/resources/definitions/lotmaxx_sc60.def.json b/resources/definitions/lotmaxx_sc60.def.json index 25dc7f5ae8..08a5482178 100644 --- a/resources/definitions/lotmaxx_sc60.def.json +++ b/resources/definitions/lotmaxx_sc60.def.json @@ -46,8 +46,6 @@ "optimize_wall_printing_order": { "value": true }, "prime_tower_enable": { "value": true }, "prime_tower_min_volume": { "value": 30 }, - "prime_tower_position_x": { "value": 50 }, - "prime_tower_position_y": { "value": 50 }, "retract_at_layer_change": { "value": false }, "retraction_amount": { "value": 4.5 }, "roofing_layer_count": { "value": 1 }, @@ -69,4 +67,4 @@ "z_seam_type": { "default_value": "sharpest_corner" }, "zig_zaggify_infill": { "value": true } } -} \ No newline at end of file +} diff --git a/resources/definitions/makeit_pro_l.def.json b/resources/definitions/makeit_pro_l.def.json index dfba300698..7ef242c46b 100644 --- a/resources/definitions/makeit_pro_l.def.json +++ b/resources/definitions/makeit_pro_l.def.json @@ -43,12 +43,10 @@ "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG92 E0 ;zero the extruded length\nG28 ;home\nG1 F200 E30 ;extrude 30 mm of feed stock\nG92 E0 ;zero the extruded length\nG1 E-5 ;retract 5 mm\nG28 SC ;Do homeing, clean nozzles and let printer to know that printing started\nG92 X-6 ;Sets Curas checker board to match printers heated bed coordinates\nG1 F{speed_travel}\nM117 Printing..." }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, "machine_width": { "default_value": 305 }, - "prime_tower_position_x": { "value": "185" }, - "prime_tower_position_y": { "value": "160" }, "print_sequence": { "enabled": true }, "retraction_amount": { "default_value": 6 }, "retraction_speed": { "default_value": 180 }, "speed_print": { "default_value": 60 }, "wall_thickness": { "value": "1.2" } } -} \ No newline at end of file +} diff --git a/resources/definitions/makeit_pro_m.def.json b/resources/definitions/makeit_pro_m.def.json index 7b42c3acaf..cd1220ef0e 100644 --- a/resources/definitions/makeit_pro_m.def.json +++ b/resources/definitions/makeit_pro_m.def.json @@ -42,12 +42,10 @@ "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG92 E0 ;zero the extruded length\nG28 ;home\nG1 F200 E30 ;extrude 30 mm of feed stock\nG92 E0 ;zero the extruded length\nG1 E-5 ;retract 5 mm\nG28 SC ;Do homeing, clean nozzles and let printer to know that printing started\nG92 X-6 ;Sets Curas checker board to match printers heated bed coordinates\nG1 F{speed_travel}\nM117 Printing..." }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, "machine_width": { "default_value": 200 }, - "prime_tower_position_x": { "value": "185" }, - "prime_tower_position_y": { "value": "160" }, "print_sequence": { "enabled": false }, "retraction_amount": { "default_value": 6 }, "retraction_speed": { "default_value": 180 }, "speed_print": { "default_value": 60 }, "wall_thickness": { "value": "1.2" } } -} \ No newline at end of file +} diff --git a/resources/definitions/makeit_pro_mx.def.json b/resources/definitions/makeit_pro_mx.def.json index f7728af7f6..bad188d063 100644 --- a/resources/definitions/makeit_pro_mx.def.json +++ b/resources/definitions/makeit_pro_mx.def.json @@ -42,12 +42,10 @@ "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG92 E0 ;zero the extruded length\nG28 ;home\nG1 F200 E30 ;extrude 30 mm of feed stock\nG92 E0 ;zero the extruded length\nG1 E-5 ;retract 5 mm\nG28 SC ;Do homeing, clean nozzles and let printer to know that printing started\nG92 X-6 ;Sets Curas checker board to match printers heated bed coordinates\nG1 F{speed_travel}\nM117 Printing..." }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, "machine_width": { "default_value": 200 }, - "prime_tower_position_x": { "value": "185" }, - "prime_tower_position_y": { "value": "160" }, "print_sequence": { "enabled": false }, "retraction_amount": { "default_value": 6 }, "retraction_speed": { "default_value": 180 }, "speed_print": { "default_value": 60 }, "wall_thickness": { "value": "1.2" } } -} \ No newline at end of file +} diff --git a/resources/definitions/raise3D_N2_dual.def.json b/resources/definitions/raise3D_N2_dual.def.json index 690a9730b4..59bb2d6156 100644 --- a/resources/definitions/raise3D_N2_dual.def.json +++ b/resources/definitions/raise3D_N2_dual.def.json @@ -42,8 +42,6 @@ "machine_start_gcode": { "default_value": "G90\nG21\n; home all axes\nG28\nG92 X0 Y0 Z0\n; move heatbed into position\nG1 X20.0 Y20.0 Z1.0 F1000\n; zero extruders\nG92 E0 E1\nT0; right tool\n; set extruder steps per mm\nM92 E140\nT1; left tool\n; set extruder steps per mm\nM92 E140\nT0; left tool\nG92 E0 E1\n; purge nozzle\nG1 E25 F250\nT1; left tool\nG92 E0 E1\n; purge nozzle\nG1 E25 F250\n; zero extruders\nG92 E0 E1\n; move heatbed down a little more\nG1 Z5.0 F20\n; wait 600ms\nG4 600\n; move to tack down the strands\nG1 X20.0 Y30.0 Z0 F9000\n; wait 600ms\nG4 600\n;move up a bit\nG1 Z5.0 F9000\n; wait 300ms\nG4 300\n;fast move to center\nG1 X152.5 Y152.5 F9000\nT0\n;Raise3D Job Start\nM117 Printing...\nM1001\n" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, "machine_width": { "default_value": 305 }, - "prime_tower_position_x": { "value": "195" }, - "prime_tower_position_y": { "value": "149" }, "retraction_amount": { "default_value": 1.0 } } -} \ No newline at end of file +} diff --git a/resources/definitions/raise3D_N2_plus_dual.def.json b/resources/definitions/raise3D_N2_plus_dual.def.json index 6699696015..13469cfe6c 100644 --- a/resources/definitions/raise3D_N2_plus_dual.def.json +++ b/resources/definitions/raise3D_N2_plus_dual.def.json @@ -42,8 +42,6 @@ "machine_start_gcode": { "default_value": "G90\nG21\n; home all axes\nG28\nG92 X0 Y0 Z0\n; move heatbed into position\nG1 X20.0 Y20.0 Z1.0 F1000\n; zero extruders\nG92 E0 E1\nT0; right tool\n; set extruder steps per mm\nM92 E140\nT1; left tool\n; set extruder steps per mm\nM92 E140\nT0; left tool\nG92 E0 E1\n; purge nozzle\nG1 E25 F250\nT1; left tool\nG92 E0 E1\n; purge nozzle\nG1 E25 F250\n; zero extruders\nG92 E0 E1\n; move heatbed down a little more\nG1 Z5.0 F20\n; wait 600ms\nG4 600\n; move to tack down the strands\nG1 X20.0 Y30.0 Z0 F9000\n; wait 600ms\nG4 600\n;move up a bit\nG1 Z5.0 F9000\n; wait 300ms\nG4 300\n;fast move to center\nG1 X152.5 Y152.5 F9000\nT0\n;Raise3D Job Start\nM117 Printing...\nM1001\n" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, "machine_width": { "default_value": 305 }, - "prime_tower_position_x": { "value": "195" }, - "prime_tower_position_y": { "value": "149" }, "retraction_amount": { "default_value": 1.0 } } -} \ No newline at end of file +} diff --git a/resources/definitions/raise3D_N2_plus_single.def.json b/resources/definitions/raise3D_N2_plus_single.def.json index 5508af2188..1b99e490a2 100644 --- a/resources/definitions/raise3D_N2_plus_single.def.json +++ b/resources/definitions/raise3D_N2_plus_single.def.json @@ -37,8 +37,6 @@ "machine_start_gcode": { "default_value": "G90\nG21\n; home all axes\nG28\nG92 X0 Y0 Z0\n; move heatbed into position\nG1 X20.0 Y20.0 Z1.0 F1000\n; zero extruders\nG92 E0 E1\nT0; right tool\n; set extruder steps per mm\nM92 E140\n; purge nozzle\nG1 E25 F250\n; zero extruders\nG92 E0 E1\n; move heatbed down a little more\nG1 Z5.0 F20\n; wait 600ms\nG4 600\n; move to tack down the strands\nG1 X20.0 Y30.0 Z0 F9000\n; wait 600ms\nG4 600\n;move up a bit\nG1 Z5.0 F9000\n; wait 300ms\nG4 300\n;fast move to center\nG1 X152.5 Y152.5 F9000\nT0\n;Raise3D Job Start\nM117 Printing...\nM1001\n" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, "machine_width": { "default_value": 305 }, - "prime_tower_position_x": { "value": "195" }, - "prime_tower_position_y": { "value": "149" }, "retraction_amount": { "default_value": 1.0 } } -} \ No newline at end of file +} diff --git a/resources/definitions/raise3D_N2_single.def.json b/resources/definitions/raise3D_N2_single.def.json index e5a9af0a0e..de0550a896 100644 --- a/resources/definitions/raise3D_N2_single.def.json +++ b/resources/definitions/raise3D_N2_single.def.json @@ -37,8 +37,6 @@ "machine_start_gcode": { "default_value": "G90\nG21\n; home all axes\nG28\nG92 X0 Y0 Z0\n; move heatbed into position\nG1 X20.0 Y20.0 Z1.0 F1000\n; zero extruders\nG92 E0 E1\nT0; right tool\n; set extruder steps per mm\nM92 E140\n; purge nozzle\nG1 E25 F250\n; zero extruders\nG92 E0 E1\n; move heatbed down a little more\nG1 Z5.0 F20\n; wait 600ms\nG4 600\n; move to tack down the strands\nG1 X20.0 Y30.0 Z0 F9000\n; wait 600ms\nG4 600\n;move up a bit\nG1 Z5.0 F9000\n; wait 300ms\nG4 300\n;fast move to center\nG1 X152.5 Y152.5 F9000\nT0\n;Raise3D Job Start\nM117 Printing...\nM1001\n" }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, "machine_width": { "default_value": 305 }, - "prime_tower_position_x": { "value": "195" }, - "prime_tower_position_y": { "value": "149" }, "retraction_amount": { "default_value": 1.0 } } -} \ No newline at end of file +} diff --git a/resources/definitions/skriware_2.def.json b/resources/definitions/skriware_2.def.json index 642b766e0e..79b5984511 100644 --- a/resources/definitions/skriware_2.def.json +++ b/resources/definitions/skriware_2.def.json @@ -143,8 +143,6 @@ "optimize_wall_printing_order": { "default_value": true }, "prime_tower_flow": { "value": "99" }, "prime_tower_min_volume": { "default_value": 4 }, - "prime_tower_position_x": { "value": "1" }, - "prime_tower_position_y": { "value": "1" }, "prime_tower_size": { "default_value": 1 }, "raft_acceleration": { "value": "400" }, "raft_airgap": { "default_value": 0.2 }, @@ -265,4 +263,4 @@ "z_seam_x": { "value": "115" }, "z_seam_y": { "value": "180" } } -} \ No newline at end of file +} diff --git a/resources/definitions/stereotech_ste320.def.json b/resources/definitions/stereotech_ste320.def.json index 2674841411..749e9ff61b 100644 --- a/resources/definitions/stereotech_ste320.def.json +++ b/resources/definitions/stereotech_ste320.def.json @@ -45,8 +45,6 @@ "machine_name": { "default_value": "Stereotech STE320" }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;homing\nG1 Z15.0 F9000 ;move the platform down 15mm\nT1 ;Switch to the 2nd extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F200 E-{switch_extruder_retraction_amount}\nT0 ;Switch to the 1st extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, - "machine_width": { "default_value": 218 }, - "prime_tower_position_x": { "value": "195" }, - "prime_tower_position_y": { "value": "149" } + "machine_width": { "default_value": 218 } } -} \ No newline at end of file +} diff --git a/resources/definitions/strateo3d.def.json b/resources/definitions/strateo3d.def.json index 564ae78254..31204f6f58 100644 --- a/resources/definitions/strateo3d.def.json +++ b/resources/definitions/strateo3d.def.json @@ -226,8 +226,6 @@ "meshfix_maximum_deviation": { "default_value": 0.04 }, "optimize_wall_printing_order": { "value": "True" }, "prime_tower_min_volume": { "default_value": 35 }, - "prime_tower_position_x": { "value": "machine_width/2 + prime_tower_size/2" }, - "prime_tower_position_y": { "value": "machine_depth - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" }, "retraction_amount": { "default_value": 1.5 }, "retraction_combing_max_distance": { "default_value": 5 }, "retraction_count_max": { "default_value": 15 }, @@ -276,4 +274,4 @@ "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "wall_thickness": { "value": "wall_line_width_0 + wall_line_width_x" } } -} \ No newline at end of file +} diff --git a/resources/definitions/strateo3d_IDEX420.def.json b/resources/definitions/strateo3d_IDEX420.def.json index 3c217dea34..59785e4d3f 100644 --- a/resources/definitions/strateo3d_IDEX420.def.json +++ b/resources/definitions/strateo3d_IDEX420.def.json @@ -114,8 +114,6 @@ "material_diameter": { "default_value": 1.75 }, "prime_tower_enable": { "default_value": true }, "prime_tower_min_volume": { "default_value": 35.6 }, - "prime_tower_position_x": { "value": "machine_depth / 2 - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - max(map(abs, extruderValues('machine_nozzle_offset_x'))) - 1" }, - "prime_tower_position_y": { "value": "machine_depth / 2 - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - max(map(abs, extruderValues('machine_nozzle_offset_y'))) - 3" }, "raft_acceleration": { "value": "machine_acceleration" }, "raft_base_acceleration": { "value": "machine_acceleration" }, "raft_interface_acceleration": { "value": "machine_acceleration" }, @@ -232,4 +230,4 @@ "travel_avoid_distance": { "value": "3" }, "wall_line_count": { "value": "4" } } -} \ No newline at end of file +} diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index af8fc07122..18fe051aaa 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -150,7 +150,6 @@ "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" }, "prime_tower_enable": { "default_value": true }, - "prime_tower_position_x": { "value": "machine_depth - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) - 30" }, "prime_tower_wipe_enabled": { "default_value": false }, "retraction_amount": { "value": "6.5" }, "retraction_hop": { "value": "2" }, @@ -176,4 +175,4 @@ "wall_0_inset": { "value": "0" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } -} \ No newline at end of file +} diff --git a/resources/definitions/ultimaker_original_dual.def.json b/resources/definitions/ultimaker_original_dual.def.json index ee024dcf0d..99890813ed 100644 --- a/resources/definitions/ultimaker_original_dual.def.json +++ b/resources/definitions/ultimaker_original_dual.def.json @@ -89,8 +89,6 @@ "machine_name": { "default_value": "Ultimaker Original" }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nT1 ;Switch to the 2nd extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F200 E-{switch_extruder_retraction_amount}\nT0 ;Switch to the 1st extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, - "machine_width": { "default_value": 205 }, - "prime_tower_position_x": { "value": "195" }, - "prime_tower_position_y": { "value": "149" } + "machine_width": { "default_value": 205 } } -} \ No newline at end of file +} diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg index 3b5437d0d4..f4da80ded9 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg @@ -40,8 +40,6 @@ optimize_wall_printing_order = True prime_tower_brim_enable = True prime_tower_enable = True prime_tower_min_volume = 6 -prime_tower_position_x = 169 -prime_tower_position_y = 25 prime_tower_size = 20 prime_tower_wipe_enabled = True retract_at_layer_change = False diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg index 3a6467bdc2..a052562cd3 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg @@ -40,8 +40,6 @@ optimize_wall_printing_order = True prime_tower_brim_enable = True prime_tower_enable = True prime_tower_min_volume = 6 -prime_tower_position_x = 169 -prime_tower_position_y = 25 prime_tower_size = 20 prime_tower_wipe_enabled = True retract_at_layer_change = False diff --git a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg index 1a763f07ec..145cd34ead 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg @@ -38,8 +38,6 @@ optimize_wall_printing_order = True prime_tower_brim_enable = True prime_tower_enable = True prime_tower_min_volume = 6 -prime_tower_position_x = 169 -prime_tower_position_y = 25 prime_tower_size = 20 prime_tower_wipe_enabled = True retract_at_layer_change = False diff --git a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg index 69698b555b..e6e2cb78a0 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg @@ -38,8 +38,6 @@ optimize_wall_printing_order = True prime_tower_brim_enable = True prime_tower_enable = True prime_tower_min_volume = 6 -prime_tower_position_x = 169 -prime_tower_position_y = 25 prime_tower_size = 20 prime_tower_wipe_enabled = True retract_at_layer_change = False diff --git a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg index 404eb48a2e..56587fe883 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg @@ -37,8 +37,6 @@ optimize_wall_printing_order = True prime_tower_brim_enable = True prime_tower_enable = True prime_tower_min_volume = 6 -prime_tower_position_x = 169 -prime_tower_position_y = 25 prime_tower_size = 20 prime_tower_wipe_enabled = True retract_at_layer_change = False diff --git a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg index c85a86507a..10353f6110 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg @@ -37,8 +37,6 @@ optimize_wall_printing_order = True prime_tower_brim_enable = True prime_tower_enable = True prime_tower_min_volume = 6 -prime_tower_position_x = 169 -prime_tower_position_y = 25 prime_tower_size = 20 prime_tower_wipe_enabled = True retract_at_layer_change = False diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg index 62b96f2e85..d9f0a0aaea 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_normal.inst.cfg @@ -31,8 +31,6 @@ ooze_shield_angle = 20 ooze_shield_dist = 4 ooze_shield_enabled = True prime_tower_enable = False -prime_tower_position_x = 350 -prime_tower_position_y = 350 retraction_amount = 0.75 retraction_combing = off retraction_speed = 70 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg index 4ce1ac32d9..620622e555 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_thick.inst.cfg @@ -31,8 +31,6 @@ ooze_shield_angle = 20 ooze_shield_dist = 4 ooze_shield_enabled = True prime_tower_enable = False -prime_tower_position_x = 350 -prime_tower_position_y = 350 retraction_amount = 0.75 retraction_combing = off retraction_speed = 70 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg index e37ec93ea8..05eeb68305 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_thin.inst.cfg @@ -31,8 +31,6 @@ ooze_shield_angle = 20 ooze_shield_dist = 4 ooze_shield_enabled = True prime_tower_enable = False -prime_tower_position_x = 350 -prime_tower_position_y = 350 retraction_amount = 0.75 retraction_combing = off retraction_speed = 70 diff --git a/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg b/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg index dcbfb3d58a..b63ef09a6b 100644 --- a/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg +++ b/resources/quality/gmax15plus/gmax15plus_global_dual_very_thick.inst.cfg @@ -30,8 +30,6 @@ ooze_shield_angle = 20 ooze_shield_dist = 4 ooze_shield_enabled = True prime_tower_enable = False -prime_tower_position_x = 350 -prime_tower_position_y = 350 retraction_amount = 0.75 retraction_combing = off retraction_speed = 70 diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg index 35106e960c..ac5f3e5bee 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Only_Quality.inst.cfg @@ -24,8 +24,6 @@ material_print_temperature = =default_material_print_temperature optimize_wall_printing_order = True prime_tower_enable = True prime_tower_flow = 110 -prime_tower_position_x = 127.5 -prime_tower_position_y = =math.ceil(250-prime_tower_size) prime_tower_size = 35 retraction_min_travel = 2 skirt_gap = 2 diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg index 9b6258a1f4..eca85becc6 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Flex_Quality.inst.cfg @@ -21,8 +21,6 @@ material_print_temperature = =default_material_print_temperature optimize_wall_printing_order = True prime_tower_enable = True prime_tower_flow = 110 -prime_tower_position_x = 127.5 -prime_tower_position_y = =math.ceil(250-prime_tower_size) prime_tower_size = 35 retraction_hop_enabled = False support_enable = True diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg index 9ad32705aa..8071d7193e 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_High_Quality.inst.cfg @@ -32,8 +32,6 @@ material_print_temperature = =default_material_print_temperature optimize_wall_printing_order = True prime_tower_enable = True prime_tower_flow = 110 -prime_tower_position_x = 127.5 -prime_tower_position_y = =math.ceil(250-prime_tower_size) prime_tower_size = 35 retraction_amount = 5 retraction_hop_enabled = False diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg index 5aa5a445fe..8354fba5e0 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_Normal_Quality.inst.cfg @@ -32,8 +32,6 @@ material_print_temperature = =default_material_print_temperature optimize_wall_printing_order = True prime_tower_enable = True prime_tower_flow = 110 -prime_tower_position_x = 127.5 -prime_tower_position_y = =math.ceil(250-prime_tower_size) prime_tower_size = 35 retraction_amount = 5 retraction_hop_enabled = False diff --git a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg index 262090dce6..074632abda 100644 --- a/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg +++ b/resources/quality/tizyx/tizyx_evy_dual/tizyx_evy_dual_global_PVA_Quality.inst.cfg @@ -21,8 +21,6 @@ material_print_temperature = =default_material_print_temperature optimize_wall_printing_order = True prime_tower_enable = True prime_tower_flow = 110 -prime_tower_position_x = 127.5 -prime_tower_position_y = =math.ceil(250-prime_tower_size) prime_tower_size = 35 retraction_hop_enabled = False support_enable = True