Merge branch 'main' into CURA-11957_sketch_fileformat_autoselect

Ultimaker · Aug 6, 2024 · 97ba9fb · 97ba9fb
2 parents 89209f5 + e3287a1
commit 97ba9fb
Show file tree

Hide file tree

Showing 29 changed files with 26 additions and 24 deletions.
diff --git a/conandata.yml b/conandata.yml
@@ -6,7 +6,7 @@ requirements:
   - "cura_binary_data/(latest)@ultimaker/testing"
   - "fdm_materials/(latest)@ultimaker/testing"
   - "curaengine_plugin_gradual_flow/0.1.0-beta.4"
-  - "dulcificum/(latest)@ultimaker/testing"
+  - "dulcificum/0.2.1"
   - "pysavitar/5.3.0"
   - "pynest2d/5.3.0"
   - "native_cad_plugin/2.0.0"

diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json
@@ -130,7 +130,6 @@
         "machine_min_cool_heat_time_window": { "default_value": 15.0 },
         "machine_name": { "default_value": "Mark2_for_Ultimaker2" },
         "machine_nozzle_cool_down_speed": { "default_value": 1.5 },
-        "machine_nozzle_head_distance": { "default_value": 5 },
         "machine_nozzle_heat_up_speed": { "default_value": 3.5 },
         "machine_nozzle_size": { "default_value": 0.4 },
         "machine_show_variants": { "default_value": true },

diff --git a/resources/definitions/atom3.def.json b/resources/definitions/atom3.def.json
@@ -65,7 +65,6 @@
         "machine_heated_bed": { "default_value": true },
         "machine_height": { "default_value": 340 },
         "machine_name": { "default_value": "Atom 3" },
-        "machine_nozzle_head_distance": { "default_value": 6 },
         "machine_shape": { "default_value": "elliptic" },
         "machine_show_variants": { "default_value": true },
         "machine_start_gcode": { "default_value": ";MACHINE START CODE\nG21 ;metric values\nG90 ;absolute positioning\nG28 ;home\nG1 Z5 F9000\n;MACHINE START CODE" },

diff --git a/resources/definitions/diy220.def.json b/resources/definitions/diy220.def.json
@@ -35,7 +35,6 @@
         "machine_max_feedrate_y": { "default_value": 300 },
         "machine_max_feedrate_z": { "default_value": 40 },
         "machine_name": { "default_value": "Diytech 220" },
-        "machine_nozzle_head_distance": { "default_value": 3 },
         "machine_nozzle_tip_outer_diameter": { "default_value": 1 },
         "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nG28\nG1 Z15 F200\nT0\nG92 E0\nG1 E16 F250\nG92 E0\n" },
         "machine_use_extruder_offset_to_offset_coords": { "default_value": true },

diff --git a/resources/definitions/dxu.def.json b/resources/definitions/dxu.def.json
@@ -122,7 +122,6 @@
         "machine_name": { "default_value": "dxu" },
         "machine_nozzle_cool_down_speed": { "default_value": 1.5 },
         "machine_nozzle_expansion_angle": { "default_value": 45 },
-        "machine_nozzle_head_distance": { "default_value": 5 },
         "machine_nozzle_heat_up_speed": { "default_value": 3.5 },
         "machine_nozzle_size": { "default_value": 0.4 },
         "machine_show_variants": { "default_value": true },

diff --git a/resources/definitions/erzay3d.def.json b/resources/definitions/erzay3d.def.json
@@ -44,7 +44,6 @@
         "machine_max_jerk_xy": { "default_value": 10 },
         "machine_max_jerk_z": { "default_value": 10 },
         "machine_name": { "default_value": "Erzay3D" },
-        "machine_nozzle_head_distance": { "default_value": 2.5 },
         "machine_nozzle_size": { "default_value": 0.4 },
         "machine_shape": { "default_value": "elliptic" },
         "machine_start_gcode": { "default_value": "G28\nG1 Z15.0 F6000\nG92 E0" },

diff --git a/resources/definitions/fdmextruder.def.json b/resources/definitions/fdmextruder.def.json
@@ -167,6 +167,17 @@
                     "type": "float",
                     "unit": "mm"
                 },
