From 7314baf2f68cefadcb1e06a22b178d3603e196f9 Mon Sep 17 00:00:00 2001 From: "qing.zhang" Date: Thu, 1 Aug 2024 09:30:26 +0800 Subject: [PATCH] FIX: duplicate setting id and error vendor Jira: 7761 Signed-off-by: qing.zhang Change-Id: I017b56eab699b103628ecb80452d9a4a5ea0ae88 (cherry picked from commit 05ddfbec848ee0b7becb7039873edc62c8e650ad) --- resources/profiles/Qidi/filament/Generic ABS @Qidi.json | 3 +++ resources/profiles/Qidi/filament/Generic ASA @Qidi.json | 3 +++ resources/profiles/Qidi/filament/Generic PA @Qidi.json | 3 +++ resources/profiles/Qidi/filament/Generic PA-CF @Qidi.json | 3 +++ resources/profiles/Qidi/filament/Generic PC @Qidi.json | 3 +++ resources/profiles/Qidi/filament/Generic PETG @Qidi.json | 3 +++ resources/profiles/Qidi/filament/Generic PETG-CF @Qidi.json | 2 +- resources/profiles/Qidi/filament/Generic PLA @Qidi.json | 3 +++ resources/profiles/Qidi/filament/Generic PLA Silk @Qidi.json | 3 +++ resources/profiles/Qidi/filament/Generic PLA-CF @Qidi.json | 3 +++ resources/profiles/Qidi/filament/Generic PVA @Qidi.json | 3 +++ resources/profiles/Qidi/filament/Generic TPU @Qidi.json | 3 +++ .../Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../Qidi/process/0.18mm Standard @Qidi Q1 Pro 0.6 nozzle.json | 2 +- 14 files changed, 36 insertions(+), 3 deletions(-) diff --git a/resources/profiles/Qidi/filament/Generic ABS @Qidi.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi.json index d7972ac676..eb447bf912 100644 --- a/resources/profiles/Qidi/filament/Generic ABS @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi.json @@ -32,6 +32,9 @@ ], "filament_density":[ "1.04" + ], + "filament_vendor": [ + "Generic" ], "compatible_printers": [ "Qidi X-Plus 0.2 nozzle", diff --git a/resources/profiles/Qidi/filament/Generic ASA @Qidi.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi.json index ba911e5548..ed4c209d3a 100644 --- a/resources/profiles/Qidi/filament/Generic ASA @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi.json @@ -32,6 +32,9 @@ ], "pressure_advance": [ "0.021" + ], + "filament_vendor": [ + "Generic" ], "compatible_printers": [ "Qidi X-Plus 0.2 nozzle", diff --git a/resources/profiles/Qidi/filament/Generic PA @Qidi.json b/resources/profiles/Qidi/filament/Generic PA @Qidi.json index c43fb36d17..69b0fb9784 100644 --- a/resources/profiles/Qidi/filament/Generic PA @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic PA @Qidi.json @@ -24,6 +24,9 @@ "pressure_advance": [ "0.01" ], + "filament_vendor": [ + "Generic" + ], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", "Qidi X-Max 0.4 nozzle", diff --git a/resources/profiles/Qidi/filament/Generic PA-CF @Qidi.json b/resources/profiles/Qidi/filament/Generic PA-CF @Qidi.json index 0abd93b9ff..8393e45934 100644 --- a/resources/profiles/Qidi/filament/Generic PA-CF @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic PA-CF @Qidi.json @@ -42,6 +42,9 @@ "pressure_advance": [ "0.01" ], + "filament_vendor": [ + "Generic" + ], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", "Qidi X-Max 0.4 nozzle", diff --git a/resources/profiles/Qidi/filament/Generic PC @Qidi.json b/resources/profiles/Qidi/filament/Generic PC @Qidi.json index 41973d3ac9..bbe6036e52 100644 --- a/resources/profiles/Qidi/filament/Generic PC @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic PC @Qidi.json @@ -18,6 +18,9 @@ "pressure_advance": [ "0.04" ], + "filament_vendor": [ + "Generic" + ], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", "Qidi X-Max 0.4 nozzle", diff --git a/resources/profiles/Qidi/filament/Generic PETG @Qidi.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi.json index 617d3e1055..abf42bbedc 100644 --- a/resources/profiles/Qidi/filament/Generic PETG @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi.json @@ -48,6 +48,9 @@ "filament_density":[ "1.27" ], + "filament_vendor": [ + "Generic" + ], "compatible_printers": [ "Qidi X-Plus 0.2 nozzle", "Qidi X-Max 0.2 nozzle", diff --git a/resources/profiles/Qidi/filament/Generic PETG-CF @Qidi.json b/resources/profiles/Qidi/filament/Generic PETG-CF @Qidi.json index 4e64f50557..20673f3745 100644 --- a/resources/profiles/Qidi/filament/Generic PETG-CF @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic PETG-CF @Qidi.json @@ -43,7 +43,7 @@ "40" ], "filament_vendor": [ - "Other brand" + "Generic" ], "filament_type": [ "PETG-CF" diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi.json index b32a2a27d9..137d8dc03d 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi.json @@ -20,6 +20,9 @@ ], "pressure_advance": [ "0.031" + ], + "filament_vendor": [ + "Generic" ], "compatible_printers": [ "Qidi X-Plus 0.2 nozzle", diff --git a/resources/profiles/Qidi/filament/Generic PLA Silk @Qidi.json b/resources/profiles/Qidi/filament/Generic PLA Silk @Qidi.json index 48e08c8ce1..fcac713fb8 100644 --- a/resources/profiles/Qidi/filament/Generic PLA Silk @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic PLA Silk @Qidi.json @@ -29,6 +29,9 @@ ], "hot_plate_temp" : [ "55" + ], + "filament_vendor": [ + "Generic" ], "compatible_printers": [ "Qidi X-Plus 0.2 nozzle", diff --git a/resources/profiles/Qidi/filament/Generic PLA-CF @Qidi.json b/resources/profiles/Qidi/filament/Generic PLA-CF @Qidi.json index 7602c2c4b7..4d2af6f715 100644 --- a/resources/profiles/Qidi/filament/Generic PLA-CF @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic PLA-CF @Qidi.json @@ -33,6 +33,9 @@ "nozzle_temperature_range_high": [ "240" ], + "filament_vendor": [ + "Generic" + ], "compatible_printers": [ "Qidi X-Plus 0.2 nozzle", "Qidi X-Max 0.2 nozzle", diff --git a/resources/profiles/Qidi/filament/Generic PVA @Qidi.json b/resources/profiles/Qidi/filament/Generic PVA @Qidi.json index 13ec58ac4b..a04419a002 100644 --- a/resources/profiles/Qidi/filament/Generic PVA @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic PVA @Qidi.json @@ -18,6 +18,9 @@ "slow_down_min_speed": [ "10" ], + "filament_vendor": [ + "Generic" + ], "compatible_printers": [ "Qidi X-Plus 0.2 nozzle", "Qidi X-Max 0.2 nozzle", diff --git a/resources/profiles/Qidi/filament/Generic TPU @Qidi.json b/resources/profiles/Qidi/filament/Generic TPU @Qidi.json index f000d152b8..e7fd4efe82 100644 --- a/resources/profiles/Qidi/filament/Generic TPU @Qidi.json +++ b/resources/profiles/Qidi/filament/Generic TPU @Qidi.json @@ -20,6 +20,9 @@ ], "nozzle_temperature": [ "230" + ], + "filament_vendor": [ + "Generic" ], "compatible_printers": [ "Qidi X-Plus 0.4 nozzle", diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json index 3e6c49d62d..dbe8f4b03f 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "filament_id": "GFB00", - "setting_id": "GFSB00_Qidi_22", + "setting_id": "GFSB00_Qidi_25", "name": "QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Qidi/process/0.18mm Standard @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/process/0.18mm Standard @Qidi Q1 Pro 0.6 nozzle.json index 1a9643c6a6..919dd57490 100644 --- a/resources/profiles/Qidi/process/0.18mm Standard @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/process/0.18mm Standard @Qidi Q1 Pro 0.6 nozzle.json @@ -1,6 +1,6 @@ { "type": "process", - "setting_id": "GP037", + "setting_id": "GP_Qidi_037", "name": "0.18mm Standard @Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true",