From 8d0b364b441e5a3a254020c9c128f5acc9f8b9f3 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 25 Jun 2018 14:21:00 +0200 Subject: [PATCH 1/2] UMO+ shares the same quality profiles as UMO CURA-5496 --- resources/definitions/ultimaker_original_plus.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/ultimaker_original_plus.def.json b/resources/definitions/ultimaker_original_plus.def.json index 115e1e2752..37d5062fef 100644 --- a/resources/definitions/ultimaker_original_plus.def.json +++ b/resources/definitions/ultimaker_original_plus.def.json @@ -10,6 +10,7 @@ "icon": "icon_ultimaker.png", "platform": "ultimaker2_platform.obj", "platform_texture": "UltimakerPlusbackplate.png", + "quality_definition": "ultimaker_original", "first_start_actions": ["UMOCheckup", "BedLevel"], "supported_actions": ["UMOCheckup", "BedLevel", "UpgradeFirmware"] }, From 65f696a14f4255ebd87ec1b3b8e16bd6b8f17510 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 25 Jun 2018 14:24:23 +0200 Subject: [PATCH 2/2] Simplify the case of UMO Dual CURA-5496 --- .../definitions/ultimaker_original_dual.def.json | 1 + .../umo_dual_global_Draft_Quality.inst.cfg | 14 -------------- .../umo_dual_global_Fast_Quality.inst.cfg | 14 -------------- .../umo_dual_global_High_Quality.inst.cfg | 14 -------------- .../umo_dual_global_Normal_Quality.inst.cfg | 14 -------------- .../umo_dual_global_Superdraft_Quality.inst.cfg | 14 -------------- .../umo_dual_global_Verydraft_Quality.inst.cfg | 14 -------------- 7 files changed, 1 insertion(+), 84 deletions(-) delete mode 100644 resources/quality/ultimaker_original_dual/umo_dual_global_Draft_Quality.inst.cfg delete mode 100644 resources/quality/ultimaker_original_dual/umo_dual_global_Fast_Quality.inst.cfg delete mode 100644 resources/quality/ultimaker_original_dual/umo_dual_global_High_Quality.inst.cfg delete mode 100644 resources/quality/ultimaker_original_dual/umo_dual_global_Normal_Quality.inst.cfg delete mode 100644 resources/quality/ultimaker_original_dual/umo_dual_global_Superdraft_Quality.inst.cfg delete mode 100644 resources/quality/ultimaker_original_dual/umo_dual_global_Verydraft_Quality.inst.cfg diff --git a/resources/definitions/ultimaker_original_dual.def.json b/resources/definitions/ultimaker_original_dual.def.json index d5b96771d3..1ce15f7dc6 100644 --- a/resources/definitions/ultimaker_original_dual.def.json +++ b/resources/definitions/ultimaker_original_dual.def.json @@ -12,6 +12,7 @@ "platform": "ultimaker_platform.stl", "has_materials": true, "has_machine_quality": true, + "quality_definition": "ultimaker_original", "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"], "machine_extruder_trains": { diff --git a/resources/quality/ultimaker_original_dual/umo_dual_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_original_dual/umo_dual_global_Draft_Quality.inst.cfg deleted file mode 100644 index d4bc2cf9df..0000000000 --- a/resources/quality/ultimaker_original_dual/umo_dual_global_Draft_Quality.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -version = 4 -name = Fast -definition = ultimaker_original_dual - -[metadata] -setting_version = 4 -type = quality -quality_type = draft -weight = -2 -global_quality = True - -[values] -layer_height = 0.2 diff --git a/resources/quality/ultimaker_original_dual/umo_dual_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_original_dual/umo_dual_global_Fast_Quality.inst.cfg deleted file mode 100644 index 73c3187ee5..0000000000 --- a/resources/quality/ultimaker_original_dual/umo_dual_global_Fast_Quality.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -version = 4 -name = Normal -definition = ultimaker_original_dual - -[metadata] -setting_version = 4 -type = quality -quality_type = fast -weight = -1 -global_quality = True - -[values] -layer_height = 0.15 diff --git a/resources/quality/ultimaker_original_dual/umo_dual_global_High_Quality.inst.cfg b/resources/quality/ultimaker_original_dual/umo_dual_global_High_Quality.inst.cfg deleted file mode 100644 index e67b86ff93..0000000000 --- a/resources/quality/ultimaker_original_dual/umo_dual_global_High_Quality.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -version = 4 -name = Extra Fine -definition = ultimaker_original_dual - -[metadata] -setting_version = 4 -type = quality -quality_type = high -weight = 0 -global_quality = True - -[values] -layer_height = 0.06 diff --git a/resources/quality/ultimaker_original_dual/umo_dual_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_original_dual/umo_dual_global_Normal_Quality.inst.cfg deleted file mode 100644 index 065c072130..0000000000 --- a/resources/quality/ultimaker_original_dual/umo_dual_global_Normal_Quality.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -version = 4 -name = Fine -definition = ultimaker_original_dual - -[metadata] -setting_version = 4 -type = quality -quality_type = normal -weight = 0 -global_quality = True - -[values] -layer_height = 0.1 diff --git a/resources/quality/ultimaker_original_dual/umo_dual_global_Superdraft_Quality.inst.cfg b/resources/quality/ultimaker_original_dual/umo_dual_global_Superdraft_Quality.inst.cfg deleted file mode 100644 index b479454121..0000000000 --- a/resources/quality/ultimaker_original_dual/umo_dual_global_Superdraft_Quality.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -version = 4 -name = Sprint -definition = ultimaker_original_dual - -[metadata] -setting_version = 4 -type = quality -quality_type = superdraft -weight = -4 -global_quality = True - -[values] -layer_height = 0.4 diff --git a/resources/quality/ultimaker_original_dual/umo_dual_global_Verydraft_Quality.inst.cfg b/resources/quality/ultimaker_original_dual/umo_dual_global_Verydraft_Quality.inst.cfg deleted file mode 100644 index 43ca8a3b82..0000000000 --- a/resources/quality/ultimaker_original_dual/umo_dual_global_Verydraft_Quality.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -version = 4 -name = Extra Fast -definition = ultimaker_original_dual - -[metadata] -setting_version = 4 -type = quality -quality_type = verydraft -weight = -3 -global_quality = True - -[values] -layer_height = 0.3