+                "machine_nozzle_head_distance":
+                {
+                    "default_value": 3,
+                    "description": "The height difference between the tip of the nozzle and the lowest part of the print head.",
+                    "label": "Nozzle Length",
+                    "settable_per_extruder": true,
+                    "settable_per_mesh": false,
+                    "settable_per_meshgroup": false,
+                    "type": "float",
+                    "unit": "mm"
+                },
                 "machine_nozzle_id":
                 {
                     "default_value": "unknown",

diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
@@ -301,17 +301,6 @@
                     "settable_per_meshgroup": false,
                     "settable_globally": false
                 },
-                "machine_nozzle_head_distance":
-                {
-                    "label": "Nozzle Length",
-                    "description": "The height difference between the tip of the nozzle and the lowest part of the print head.",
-                    "unit": "mm",
-                    "default_value": 3,
-                    "type": "float",
-                    "settable_per_mesh": false,
-                    "settable_per_extruder": true,
-                    "settable_per_meshgroup": false
-                },
                 "machine_nozzle_expansion_angle":
                 {
                     "label": "Nozzle Angle",

diff --git a/resources/definitions/maker_starter.def.json b/resources/definitions/maker_starter.def.json
@@ -27,7 +27,6 @@
         "machine_heated_bed": { "default_value": false },
         "machine_height": { "default_value": 200 },
         "machine_name": { "default_value": "3DMaker Starter" },
-        "machine_nozzle_head_distance": { "default_value": 3 },
         "machine_nozzle_tip_outer_diameter": { "default_value": 1 },
         "machine_width": { "default_value": 210 },
         "raft_airgap": { "default_value": 0.2 },

diff --git a/resources/definitions/mendel90.def.json b/resources/definitions/mendel90.def.json
@@ -37,7 +37,6 @@
         "machine_heated_bed": { "default_value": true },
         "machine_height": { "default_value": 200 },
         "machine_name": { "default_value": "Mendel90" },
-        "machine_nozzle_head_distance": { "default_value": 5 },
         "machine_nozzle_tip_outer_diameter": { "default_value": 1 },
         "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;absolute extrusion\nM107 ;start with the fan off\nG28 ;home\nG92 E0 ;zero the extruded length\nM140 S{material_bed_temperature_layer_0} ; set the bed temperature and continue on\nG1 X-50 Y98 F9000 ;go to the left of the top\nG1 Z0.05 ; close to the bed\nM104 S{material_print_temperature_layer_0}; pre-heat the extruder continue on\nM190 S{material_bed_temperature_layer_0} ;set the bed temp & wait\nM109 S{material_print_temperature_layer_0};set the extruder temp for layer 0 & wait\nG92 E0 ;zero the extruded length\nG1 X50 E10 F300 ; make a thick line to prime extruder\nG92 E0 ; reset extruder\nG1 E-4 F1800\nG1 Z0.3 ;lift Z\n" },
         "machine_width": { "default_value": 200 },

diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json
@@ -78,7 +78,6 @@
         "machine_heat_zone_length": { "default_value": 20 },
         "machine_height": { "default_value": 205 },
         "machine_name": { "default_value": "Discov3ry Complete (Ultimaker 2+)" },
-        "machine_nozzle_head_distance": { "default_value": 5 },
         "machine_show_variants": { "default_value": true },
         "machine_start_gcode": { "default_value": "\n;Updated Firmware (.hex and Marlin .ino) for \n;Ultimaker 2+ with Discov3ry Extruder available at: \n;https://github.com/Structur3d/UM2.1Discov3ry-Firmware-beta \n;**Learn more at https://www.structur3d.io** \n \nM104 S{material_print_temperature} ;Start heating extruder  \nM140 S{material_bed_temperature} ;Start heating bed \nG21 ;metric values \nG90 ;absolute positioning \nM82 ;set extruder to absolute mode \nM107 ;start with the fan off \nM302 ;allow cold extrusion \nM92 E2589 ;set extruder EEPROM steps/mm for paste \nG28 Z0 ;move Z to bottom endstops \nG28 X0 Y0 ;move X/Y to endstops \nG1 X15 Y0 F4000 ;move X/Y to front of printer \nG1 Z15.0 F9000 ;move the platform to 15mm \nG92 E0 ;zero the extruded length \nG1 F200 E10 ;extrude 10 mm of feed stock \nG92 E0 ;zero the extruded length again \nG1 F9000 \n;Put printing message on LCD screen \nM117 Printing..." },
         "machine_width": { "default_value": 205 },

