Browse Source

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
Erwan MATHIEU 1 year ago
parent
commit
3417a858b4

+ 1 - 3
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"
         }
     }
-}
+}

+ 1 - 3
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 }
     }
-}
+}

+ 1 - 3
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" }
     }
-}
+}

+ 1 - 3
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 }
     }
-}
+}

+ 1 - 3
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" }
     }
-}
+}

+ 1 - 3
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" }
     }
-}
+}

+ 1 - 3
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" }
     }
-}
+}

+ 1 - 3
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" }
     }
-}
+}

+ 1 - 3
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'" }
     }
-}
+}

+ 1 - 3
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"
         }
     }
-}
+}

Some files were not shown because too many files changed in this diff