Merge branch '4.8' of https://github.com/Ultimaker/Cura into 4.8

plugins/XmlMaterialProfile/product_to_id.json

@@ -4,6 +4,7 @@
     "Ultimaker 2 Extended+": "ultimaker2_extended_plus",
     "Ultimaker 2 Go": "ultimaker2_go",
     "Ultimaker 2+": "ultimaker2_plus",
+    "Ultimaker 2+ Connect": "ultimaker2_plus_connect",
     "Ultimaker 3": "ultimaker3",
     "Ultimaker 3 Extended": "ultimaker3_extended",
     "Ultimaker S3": "ultimaker_s3",
@@ -12,4 +13,4 @@
     "Ultimaker Original+": "ultimaker_original_plus",
     "Ultimaker Original Dual Extrusion": "ultimaker_original_dual",
     "IMADE3D JellyBOX": "imade3d_jellybox"
-}
+}

resources/definitions/ultimaker2_plus_connect.def.json

@@ -0,0 +1,82 @@
+{
+    "version": 2,
+    "name": "Ultimaker 2+ Connect",
+    "inherits": "ultimaker2",
+    "metadata": {
+        "author": "Ultimaker",
+        "manufacturer": "Ultimaker B.V.",
+        "weight": 1,
+        "file_formats": "application/x-ufp;text/x-gcode",
+        "platform": "ultimaker3_platform.obj",
+        "platform_texture": "Ultimaker2PlusConnectbackplate.png",
+        "preferred_variant_name": "0.4 mm",
+        "has_variants": true,
+        "has_materials": true,
+        "has_machine_materials": true,
+        "has_machine_quality": true,
+        "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ],
+        "first_start_actions": [],
+        "supported_actions": [],
+        "machine_extruder_trains":
+        {
+            "0": "ultimaker2_plus_connect_extruder_0"
+        },
+        "supports_usb_connection": false,
+        "supports_network_connection": true
+    },
+
+    "overrides": {
+        "machine_name": { "default_value": "Ultimaker 2+ Connect" },
+        "machine_gcode_flavor": { "default_value": "Griffin" },
+        "machine_width": { "default_value": 223 },
+        "machine_depth": { "default_value": 220 },
+        "machine_height": { "default_value": 205 },
+        "machine_show_variants": { "default_value": true },
+        "gantry_height": { "value": "52" },
+        "machine_nozzle_head_distance": { "default_value": 5 },
+        "machine_heat_zone_length": { "default_value": 20 },
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [ -44, 14 ],
+                [ -44, -34 ],
+                [ 64, 14 ],
+                [ 64, -34 ]
+            ]
+        },
+        "machine_disallowed_areas": 
+        {
+            "default_value": [
+                [[-115,  112.5], [ -83,  112.5], [ -85,  104.0], [-115,  104.0]],
+                [[ 115,  112.5], [ 115,  104.0], [ 104,  104.0], [ 102,  112.5]],
+                [[-115, -112.5], [-115, -104.0], [ -87, -104.0], [ -85, -112.5]],
+                [[ 115, -112.5], [ 104, -112.5], [ 106, -104.0], [ 115, -104.0]]
+            ]
+        },
+        "infill_wipe_dist": { "value": "0" },
+        "infill_overlap": { "value": "0" },
+        "infill_pattern": { "value": "'grid'" },
+        "speed_infill": { "value": "speed_print" },
+        "speed_wall_x": { "value": "speed_wall" },
+        "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
+        "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" },
+        "optimize_wall_printing_order": { "value": "True" },
+        "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" },
+        "speed_support": { "value": "speed_wall_0" },
+        "material_initial_print_temperature": { "value": "material_print_temperature" },
+        "material_final_print_temperature": { "value": "material_print_temperature" },
+        "material_print_temperature_layer_0": { "value": "material_print_temperature" },
+        "machine_start_gcode": { "value": "''" },
+        "machine_end_gcode": { "value": "''" },
+        "material_bed_temperature": { "maximum_value": 110 },
+        "material_bed_temperature_layer_0": { "maximum_value": 110 },
+        "material_print_temperature": { "maximum_value": 260 },
+        "material_print_temperature_layer_0": { "maximum_value": 260 },
+        "material_initial_print_temperature": { "maximum_value": 260 },
+        "material_final_print_temperature": { "maximum_value": 260 },
+        "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" },
+        "meshfix_maximum_deviation": { "value": "layer_height / 4" },		
+        "meshfix_maximum_travel_resolution": { "value": 0.5 },
+        "prime_blob_enable": { "enabled": true, "default_value": true, "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" }
+    }
+}

