Solve merge conflict PrinterOutputDevice. CURA-1263

2025-08-09 06:45:09 -06:00 · 2016-11-24 13:55:22 +01:00 · 2016-11-24 13:55:22 +01:00 · b88ed76b7c
commit b88ed76b7c
parent fa174763cf 072d33ec68
52 changed files with 139 additions and 31 deletions
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@ -1696,6 +1696,7 @@
                    "unit": "mm/s",
                    "type": "float",
                    "default_value": 30,
+                    "value": "speed_print * 30 / 60",
                    "minimum_value": "0.1",
                    "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
                    "maximum_value_warning": "300",
@ -3637,7 +3638,6 @@
                    "unit": "mm",
                    "enabled": "resolveOrValue('prime_tower_enable')",
                    "default_value": 15,
-                    "value": "15 if resolveOrValue('prime_tower_enable') else 0",
                    "resolve": "max(extruderValues('prime_tower_size'))",
                    "minimum_value": "0",
                    "maximum_value": "min(0.5 * machine_width, 0.5 * machine_depth)",
@ -3906,6 +3906,28 @@
                    "settable_per_meshgroup": false,
                    "settable_globally": false
                },
+                "support_mesh":
+                {
+                    "label": "Support Mesh",
+                    "description": "Use this mesh to specify support areas. This can be used to generate support structure.",
+                    "type": "bool",
+                    "default_value": false,
+                    "settable_per_mesh": true,
+                    "settable_per_extruder": false,
+                    "settable_per_meshgroup": false,
+                    "settable_globally": false
+                },
+                "anti_overhang_mesh":
+                {
+                    "label": "Anti Overhang Mesh",
+                    "description": "Use this mesh to specify where no part of the model should be detected as overhang. This can be used to remove unwanted support structure.",
+                    "type": "bool",
+                    "default_value": false,
+                    "settable_per_mesh": true,
+                    "settable_per_extruder": false,
+                    "settable_per_meshgroup": false,
+                    "settable_globally": false
+                },
                "magic_mesh_surface_mode":
                {
                    "label": "Surface Mode",
--- a/resources/i18n/de/cura.po
+++ b/resources/i18n/de/cura.po
@ -1913,7 +1913,7 @@ msgstr "&Beenden"
 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:97
 msgctxt "@action:inmenu"
 msgid "Configure Cura..."
-msgstr "Cura wird konfiguriert..."
+msgstr "Cura konfigurieren..."

 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:104
 msgctxt "@action:inmenu menubar:printer"
--- a/resources/i18n/nl/cura.po
+++ b/resources/i18n/nl/cura.po
@ -2629,3 +2629,8 @@ msgstr "De configuratie van de printer in Cura laden"
 msgctxt "@action:button"
 msgid "Activate Configuration"
 msgstr "Configuratie Activeren"
+
+#: /home/ruben/Projects/Cura/resources/qml/Preferences/MaterialView.qml:25
+msgctxt "@title"
+msgid "Information"
+msgstr "Informatie"
--- a/resources/qml/Actions.qml
+++ b/resources/qml/Actions.qml
@ -123,7 +123,7 @@ Item
    {
        id: updateProfileAction;
        enabled: !Cura.MachineManager.stacksHaveErrors && Cura.MachineManager.hasUserSettings && !Cura.MachineManager.isReadOnly(Cura.MachineManager.activeQualityId)
-        text: catalog.i18nc("@action:inmenu menubar:profile","&Update profile with current settings");
+        text: catalog.i18nc("@action:inmenu menubar:profile","&Update profile with current settings/overrides");
        onTriggered: Cura.ContainerManager.updateQualityChanges();
    }

@ -143,7 +143,7 @@ Item
    {
        id: addProfileAction;
        enabled: !Cura.MachineManager.stacksHaveErrors && Cura.MachineManager.hasUserSettings
-        text: catalog.i18nc("@action:inmenu menubar:profile","&Create profile from current settings...");
+        text: catalog.i18nc("@action:inmenu menubar:profile","&Create profile from current settings/overrides...");
    }

    Action
--- a/resources/qml/Preferences/ProfilesPage.qml
+++ b/resources/qml/Preferences/ProfilesPage.qml
@ -162,7 +162,7 @@ UM.ManagementPage
            Button
            {
                text: {
-                    return catalog.i18nc("@action:button", "Update profile with current settings");
+                    return catalog.i18nc("@action:button", "Update profile with current settings/overrides");
                }
                enabled: Cura.MachineManager.hasUserSettings && !Cura.MachineManager.isReadOnly(Cura.MachineManager.activeQualityId)
                onClicked: Cura.ContainerManager.updateQualityChanges()
@ -187,7 +187,7 @@ UM.ManagementPage
            Label {
                id: defaultsMessage
                visible: false
-                text: catalog.i18nc("@action:label", "This profile uses the defaults specified by the printer, so it has no settings in the list below.")
+                text: catalog.i18nc("@action:label", "This profile uses the defaults specified by the printer, so it has no settings/overrides in the list below.")
                wrapMode: Text.WordWrap
                width: parent.width
            }
--- a/resources/qml/Settings/SettingItem.qml
+++ b/resources/qml/Settings/SettingItem.qml
@ -209,14 +209,26 @@ Item {
                        // But this will cause the binding to be re-evaluated when the enabled property changes.
                        return false;
                    }
+
+                    // There are no settings with any warning.
                    if(Cura.SettingInheritanceManager.settingsWithInheritanceWarning.length == 0)
                    {
                        return false;
                    }
+
+                    // This setting has a resolve value, so an inheritance warning doesn't do anything.
+                    if(resolve != "None")
+                    {
+                        return false
+                    }
+
+                    // If the setting does not have a limit_to_extruder property (or is -1), use the active stack.
                    if(globalPropertyProvider.properties.limit_to_extruder == null || globalPropertyProvider.properties.limit_to_extruder == -1)
                    {
                        return Cura.SettingInheritanceManager.settingsWithInheritanceWarning.indexOf(definition.key) >= 0;
                    }
+
+                    // Setting does have a limit_to_extruder property, so use that one instead.
                    return Cura.SettingInheritanceManager.getOverridesForExtruder(definition.key, globalPropertyProvider.properties.limit_to_extruder).indexOf(definition.key) >= 0;
                }

@ -227,7 +239,7 @@ Item {
                    focus = true;

                    // Get the most shallow function value (eg not a number) that we can find.
-                    var last_entry = propertyProvider.stackLevels[propertyProvider.stackLevels.length]
+                    var last_entry = propertyProvider.stackLevels[propertyProvider.stackLevels.length - 1]
                    for (var i = 1; i < base.stackLevels.length; i++)
                    {
                        var has_setting_function = typeof(propertyProvider.getPropertyValue("value", base.stackLevels[i])) == "object";
--- a/resources/qml/SidebarHeader.qml
+++ b/resources/qml/SidebarHeader.qml
@ -329,7 +329,7 @@ Column
                }
                onEntered:
                {
-                    var content = catalog.i18nc("@tooltip","Some setting values are different from the values stored in the profile.\n\nClick to open the profile manager.")
+                    var content = catalog.i18nc("@tooltip","Some setting/override values are different from the values stored in the profile.\n\nClick to open the profile manager.")
                    base.showTooltip(globalProfileRow, Qt.point(0, globalProfileRow.height / 2),  content)
                }
                onExited: base.hideTooltip()
--- a/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.25_normal.inst.cfg
@ -15,5 +15,6 @@ wall_thickness = 0.88
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
 speed_print = 30
+speed_layer_0 = =round(speed_print * 30 / 30)
 cool_min_layer_time = 5
 cool_min_speed = 10
--- a/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.4_fast.inst.cfg
@ -15,9 +15,9 @@ wall_thickness = 0.7
 top_bottom_thickness = 0.75
 infill_sparse_density = 18
 speed_print = 60
+speed_layer_0 = =round(speed_print * 30 / 60)
 speed_wall = 50
 speed_topbottom = 30
 speed_travel = 150
-speed_layer_0 = 30
 cool_min_layer_time = 5
 cool_min_speed = 10
--- a/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.4_high.inst.cfg
@ -15,6 +15,7 @@ wall_thickness = 1.05
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
 speed_print = 50
+speed_layer_0 = =round(speed_print * 30 / 50)
 speed_topbottom = 20
 cool_min_layer_time = 5
 cool_min_speed = 10
--- a/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.4_normal.inst.cfg
@ -15,6 +15,7 @@ wall_thickness = 1.05
 top_bottom_thickness = 0.8
 infill_sparse_density = 20
 speed_print = 50
+speed_layer_0 = =round(speed_print * 30 / 50)
 speed_topbottom = 20
 cool_min_layer_time = 5
 cool_min_speed = 10
--- a/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.6_normal.inst.cfg
@ -15,6 +15,7 @@ wall_thickness = 1.59
 top_bottom_thickness = 1.2
 infill_sparse_density = 20
 speed_print = 55
+speed_layer_0 = =round(speed_print * 30 / 55)
 speed_wall = 40
 speed_wall_0 = 25
 speed_topbottom = 20
--- a/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/pla_0.8_normal.inst.cfg
@ -15,6 +15,7 @@ wall_thickness = 2.1
 top_bottom_thickness = 1.2
 infill_sparse_density = 20
 speed_print = 40
+speed_layer_0 = =round(speed_print * 30 / 40)
 speed_wall_0 = 25
 cool_min_layer_time = 5
 cool_min_speed = 10
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg
@ -15,6 +15,7 @@ wall_thickness = 0.88
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
 speed_print = 30
+speed_layer_0 = =round(speed_print * 30 / 30)
 cool_min_layer_time = 3
 cool_fan_speed_min = 20
 cool_min_speed = 10
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg
@ -15,10 +15,10 @@ wall_thickness = 0.7
 top_bottom_thickness = 0.75
 infill_sparse_density = 18
 speed_print = 55
+speed_layer_0 = =round(speed_print * 30 / 55)
 speed_wall = 40
 speed_topbottom = 30
 speed_travel = 150
-speed_layer_0 = 30
 cool_min_layer_time = 3
 cool_fan_speed_min = 20
 cool_min_speed = 10
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg
@ -15,6 +15,7 @@ wall_thickness = 1.05
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
 speed_print = 45
+speed_layer_0 = =round(speed_print * 30 / 45)
 speed_wall = 30
 cool_min_layer_time = 3
 cool_fan_speed_min = 20
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg
@ -15,6 +15,7 @@ wall_thickness = 1.05
 top_bottom_thickness = 0.8
 infill_sparse_density = 20
 speed_print = 45
+speed_layer_0 = =round(speed_print * 30 / 45)
 speed_wall = 30
 cool_min_layer_time = 3
 cool_fan_speed_min = 20
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.6_normal.inst.cfg
@ -15,6 +15,7 @@ wall_thickness = 1.59
 top_bottom_thickness = 1.2
 infill_sparse_density = 20
 speed_print = 40
+speed_layer_0 = =round(speed_print * 30 / 40)
 speed_infill = 55
 cool_min_layer_time = 3
 cool_fan_speed_min = 50
--- a/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_abs_0.8_normal.inst.cfg
@ -15,6 +15,7 @@ wall_thickness = 2.1
 top_bottom_thickness = 1.2
 infill_sparse_density = 20
 speed_print = 40
+speed_layer_0 = =round(speed_print * 30 / 40)
 cool_min_layer_time = 3
 cool_fan_speed_min = 50
 cool_min_speed = 15
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.25_normal.inst.cfg
@ -15,6 +15,7 @@ wall_thickness = 0.88
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
 speed_print = 30
+speed_layer_0 = =round(speed_print * 30 / 30)
 cool_min_layer_time = 2
 cool_fan_speed_min = 20
 cool_min_speed = 15
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_fast.inst.cfg
@ -15,9 +15,9 @@ wall_thickness = 0.7
 top_bottom_thickness = 0.75
 infill_sparse_density = 18
 speed_print = 45
+speed_layer_0 = =round(speed_print * 30 / 45)
 speed_wall = 40
 speed_travel = 150
-speed_layer_0 = 30
 cool_min_layer_time = 3
 cool_fan_speed_min = 80
 cool_min_speed = 10
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_high.inst.cfg
@ -15,6 +15,7 @@ wall_thickness = 1.05
 top_bottom_thickness = 0.72
 infill_sparse_density = 22
 speed_print = 45
+speed_layer_0 = =round(speed_print * 30 / 45)
 speed_wall = 30
 cool_min_layer_time = 2
 cool_fan_speed_min = 80
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.4_normal.inst.cfg
@ -15,6 +15,7 @@ wall_thickness = 1.05
 top_bottom_thickness = 0.8
 infill_sparse_density = 20
 speed_print = 45
+speed_layer_0 = =round(speed_print * 30 / 45)
 speed_wall = 30
 cool_min_layer_time = 3
 cool_fan_speed_min = 80
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.6_normal.inst.cfg
@ -15,6 +15,7 @@ wall_thickness = 1.59
 top_bottom_thickness = 1.2
 infill_sparse_density = 20
 speed_print = 40
+speed_layer_0 = =round(speed_print * 30 / 40)
 cool_min_layer_time = 5
 cool_fan_speed_min = 80
 cool_min_speed = 8
--- a/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpe_0.8_normal.inst.cfg
@ -15,6 +15,7 @@ wall_thickness = 2.1
 top_bottom_thickness = 1.2
 infill_sparse_density = 20
 speed_print = 40
+speed_layer_0 = =round(speed_print * 30 / 40)
 cool_min_layer_time = 3
 cool_fan_speed_min = 80
 cool_min_speed = 8
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg
@ -20,7 +20,6 @@ raft_surface_thickness = 0.2
 raft_surface_line_width = 0.57
 raft_interface_line_spacing = 1.4
 raft_margin = 15
-speed_layer_0 = 30
 raft_airgap = 0.37
 infill_overlap = 5
 layer_height = 0.3
@ -40,6 +39,7 @@ line_width = 0.57
 layer_0_z_overlap = 0.22
 raft_base_line_width = 1.2
 speed_print = 25
+speed_layer_0 = =round(speed_print * 30 / 50)
 support_line_distance = 2.85
 support_angle = 45
 cool_min_layer_time = 3
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg
@ -33,6 +33,7 @@ infill_sparse_density = 40
 layer_0_z_overlap = 0.22
 raft_base_line_width = 1.6
 speed_print = 25
+speed_layer_0 = =round(speed_print * 30 / 25)
 speed_wall_0 = 20
 support_angle = 45
 cool_min_layer_time = 3
--- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg
@ -33,6 +33,7 @@ infill_sparse_density = 40
 layer_0_z_overlap = 0.22
 raft_base_line_width = 1.6
 speed_print = 30
+speed_layer_0 = =round(speed_print * 30 / 30)
 speed_wall_0 = 20
 support_angle = 45
 cool_min_layer_time = 3
--- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg
@ -20,7 +20,6 @@ support_top_distance = 0.5
 raft_surface_thickness = 0.2
 wall_thickness = 2.4
 raft_margin = 15
-speed_layer_0 = 30
 raft_airgap = 0.44
 infill_overlap = 5
 layer_height = 0.2
@ -41,6 +40,7 @@ infill_sparse_density = 40
 layer_0_z_overlap = 0.25
 raft_base_line_width = 1.6
 speed_print = 55
+speed_layer_0 = =round(speed_print * 30 / 55)
 support_angle = 45
 raft_interface_line_spacing = 1.8

--- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg
@ -31,6 +31,7 @@ infill_sparse_density = 25
 layer_0_z_overlap = 0.22
 cool_min_layer_time = 2
 speed_print = 30
+speed_layer_0 = =round(speed_print * 30 / 30)
 raft_base_line_spacing = 1
 raft_base_line_width = 0.5

--- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg
@ -31,6 +31,7 @@ infill_sparse_density = 25
 layer_0_z_overlap = 0.22
 cool_min_layer_time = 2
 speed_print = 30
+speed_layer_0 = =round(speed_print * 30 / 30)
 raft_base_line_spacing = 1
 raft_base_line_width = 0.5

--- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg
@ -31,6 +31,7 @@ infill_sparse_density = 30
 layer_0_z_overlap = 0.22
 cool_min_layer_time = 3
 speed_print = 45
+speed_layer_0 = =round(speed_print * 30 / 45)
 support_angle = 45
 raft_base_line_spacing = 1.6
 raft_base_line_width = 0.8
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg
@ -31,6 +31,7 @@ infill_sparse_density = 30
 layer_0_z_overlap = 0.22
 cool_min_layer_time = 3
 speed_print = 45
+speed_layer_0 = =round(speed_print * 30 / 45)
 support_angle = 45
 raft_base_line_spacing = 1.6
 raft_base_line_width = 0.8
--- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg
@ -32,6 +32,7 @@ infill_sparse_density = 40
 layer_0_z_overlap = 0.22
 raft_base_line_width = 1.6
 speed_print = 40
+speed_layer_0 = =round(speed_print * 30 / 40)
 support_angle = 45
 cool_min_layer_time = 3

--- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg
+++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg
@ -32,6 +32,7 @@ infill_sparse_density = 40
 layer_0_z_overlap = 0.22
 raft_base_line_width = 1.6
 speed_print = 40
+speed_layer_0 = =round(speed_print * 30 / 40)
 support_angle = 45
 cool_min_layer_time = 3

--- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Draft_Print.inst.cfg
@ -16,6 +16,7 @@ material_print_temperature = 240
 prime_tower_size = 16
 skin_overlap = 20
 speed_print = 60
+speed_layer_0 = =round(speed_print * 30 / 60)
 speed_topbottom = =math.ceil(speed_print * 35 / 60)
 speed_wall = =math.ceil(speed_print * 45 / 60)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
--- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg
@ -17,6 +17,7 @@ material_print_temperature = 235
 material_standby_temperature = 100
 prime_tower_size = 16
 speed_print = 60
+speed_layer_0 = =round(speed_print * 30 / 60)
 speed_topbottom = =math.ceil(speed_print * 30 / 60)
 speed_wall = =math.ceil(speed_print * 40 / 60)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
--- a/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg
@ -16,6 +16,7 @@ machine_nozzle_heat_up_speed = 1.5
 material_standby_temperature = 100
 prime_tower_size = 16
 speed_print = 50
+speed_layer_0 = =round(speed_print * 30 / 50)
 speed_topbottom = =math.ceil(speed_print * 30 / 50)
 speed_wall = =math.ceil(speed_print * 30 / 50)

--- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg
@ -16,6 +16,7 @@ material_print_temperature = 230
 material_standby_temperature = 100
 prime_tower_size = 16
 speed_print = 55
+speed_layer_0 = =round(speed_print * 30 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 speed_wall = =math.ceil(speed_print * 30 / 55)

--- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg
@ -15,6 +15,7 @@ material_standby_temperature = 100
 prime_tower_size = 17
 skin_overlap = 20
 speed_print = 60
+speed_layer_0 = =round(speed_print * 30 / 60)
 speed_topbottom = =math.ceil(speed_print * 35 / 60)
 speed_wall = =math.ceil(speed_print * 45 / 60)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
--- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg
@ -15,6 +15,7 @@ material_print_temperature = 245
 material_standby_temperature = 100
 prime_tower_size = 17
 speed_print = 60
+speed_layer_0 = =round(speed_print * 30 / 60)
 speed_topbottom = =math.ceil(speed_print * 30 / 60)
 speed_wall = =math.ceil(speed_print * 40 / 60)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
--- a/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg
@ -16,6 +16,7 @@ machine_nozzle_heat_up_speed = 1.5
 material_standby_temperature = 100
 prime_tower_size = 17
 speed_print = 50
+speed_layer_0 = =round(speed_print * 30 / 50)
 speed_topbottom = =math.ceil(speed_print * 30 / 50)
 speed_wall = =math.ceil(speed_print * 30 / 50)

--- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg
@ -16,6 +16,7 @@ material_print_temperature = 240
 material_standby_temperature = 100
 prime_tower_size = 17
 speed_print = 55
+speed_layer_0 = =round(speed_print * 30 / 55)
 speed_topbottom = =math.ceil(speed_print * 30 / 55)
 speed_wall = =math.ceil(speed_print * 30 / 55)

--- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg
@ -17,6 +17,7 @@ machine_nozzle_heat_up_speed = 1.6
 material_standby_temperature = 100
 prime_tower_enable = False
 speed_print = 80
+speed_layer_0 = =round(speed_print * 30 / 80)
 speed_topbottom = =math.ceil(speed_print * 30 / 80)
 speed_wall = =math.ceil(speed_print * 40 / 80)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
--- a/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg
@ -19,6 +19,7 @@ material_print_temperature = 195
 material_standby_temperature = 100
 skin_overlap = 10
 speed_print = 60
+speed_layer_0 = =round(speed_print * 30 / 60)
 speed_topbottom = =math.ceil(speed_print * 30 / 60)
 speed_wall = =math.ceil(speed_print * 30 / 60)
 top_bottom_thickness = 1
--- a/resources/variants/ultimaker3_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_aa04.inst.cfg
@ -28,6 +28,7 @@ retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
 speed_print = 70
+speed_layer_0 = =speed_print * 30 / 70
 speed_topbottom = =math.ceil(speed_print * 30 / 70)
 speed_wall = =math.ceil(speed_print * 30 / 70)
 support_angle = 60
--- a/resources/variants/ultimaker3_extended_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa04.inst.cfg
@ -27,6 +27,7 @@ retraction_min_travel = 1.5
 retraction_prime_speed = 25
 skin_overlap = 15
 speed_print = 70
+speed_layer_0 = =round(speed_print * 30 / 70)
 speed_topbottom = =math.ceil(speed_print * 30 / 70)
 speed_wall = =math.ceil(speed_print * 30 / 70)
 support_angle = 60