From a00e58c3bf31a39c2af61cde872f00ceb5f6fbb5 Mon Sep 17 00:00:00 2001
From: "salt.wei" <salt.wei@bambulab.com>
Date: Wed, 3 Aug 2022 20:44:35 +0800
Subject: [PATCH] ENH: sync filament_id with RFID

Make filament_id to be same with information
from nectarine

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I3012d74bb8fe849fbaf9fabab791a6b06335dcf6
---
 resources/profiles/BBL.json                                   | 2 +-
 resources/profiles/BBL/filament/Bambu PA-CF @BBL X1C.json     | 2 +-
 resources/profiles/BBL/filament/Bambu PA-CF @base.json        | 2 +-
 resources/profiles/BBL/filament/Bambu Support G @BBL X1C.json | 2 +-
 resources/profiles/BBL/filament/Bambu Support W @BBL X1.json  | 2 +-
 resources/profiles/BBL/filament/Bambu Support W @BBL X1C.json | 2 +-
 resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1.json    | 2 +-
 resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1C.json   | 2 +-
 resources/profiles/BBL/filament/Bambu TPU 95A @base.json      | 2 +-
 resources/profiles/BBL/filament/Generic PA-CF.json            | 4 ++--
 resources/profiles/BBL/filament/Generic PA.json               | 4 ++--
 resources/profiles/BBL/filament/Generic TPU.json              | 4 ++--
 resources/profiles/BBL/filament/PolyLite PLA @BBL X1.json     | 2 +-
 resources/profiles/BBL/filament/PolyLite PLA @BBL X1C.json    | 2 +-
 resources/profiles/BBL/filament/PolyLite PLA @base.json       | 2 +-
 resources/profiles/BBL/filament/PolyTerra PLA @BBL X1.json    | 2 +-
 resources/profiles/BBL/filament/PolyTerra PLA @BBL X1C.json   | 2 +-
 resources/profiles/BBL/filament/PolyTerra PLA @base.json      | 2 +-
 18 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json