resources/extruders/ultimaker2_plus_connect_extruder_0.def.json

@@ -0,0 +1,15 @@
+{
+    "version": 2,
+    "name": "Extruder 1",
+    "inherits": "fdmextruder",
+    "metadata": {
+        "machine": "ultimaker2_plus_connect",
+        "position": "0"
+    },
+
+    "overrides": {
+        "extruder_nr": { "default_value": 0 },
+        "machine_nozzle_size": { "default_value": 0.4 },
+        "material_diameter": { "default_value": 2.85 }
+    }
+}

resources/quality/ultimaker2_plus_connect/um2pc_abs_0.25_normal.inst.cfg

@@ -0,0 +1,23 @@
+[general]
+version = 4
+name = Extra Fine
+definition = ultimaker2_plus_connect
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = high
+weight = 1
+material = generic_abs
+variant = 0.25 mm
+
+[values]
+cool_fan_speed_min = =cool_fan_speed * 0.2
+cool_min_layer_time = 3
+cool_min_layer_time_fan_speed_max = 15
+cool_min_speed = 10
+infill_sparse_density = 20
+speed_layer_0 = =round(speed_print * 30 / 30)
+speed_print = 30
+top_bottom_thickness = 0.72
+wall_thickness = 0.88

resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_fast.inst.cfg

@@ -0,0 +1,27 @@
+[general]
+version = 4
+name = Normal
+definition = ultimaker2_plus_connect
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = fast
+weight = -1
+material = generic_abs
+variant = 0.4 mm
+
+[values]
+cool_fan_speed_min = =cool_fan_speed * 0.2
+cool_min_layer_time = 3
+cool_min_layer_time_fan_speed_max = 15
+cool_min_speed = 10
+infill_sparse_density = 20
+top_bottom_thickness = 0.75
+wall_thickness = 0.7
+speed_print = 55
+speed_travel = 150
+speed_layer_0 = =round(speed_print * 30 / 55)
+speed_wall = =math.ceil(speed_print * 40 / 55)
+speed_topbottom = =math.ceil(speed_print * 30 / 55)
+speed_infill = =math.ceil(speed_print * 55 / 55)

resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_high.inst.cfg

@@ -0,0 +1,26 @@
+[general]
+version = 4
+name = Extra Fine
+definition = ultimaker2_plus_connect
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = high
+weight = 1
+material = generic_abs
+variant = 0.4 mm
+
+[values]
+cool_fan_speed_min = =cool_fan_speed * 0.2
+cool_min_layer_time = 3
+cool_min_layer_time_fan_speed_max = 15
+cool_min_speed = 10
+infill_sparse_density = 20
+top_bottom_thickness = 0.72
+wall_thickness = 1.05
+speed_print = 45
+speed_layer_0 = =round(speed_print * 30 / 45)
+speed_wall = =math.ceil(speed_print * 30 / 45)
+speed_topbottom = =math.ceil(speed_print * 15 / 45)
+speed_infill = =math.ceil(speed_print * 45 / 45)

resources/quality/ultimaker2_plus_connect/um2pc_abs_0.4_normal.inst.cfg

@@ -0,0 +1,26 @@
+[general]
+version = 4
+name = Fine
+definition = ultimaker2_plus_connect
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = normal
+weight = 0
+material = generic_abs
+variant = 0.4 mm
+
+[values]
+cool_fan_speed_min = =cool_fan_speed * 0.2
+cool_min_layer_time = 3
+cool_min_layer_time_fan_speed_max = 15
+cool_min_speed = 10
+infill_sparse_density = 20
+top_bottom_thickness = 0.8
+wall_thickness = 1.05
+speed_print = 45
+speed_layer_0 = =round(speed_print * 30 / 45)
+speed_wall = =math.ceil(speed_print * 30 / 45)
+speed_topbottom = =math.ceil(speed_print * 20 / 45)
+speed_infill = =math.ceil(speed_print * 45 / 45)

resources/quality/ultimaker2_plus_connect/um2pc_abs_0.6_normal.inst.cfg