diff --git a/resources/definitions/tam.def.json b/resources/definitions/tam.def.json
@@ -44,7 +44,6 @@
         "machine_max_acceleration_y": { "default_value": 6000 },
         "machine_max_acceleration_z": { "default_value": 12000 },
         "machine_name": { "default_value": "TypeAMachines" },
-        "machine_nozzle_head_distance": { "default_value": 3 },
         "machine_nozzle_tip_outer_diameter": { "default_value": 1 },
         "machine_start_gcode": { "default_value": ";-- START GCODE --\n;Sliced for Type A Machines Series 1\n;Sliced at: {day} {date} {time}\n;Basic settings:\n;Layer height: {layer_height}\n;Walls: {wall_thickness}\n;Fill: {fill_distance}\n;Print Speed: {print_speed}\n;Support: {support}\n;Retraction Speed: {retraction_speed}\n;Retraction Distance: {retraction_amount}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Settings based on: {material_profile}\nG21 ;metric values\nG90 ;absolute positioning\nG28 ;move to endstops\nG29 ;allows for auto-levelling\nG1 Z15.0 F12000 ;move the platform down 15mm\nG1 X150 Y5 F9000 ;center\nM140 S{material_bed_temperature} ;Prep Heat Bed\nM109 S{default_material_print_temperature} ;Heat To temp\nM190 S{material_bed_temperature} ;Heat Bed to temp\nG1 X150 Y5 Z0.3 ;move the platform to purge extrusion\nG92 E0 ;zero the extruded length\nG1 F200 X250 E30 ;extrude 30mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 X150 Y150  Z25 F12000 ;recenter and begin\nG1 F9000" },
         "machine_use_extruder_offset_to_offset_coords": { "default_value": true },

diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json
@@ -95,7 +95,6 @@
         "machine_max_feedrate_y": { "default_value": 300 },
         "machine_max_feedrate_z": { "default_value": 40 },
         "machine_name": { "default_value": "Ultimaker 2" },
-        "machine_nozzle_head_distance": { "default_value": 3 },
         "machine_nozzle_tip_outer_diameter": { "default_value": 1 },
         "machine_start_gcode": { "value": "\"G0 F3000 Y50 ;avoid prime blob\"  if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nG28 Z0 ;move Z to bottom endstops\\nG28 X0 Y0 ;move X/Y to endstops\\nG1 X15 Y0 F4000 ;move X/Y to front of printer\\nG1 Z15.0 F9000 ;move the platform to 15mm\\nG92 E0 ;zero the extruded length\\nG1 F200 E10 ;extrude 10 mm of feed stock\\nG92 E0 ;zero the extruded length again\\nG1 Y50 F9000\\n;Put printing message on LCD screen\\nM117 Printing...\"" },
         "machine_use_extruder_offset_to_offset_coords": { "default_value": true },

diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json
@@ -83,7 +83,6 @@
         "machine_heat_zone_length": { "default_value": 20 },
         "machine_height": { "default_value": 205 },
         "machine_name": { "default_value": "Ultimaker 2+" },
-        "machine_nozzle_head_distance": { "default_value": 5 },
         "machine_show_variants": { "default_value": true },
         "speed_infill": { "value": "speed_print" },
         "speed_support": { "value": "speed_wall_0" },

diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json
@@ -92,7 +92,6 @@
         "machine_heat_zone_length": { "default_value": 20 },
         "machine_height": { "default_value": 205 },
         "machine_name": { "default_value": "Ultimaker 2+ Connect" },
-        "machine_nozzle_head_distance": { "default_value": 5 },
         "machine_show_variants": { "default_value": true },
         "machine_start_gcode": { "value": "''" },
         "machine_width": { "default_value": 223 },

diff --git a/resources/extruders/Mark2_extruder1.def.json b/resources/extruders/Mark2_extruder1.def.json
@@ -14,6 +14,7 @@
             "default_value": 0,
             "maximum_value": "1"
         },
