From 2d04650c619a8e7a96cf8e3d6cee3969fa3532ab Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 24 Nov 2023 16:38:29 +0100 Subject: [PATCH] Fixed prime-tower for machines with explicit disallowed areas. These machines have disallowed areas (either 'machine_disallowed_areas' or 'nozzle_dissalowed_areas'), which can't at the moment be calculated with formula's (not without adding a feature at least, but we're currently in feature-freeze). part of CURA-11379 --- resources/definitions/Mark2_for_Ultimaker2.def.json | 1 + resources/definitions/dagoma_pro_430_dual.def.json | 3 ++- resources/definitions/deltacomb_dc20dual.def.json | 4 +++- resources/definitions/dxu.def.json | 1 + resources/definitions/ultimaker3.def.json | 1 + 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json index 5eda5ca6f2..7c7f8a3633 100644 --- a/resources/definitions/Mark2_for_Ultimaker2.def.json +++ b/resources/definitions/Mark2_for_Ultimaker2.def.json @@ -137,6 +137,7 @@ "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_y": { "value": "170" }, "retraction_amount": { "default_value": 5.1 }, "retraction_speed": { "default_value": 25 }, "speed_support": { "value": "speed_wall_0" }, diff --git a/resources/definitions/dagoma_pro_430_dual.def.json b/resources/definitions/dagoma_pro_430_dual.def.json index 6038ce9e57..df537809f8 100644 --- a/resources/definitions/dagoma_pro_430_dual.def.json +++ b/resources/definitions/dagoma_pro_430_dual.def.json @@ -55,6 +55,7 @@ [215, 160] ] ] - } + }, + "prime_tower_position_x": { "value": "350" } } } \ No newline at end of file diff --git a/resources/definitions/deltacomb_dc20dual.def.json b/resources/definitions/deltacomb_dc20dual.def.json index f90e40d5b4..60a71276d2 100644 --- a/resources/definitions/deltacomb_dc20dual.def.json +++ b/resources/definitions/deltacomb_dc20dual.def.json @@ -101,6 +101,8 @@ }, "machine_height": { "default_value": 250 }, "machine_name": { "default_value": "Deltacomb DC-20 DUAL" }, - "machine_width": { "default_value": 190 } + "machine_width": { "default_value": 190 }, + "prime_tower_position_x": { "value": "60" }, + "prime_tower_position_y": { "value": "60" } } } \ No newline at end of file diff --git a/resources/definitions/dxu.def.json b/resources/definitions/dxu.def.json index bb61db1686..a5d360d011 100644 --- a/resources/definitions/dxu.def.json +++ b/resources/definitions/dxu.def.json @@ -131,6 +131,7 @@ "machine_width": { "default_value": 238 }, "material_adhesion_tendency": { "enabled": true }, "material_diameter": { "default_value": 1.75 }, + "prime_tower_position_x": { "value": "200" }, "retraction_amount": { "default_value": 6.5 }, "retraction_speed": { "default_value": 25 }, "speed_support": { "value": "speed_wall_0" }, diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 058b3dfa7a..19df92c08d 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -150,6 +150,7 @@ "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" }, "prime_tower_enable": { "default_value": true }, + "prime_tower_position_x": { "value": "185" }, "prime_tower_wipe_enabled": { "default_value": false }, "retraction_amount": { "value": "6.5" }, "retraction_hop": { "value": "2" },