@@ -0,0 +1,24 @@
+[general]
+version = 4
+name = Fine
+definition = ultimaker2_plus_connect
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = fast
+weight = 0
+material = generic_abs
+variant = 0.6 mm
+
+[values]
+cool_fan_speed_min = =cool_fan_speed * 0.5
+cool_min_layer_time = 3
+cool_min_layer_time_fan_speed_max = 20
+cool_min_speed = 20
+infill_sparse_density = 20
+speed_infill = =math.ceil(speed_print * 55 / 40)
+speed_layer_0 = =round(speed_print * 30 / 40)
+speed_print = 40
+top_bottom_thickness = 1.2
+wall_thickness = 1.59

resources/quality/ultimaker2_plus_connect/um2pc_abs_0.8_normal.inst.cfg

@@ -0,0 +1,23 @@
+[general]
+version = 4
+name = Normal
+definition = ultimaker2_plus_connect
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = draft
+weight = -1
+material = generic_abs
+variant = 0.8 mm
+
+[values]
+cool_fan_speed_min = =cool_fan_speed * 0.5
+cool_min_layer_time = 3
+cool_min_layer_time_fan_speed_max = 25
+cool_min_speed = 15
+infill_sparse_density = 20
+speed_layer_0 = =round(speed_print * 30 / 40)
+speed_print = 40
+top_bottom_thickness = 1.2
+wall_thickness = 2.1

resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.25_normal.inst.cfg

@@ -0,0 +1,24 @@
+[general]
+version = 4
+name = Extra Fine
+definition = ultimaker2_plus_connect
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = high
+weight = 1
+material = generic_cpe
+variant = 0.25 mm
+
+[values]
+cool_fan_speed_min = =cool_fan_speed * 0.2
+cool_min_layer_time = 2
+cool_min_layer_time_fan_speed_max = 15
+cool_min_speed = 15
+infill_sparse_density = 20
+speed_layer_0 = =round(speed_print * 30 / 30)
+speed_print = 30
+top_bottom_thickness = 0.72
+wall_thickness = 0.88
+retraction_combing_max_distance = 50

resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_fast.inst.cfg

@@ -0,0 +1,29 @@
+[general]
+version = 4
+name = Normal
+definition = ultimaker2_plus_connect
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = fast
+weight = -1
+material = generic_cpe
+variant = 0.4 mm
+
+[values]
+cool_fan_speed_min = =cool_fan_speed * 0.8
+cool_min_layer_time = 3
+cool_min_layer_time_fan_speed_max = 15
+cool_min_speed = 10
+infill_sparse_density = 20
+speed_layer_0 = =round(speed_print * 30 / 45)
+speed_print = 45
+speed_travel = 150
+speed_wall = =math.ceil(speed_print * 40 / 45)
+top_bottom_thickness = 0.75
+wall_thickness = 0.7
+speed_wall_0 = =math.ceil(speed_print * 30 / 45)
+speed_topbottom = =math.ceil(speed_print * 30 / 45)
+speed_wall_x = =math.ceil(speed_print * 40 / 45)
+speed_infill = =math.ceil(speed_print * 45 / 45)

resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_high.inst.cfg

@@ -0,0 +1,26 @@
+[general]
+version = 4
+name = Extra Fine
+definition = ultimaker2_plus_connect
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = high
+weight = 1
+material = generic_cpe
+variant = 0.4 mm
+
+[values]
+cool_fan_speed_min = =cool_fan_speed * 0.8
+cool_min_layer_time = 2
+cool_min_layer_time_fan_speed_max = 15
+cool_min_speed = 15
+infill_sparse_density = 20
+speed_layer_0 = =round(speed_print * 30 / 45)
+speed_print = 45
+speed_wall = =math.ceil(speed_print * 30 / 45)
+top_bottom_thickness = 0.72
+wall_thickness = 1.05
+speed_topbottom = =math.ceil(speed_print * 15 / 45)
+speed_infill = =math.ceil(speed_print * 45 / 45)

resources/quality/ultimaker2_plus_connect/um2pc_cpe_0.4_normal.inst.cfg

@@ -0,0 +1,24 @@
+[general]
+version = 4
+name = Fine
+definition = ultimaker2_plus_connect
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = normal
+weight = 0
+material = generic_cpe
+variant = 0.4 mm
+
+[values]
+cool_fan_speed_min = =cool_fan_speed * 0.8
+cool_min_layer_time = 3
+cool_min_layer_time_fan_speed_max = 15
+cool_min_speed = 10
+infill_sparse_density = 20
+speed_layer_0 = =round(speed_print * 30 / 45)
+speed_print = 45
+speed_wall = =math.ceil(speed_print * 30 / 45)
+top_bottom_thickness = 0.8
+wall_thickness = 1.05