+        "machine_nozzle_head_distance": { "default_value": 5 },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 }
     }

diff --git a/resources/extruders/Mark2_extruder2.def.json b/resources/extruders/Mark2_extruder2.def.json
@@ -14,6 +14,7 @@
             "default_value": 1,
             "maximum_value": "1"
         },
+        "machine_nozzle_head_distance": { "default_value": 5 },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 }
     }

diff --git a/resources/extruders/atom3_extruder_0.def.json b/resources/extruders/atom3_extruder_0.def.json
@@ -10,6 +10,7 @@
     "overrides":
     {
         "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_head_distance": { "default_value": 6 },
         "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 1.75 }
     }

diff --git a/resources/extruders/diy220_extruder_0.def.json b/resources/extruders/diy220_extruder_0.def.json
@@ -10,6 +10,7 @@
     "overrides":
     {
         "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_head_distance": { "default_value": 3 },
         "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 1.75 }
     }

diff --git a/resources/extruders/dxu_extruder1.def.json b/resources/extruders/dxu_extruder1.def.json
@@ -14,6 +14,7 @@
             "default_value": 0,
             "maximum_value": "1"
         },
+        "machine_nozzle_head_distance": { "default_value": 5 },
         "machine_nozzle_offset_x": { "default_value": 0.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
         "machine_nozzle_size": { "default_value": 0.4 },

diff --git a/resources/extruders/dxu_extruder2.def.json b/resources/extruders/dxu_extruder2.def.json
@@ -14,6 +14,7 @@
             "default_value": 1,
             "maximum_value": "1"
         },
+        "machine_nozzle_head_distance": { "default_value": 5 },
         "machine_nozzle_offset_x": { "default_value": 19.0 },
         "machine_nozzle_offset_y": { "default_value": 0.0 },
         "machine_nozzle_size": { "default_value": 0.4 },

diff --git a/resources/extruders/erzay3d_extruder_0.def.json b/resources/extruders/erzay3d_extruder_0.def.json
@@ -10,6 +10,7 @@
     "overrides":
     {
         "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_head_distance": { "default_value": 2.5 },
         "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 1.75 }
     }

diff --git a/resources/extruders/maker_starter_extruder_0.def.json b/resources/extruders/maker_starter_extruder_0.def.json
@@ -10,6 +10,7 @@
     "overrides":
     {
         "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_head_distance": { "default_value": 3 },
         "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 1.75 }
     }

diff --git a/resources/extruders/mendel90_extruder_0.def.json b/resources/extruders/mendel90_extruder_0.def.json
@@ -10,6 +10,7 @@
     "overrides":
     {
         "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_head_distance": { "default_value": 5 },
         "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 1.75 }
     }

diff --git a/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json b/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json
@@ -10,6 +10,7 @@
     "overrides":
     {
         "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_head_distance": { "default_value": 5 },
         "machine_nozzle_size": { "default_value": 0.84 },
         "material_diameter": { "default_value": 3.175 }
     }

diff --git a/resources/extruders/tam_extruder_0.def.json b/resources/extruders/tam_extruder_0.def.json
@@ -10,6 +10,7 @@
     "overrides":
     {
         "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_head_distance": { "default_value": 3 },
         "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 1.75 }
     }

diff --git a/resources/extruders/ultimaker2_extruder_0.def.json b/resources/extruders/ultimaker2_extruder_0.def.json
@@ -10,6 +10,7 @@
     "overrides":
     {
         "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_head_distance": { "default_value": 3 },
         "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 2.85 }
     }

diff --git a/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json b/resources/extruders/ultimaker2_plus_connect_extruder_0.def.json
@@ -10,6 +10,7 @@
     "overrides":
     {
         "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_head_distance": { "default_value": 5 },
         "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 2.85 }
     }

diff --git a/resources/extruders/ultimaker2_plus_extruder_0.def.json b/resources/extruders/ultimaker2_plus_extruder_0.def.json
@@ -10,6 +10,7 @@
     "overrides":
     {
         "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_head_distance": { "default_value": 5 },
         "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 2.85 }
     }