index a2f84518c..94459f1a7 100644
--- a/resources/profiles/BBL.json
+++ b/resources/profiles/BBL.json
@@ -1,7 +1,7 @@
 {
     "name": "Bambulab",
     "url": "http://www.bambulab.com/Parameters/vendor/BBL.json",
-    "version": "01.01.00.18",
+    "version": "01.01.00.19",
     "force_update": "0",
     "description": "the initial version of BBL configurations",
     "machine_model_list": [
diff --git a/resources/profiles/BBL/filament/Bambu PA-CF @BBL X1C.json b/resources/profiles/BBL/filament/Bambu PA-CF @BBL X1C.json
index b5e5767a5..079073606 100644
--- a/resources/profiles/BBL/filament/Bambu PA-CF @BBL X1C.json	
+++ b/resources/profiles/BBL/filament/Bambu PA-CF @BBL X1C.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "setting_id": "GFSN00",
+    "setting_id": "GFSN03_00",
     "name": "Bambu PA-CF @BBL X1C",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/BBL/filament/Bambu PA-CF @base.json b/resources/profiles/BBL/filament/Bambu PA-CF @base.json
index 34c84203c..a9b6f1687 100644
--- a/resources/profiles/BBL/filament/Bambu PA-CF @base.json	
+++ b/resources/profiles/BBL/filament/Bambu PA-CF @base.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "filament_id": "GFN00",
+    "filament_id": "GFN03",
     "name": "Bambu PA-CF @base",
     "from": "system",
     "instantiation": "false",
diff --git a/resources/profiles/BBL/filament/Bambu Support G @BBL X1C.json b/resources/profiles/BBL/filament/Bambu Support G @BBL X1C.json
index 36eddbed4..69391375e 100644
--- a/resources/profiles/BBL/filament/Bambu Support G @BBL X1C.json	
+++ b/resources/profiles/BBL/filament/Bambu Support G @BBL X1C.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "setting_id": "GFSS01",
+    "setting_id": "GFSS01_00",
     "name": "Bambu Support G @BBL X1C",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/BBL/filament/Bambu Support W @BBL X1.json b/resources/profiles/BBL/filament/Bambu Support W @BBL X1.json
index 070b48af7..8e3ea01e4 100644
--- a/resources/profiles/BBL/filament/Bambu Support W @BBL X1.json	
+++ b/resources/profiles/BBL/filament/Bambu Support W @BBL X1.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "setting_id": "GFSS02",
+    "setting_id": "GFSS00_00",
     "name": "Bambu Support W @BBL X1",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/BBL/filament/Bambu Support W @BBL X1C.json b/resources/profiles/BBL/filament/Bambu Support W @BBL X1C.json
index 82bd6d15d..04d240efe 100644
--- a/resources/profiles/BBL/filament/Bambu Support W @BBL X1C.json	
+++ b/resources/profiles/BBL/filament/Bambu Support W @BBL X1C.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "setting_id": "GFSS00",
+    "setting_id": "GFSS00_01",
     "name": "Bambu Support W @BBL X1C",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1.json b/resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1.json
index 2f6278877..3dd878a60 100644
--- a/resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1.json	
+++ b/resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "setting_id": "GFSU01",
+    "setting_id": "GFSU01_00",
     "name": "Bambu TPU 95A @BBL X1",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1C.json b/resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1C.json
index 35c332260..8dd0c257f 100644
--- a/resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1C.json	
+++ b/resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1C.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "setting_id": "GFSU00",
+    "setting_id": "GFSU01_01",
     "name": "Bambu TPU 95A @BBL X1C",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/BBL/filament/Bambu TPU 95A @base.json b/resources/profiles/BBL/filament/Bambu TPU 95A @base.json
index 84fe7cba3..8006c0adc 100644
--- a/resources/profiles/BBL/filament/Bambu TPU 95A @base.json	
+++ b/resources/profiles/BBL/filament/Bambu TPU 95A @base.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "filament_id": "GFU00",
+    "filament_id": "GFU01",
     "name": "Bambu TPU 95A @base",
     "from": "system",
     "instantiation": "false",
diff --git a/resources/profiles/BBL/filament/Generic PA-CF.json b/resources/profiles/BBL/filament/Generic PA-CF.json
index aaaa07bff..2674ae735 100644
--- a/resources/profiles/BBL/filament/Generic PA-CF.json	
+++ b/resources/profiles/BBL/filament/Generic PA-CF.json	
@@ -1,7 +1,7 @@
 {
     "type": "filament",
-    "filament_id": "GFN99",
-    "setting_id": "GFSN99",
+    "filament_id": "GFN98",
+    "setting_id": "GFSN98",
     "name": "Generic PA-CF",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/BBL/filament/Generic PA.json b/resources/profiles/BBL/filament/Generic PA.json
index 65372b184..75033a8ce 100644
--- a/resources/profiles/BBL/filament/Generic PA.json	
+++ b/resources/profiles/BBL/filament/Generic PA.json	
@@ -1,7 +1,7 @@
 {
     "type": "filament",
-    "filament_id": "GFN98",
-    "setting_id": "GFSN98",
+    "filament_id": "GFN99",
+    "setting_id": "GFSN99",
     "name": "Generic PA",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/BBL/filament/Generic TPU.json b/resources/profiles/BBL/filament/Generic TPU.json
index 0ff90862d..1c10bb590 100644
--- a/resources/profiles/BBL/filament/Generic TPU.json	
+++ b/resources/profiles/BBL/filament/Generic TPU.json	
@@ -1,7 +1,7 @@
 {
     "type": "filament",
-    "filament_id": "GFR99",
-    "setting_id": "GFSR99",
+    "filament_id": "GFU99",
+    "setting_id": "GFSU99",
     "name": "Generic TPU",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/BBL/filament/PolyLite PLA @BBL X1.json b/resources/profiles/BBL/filament/PolyLite PLA @BBL X1.json
index f112ca654..0a49079df 100644
--- a/resources/profiles/BBL/filament/PolyLite PLA @BBL X1.json	
+++ b/resources/profiles/BBL/filament/PolyLite PLA @BBL X1.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "setting_id": "GFSL23",
+    "setting_id": "GFSL00_00",
     "name": "PolyLite PLA @BBL X1",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/BBL/filament/PolyLite PLA @BBL X1C.json b/resources/profiles/BBL/filament/PolyLite PLA @BBL X1C.json
index 292239380..0c83307ca 100644
--- a/resources/profiles/BBL/filament/PolyLite PLA @BBL X1C.json	
+++ b/resources/profiles/BBL/filament/PolyLite PLA @BBL X1C.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "setting_id": "GFSL19",
+    "setting_id": "GFSL00_01",
     "name": "PolyLite PLA @BBL X1C",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/BBL/filament/PolyLite PLA @base.json b/resources/profiles/BBL/filament/PolyLite PLA @base.json
index 7382e9c6d..4a67c0931 100644
--- a/resources/profiles/BBL/filament/PolyLite PLA @base.json	
+++ b/resources/profiles/BBL/filament/PolyLite PLA @base.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "filament_id": "GFL19",
+    "filament_id": "GFL00",
     "name": "PolyLite PLA @base",
     "from": "system",
     "instantiation": "false",
diff --git a/resources/profiles/BBL/filament/PolyTerra PLA @BBL X1.json b/resources/profiles/BBL/filament/PolyTerra PLA @BBL X1.json
index d57efcab9..237740be0 100644
--- a/resources/profiles/BBL/filament/PolyTerra PLA @BBL X1.json	
+++ b/resources/profiles/BBL/filament/PolyTerra PLA @BBL X1.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "setting_id": "GFSL22",
+    "setting_id": "GFSL01_00",
     "name": "PolyTerra PLA @BBL X1",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/BBL/filament/PolyTerra PLA @BBL X1C.json b/resources/profiles/BBL/filament/PolyTerra PLA @BBL X1C.json
index 365b88263..055d7b019 100644
--- a/resources/profiles/BBL/filament/PolyTerra PLA @BBL X1C.json	
+++ b/resources/profiles/BBL/filament/PolyTerra PLA @BBL X1C.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "setting_id": "GFSL18",
+    "setting_id": "GFSL01_01",
     "name": "PolyTerra PLA @BBL X1C",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/BBL/filament/PolyTerra PLA @base.json b/resources/profiles/BBL/filament/PolyTerra PLA @base.json
index 40e3785d0..ccaa910c0 100644
--- a/resources/profiles/BBL/filament/PolyTerra PLA @base.json	
+++ b/resources/profiles/BBL/filament/PolyTerra PLA @base.json	
@@ -1,6 +1,6 @@
 {
     "type": "filament",
-    "filament_id": "GFL18",
+    "filament_id": "GFL01",
     "name": "PolyTerra PLA @base",
     "from": "system",
     "instantiation": "false",