FIX: duplicate setting id and error vendor

Jira: 7761 Signed-off-by: qing.zhang <qing.zhang@bambulab.com> Change-Id: I017b56eab699b103628ecb80452d9a4a5ea0ae88 (cherry picked from commit 05ddfbec848ee0b7becb7039873edc62c8e650ad)
bambulab · Aug 9, 2024 · 4697a98 · 4697a98
1 parent d59cb73
commit 4697a98
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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",