From dacd1769623a175fee2dd8c43ca8e702c47da938 Mon Sep 17 00:00:00 2001 From: "xun.zhang" Date: Wed, 3 Apr 2024 11:17:47 +0800 Subject: [PATCH] FIX: wrong filament id in some profiles jira:NEW Signed-off-by: xun.zhang Change-Id: I8ff37e8685070cece63376cce8fce9df3d5030d9 --- resources/profiles/BBL.json | 2 +- resources/profiles/BBL/filament/Generic EVA @BBL A1.json | 2 +- resources/profiles/BBL/filament/Generic EVA @BBL A1M.json | 2 +- resources/profiles/BBL/filament/Generic EVA @BBL X1C.json | 2 +- resources/profiles/BBL/filament/Generic EVA @base.json | 2 +- resources/profiles/BBL/filament/Generic PCTG @BBL A1.json | 2 +- resources/profiles/BBL/filament/Generic PCTG @BBL A1M.json | 2 +- resources/profiles/BBL/filament/Generic PCTG @BBL X1C.json | 2 +- resources/profiles/BBL/filament/Generic PCTG @base.json | 2 +- resources/profiles/BBL/filament/Generic PE @BBL A1.json | 2 +- resources/profiles/BBL/filament/Generic PE @BBL A1M.json | 2 +- resources/profiles/BBL/filament/Generic PE @BBL X1C.json | 2 +- resources/profiles/BBL/filament/Generic PE @base.json | 2 +- resources/profiles/BBL/filament/Generic PP @BBL A1.json | 2 +- resources/profiles/BBL/filament/Generic PP @BBL A1M.json | 2 +- resources/profiles/BBL/filament/Generic PP @BBL X1C.json | 2 +- resources/profiles/BBL/filament/Generic PP @base.json | 1 + resources/profiles/BBL/filament/Generic PP-CF @BBL A1.json | 2 +- resources/profiles/BBL/filament/Generic PP-CF @BBL X1C.json | 2 +- resources/profiles/BBL/filament/Generic PP-CF @base.json | 2 +- resources/profiles/BBL/filament/Generic PP-GF @BBL A1.json | 2 +- resources/profiles/BBL/filament/Generic PP-GF @BBL X1C.json | 2 +- resources/profiles/BBL/filament/Generic PP-GF @base.json | 2 +- resources/profiles/BBL/filament/fdm_filament_pp.json | 1 - 24 files changed, 23 insertions(+), 23 deletions(-) diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json index 5341640ec..2afe0897d 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.09.00.03", + "version": "01.09.00.04", "force_update": "0", "description": "the initial version of BBL configurations", "machine_model_list": [ diff --git a/resources/profiles/BBL/filament/Generic EVA @BBL A1.json b/resources/profiles/BBL/filament/Generic EVA @BBL A1.json index 9e4276348..b3f683fc2 100644 --- a/resources/profiles/BBL/filament/Generic EVA @BBL A1.json +++ b/resources/profiles/BBL/filament/Generic EVA @BBL A1.json @@ -3,7 +3,7 @@ "name": "Generic EVA @BBL A1", "inherits": "Generic EVA @base", "from": "system", - "setting_id": "SR99_01", + "setting_id": "GFSR99_01", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Generic EVA @BBL A1M.json b/resources/profiles/BBL/filament/Generic EVA @BBL A1M.json index bc9701e26..e46788991 100644 --- a/resources/profiles/BBL/filament/Generic EVA @BBL A1M.json +++ b/resources/profiles/BBL/filament/Generic EVA @BBL A1M.json @@ -3,7 +3,7 @@ "name": "Generic EVA @BBL A1M", "inherits": "Generic EVA @base", "from": "system", - "setting_id": "SR99_02", + "setting_id": "GFSR99_02", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Generic EVA @BBL X1C.json b/resources/profiles/BBL/filament/Generic EVA @BBL X1C.json index 034e8e7c6..e098b9316 100644 --- a/resources/profiles/BBL/filament/Generic EVA @BBL X1C.json +++ b/resources/profiles/BBL/filament/Generic EVA @BBL X1C.json @@ -3,7 +3,7 @@ "name": "Generic EVA @BBL X1C", "inherits": "Generic EVA @base", "from": "system", - "setting_id": "SR99_00", + "setting_id": "GFSR99_00", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Generic EVA @base.json b/resources/profiles/BBL/filament/Generic EVA @base.json index 0817c30eb..6a24cfdba 100644 --- a/resources/profiles/BBL/filament/Generic EVA @base.json +++ b/resources/profiles/BBL/filament/Generic EVA @base.json @@ -3,7 +3,7 @@ "name": "Generic EVA @base", "inherits": "fdm_filament_eva", "from": "system", - "filament_id": "R99", + "filament_id": "GFR99", "instantiation": "false", "additional_cooling_fan_speed": [ "70" diff --git a/resources/profiles/BBL/filament/Generic PCTG @BBL A1.json b/resources/profiles/BBL/filament/Generic PCTG @BBL A1.json index 335d8c388..0d7ddda1c 100644 --- a/resources/profiles/BBL/filament/Generic PCTG @BBL A1.json +++ b/resources/profiles/BBL/filament/Generic PCTG @BBL A1.json @@ -3,7 +3,7 @@ "name": "Generic PCTG @BBL A1", "inherits": "Generic PCTG @base", "from": "system", - "setting_id": "SG97_01", + "setting_id": "GFSG97_01", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Generic PCTG @BBL A1M.json b/resources/profiles/BBL/filament/Generic PCTG @BBL A1M.json index 51df441bf..3f02a3a3e 100644 --- a/resources/profiles/BBL/filament/Generic PCTG @BBL A1M.json +++ b/resources/profiles/BBL/filament/Generic PCTG @BBL A1M.json @@ -3,7 +3,7 @@ "name": "Generic PCTG @BBL A1M", "inherits": "Generic PCTG @base", "from": "system", - "setting_id": "SG97_02", + "setting_id": "GFSG97_02", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Generic PCTG @BBL X1C.json b/resources/profiles/BBL/filament/Generic PCTG @BBL X1C.json index e9cf1622f..e7802ed3d 100644 --- a/resources/profiles/BBL/filament/Generic PCTG @BBL X1C.json +++ b/resources/profiles/BBL/filament/Generic PCTG @BBL X1C.json @@ -3,7 +3,7 @@ "name": "Generic PCTG @BBL X1C", "inherits": "Generic PCTG @base", "from": "system", - "setting_id": "SG97_00", + "setting_id": "GFSG97_00", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Generic PCTG @base.json b/resources/profiles/BBL/filament/Generic PCTG @base.json index e18f7dd98..ca51974e2 100644 --- a/resources/profiles/BBL/filament/Generic PCTG @base.json +++ b/resources/profiles/BBL/filament/Generic PCTG @base.json @@ -3,7 +3,7 @@ "name": "Generic PCTG @base", "inherits": "fdm_filament_pet", "from": "system", - "filament_id": "G97", + "filament_id": "GFG97", "instantiation": "false", "cool_plate_temp": [ "0" diff --git a/resources/profiles/BBL/filament/Generic PE @BBL A1.json b/resources/profiles/BBL/filament/Generic PE @BBL A1.json index c38081d75..26295d9ea 100644 --- a/resources/profiles/BBL/filament/Generic PE @BBL A1.json +++ b/resources/profiles/BBL/filament/Generic PE @BBL A1.json @@ -3,7 +3,7 @@ "name": "Generic PE @BBL A1", "inherits": "Generic PE @base", "from": "system", - "setting_id": "SP99_01", + "setting_id": "GFSP99_01", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Generic PE @BBL A1M.json b/resources/profiles/BBL/filament/Generic PE @BBL A1M.json index a3011b935..e18834b97 100644 --- a/resources/profiles/BBL/filament/Generic PE @BBL A1M.json +++ b/resources/profiles/BBL/filament/Generic PE @BBL A1M.json @@ -3,7 +3,7 @@ "name": "Generic PE @BBL A1M", "inherits": "Generic PE @base", "from": "system", - "setting_id": "SP99_02", + "setting_id": "GFSP99_02", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.6 nozzle", diff --git a/resources/profiles/BBL/filament/Generic PE @BBL X1C.json b/resources/profiles/BBL/filament/Generic PE @BBL X1C.json index 28164503a..52a53fb50 100644 --- a/resources/profiles/BBL/filament/Generic PE @BBL X1C.json +++ b/resources/profiles/BBL/filament/Generic PE @BBL X1C.json @@ -3,7 +3,7 @@ "name": "Generic PE @BBL X1C", "inherits": "Generic PE @base", "from": "system", - "setting_id": "SP99_00", + "setting_id": "GFSP99_00", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Generic PE @base.json b/resources/profiles/BBL/filament/Generic PE @base.json index de981a49d..c93659062 100644 --- a/resources/profiles/BBL/filament/Generic PE @base.json +++ b/resources/profiles/BBL/filament/Generic PE @base.json @@ -3,7 +3,7 @@ "name": "Generic PE @base", "inherits": "fdm_filament_pe", "from": "system", - "filament_id": "P99", + "filament_id": "GFP99", "instantiation": "false", "filament_cost": [ "40.99" diff --git a/resources/profiles/BBL/filament/Generic PP @BBL A1.json b/resources/profiles/BBL/filament/Generic PP @BBL A1.json index e4133cf4f..9b8488730 100644 --- a/resources/profiles/BBL/filament/Generic PP @BBL A1.json +++ b/resources/profiles/BBL/filament/Generic PP @BBL A1.json @@ -3,7 +3,7 @@ "name": "Generic PP @BBL A1", "inherits": "Generic PP @base", "from": "system", - "setting_id": "SP97_01", + "setting_id": "GFSP97_01", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Generic PP @BBL A1M.json b/resources/profiles/BBL/filament/Generic PP @BBL A1M.json index fade5fcf9..d9a99abe1 100644 --- a/resources/profiles/BBL/filament/Generic PP @BBL A1M.json +++ b/resources/profiles/BBL/filament/Generic PP @BBL A1M.json @@ -3,7 +3,7 @@ "name": "Generic PP @BBL A1M", "inherits": "Generic PP @base", "from": "system", - "setting_id": "SP97_02", + "setting_id": "GFSP97_02", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 mini 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Generic PP @BBL X1C.json b/resources/profiles/BBL/filament/Generic PP @BBL X1C.json index b575120c5..9a71d210e 100644 --- a/resources/profiles/BBL/filament/Generic PP @BBL X1C.json +++ b/resources/profiles/BBL/filament/Generic PP @BBL X1C.json @@ -3,7 +3,7 @@ "name": "Generic PP @BBL X1C", "inherits": "Generic PP @base", "from": "system", - "setting_id": "SP97_00", + "setting_id": "GFSP97_00", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Generic PP @base.json b/resources/profiles/BBL/filament/Generic PP @base.json index 7973c77a3..faf0a211f 100644 --- a/resources/profiles/BBL/filament/Generic PP @base.json +++ b/resources/profiles/BBL/filament/Generic PP @base.json @@ -3,5 +3,6 @@ "name": "Generic PP @base", "inherits": "fdm_filament_pp", "from": "system", + "filament_id": "GFP97", "instantiation": "false" } \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Generic PP-CF @BBL A1.json b/resources/profiles/BBL/filament/Generic PP-CF @BBL A1.json index 8f24de1ab..508820e21 100644 --- a/resources/profiles/BBL/filament/Generic PP-CF @BBL A1.json +++ b/resources/profiles/BBL/filament/Generic PP-CF @BBL A1.json @@ -3,7 +3,7 @@ "name": "Generic PP-CF @BBL A1", "inherits": "Generic PP-CF @base", "from": "system", - "setting_id": "SP96_01", + "setting_id": "GFSP96_01", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Generic PP-CF @BBL X1C.json b/resources/profiles/BBL/filament/Generic PP-CF @BBL X1C.json index 5fc2aaea2..2b0076a65 100644 --- a/resources/profiles/BBL/filament/Generic PP-CF @BBL X1C.json +++ b/resources/profiles/BBL/filament/Generic PP-CF @BBL X1C.json @@ -3,7 +3,7 @@ "name": "Generic PP-CF @BBL X1C", "inherits": "Generic PP-CF @base", "from": "system", - "setting_id": "SP96_00", + "setting_id": "GFSP96_00", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Generic PP-CF @base.json b/resources/profiles/BBL/filament/Generic PP-CF @base.json index 8fb4c1845..c131f9587 100644 --- a/resources/profiles/BBL/filament/Generic PP-CF @base.json +++ b/resources/profiles/BBL/filament/Generic PP-CF @base.json @@ -3,7 +3,7 @@ "name": "Generic PP-CF @base", "inherits": "fdm_filament_pp", "from": "system", - "filament_id": "P96", + "filament_id": "GFP96", "instantiation": "false", "filament_cost": [ "77.99" diff --git a/resources/profiles/BBL/filament/Generic PP-GF @BBL A1.json b/resources/profiles/BBL/filament/Generic PP-GF @BBL A1.json index 168bedf2b..bbc64f6e9 100644 --- a/resources/profiles/BBL/filament/Generic PP-GF @BBL A1.json +++ b/resources/profiles/BBL/filament/Generic PP-GF @BBL A1.json @@ -3,7 +3,7 @@ "name": "Generic PP-GF @BBL A1", "inherits": "Generic PP-GF @base", "from": "system", - "setting_id": "SP95_00", + "setting_id": "GFSP95_00", "instantiation": "true", "compatible_printers": [ "Bambu Lab A1 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Generic PP-GF @BBL X1C.json b/resources/profiles/BBL/filament/Generic PP-GF @BBL X1C.json index 9d9edfee3..e434ba6a6 100644 --- a/resources/profiles/BBL/filament/Generic PP-GF @BBL X1C.json +++ b/resources/profiles/BBL/filament/Generic PP-GF @BBL X1C.json @@ -3,7 +3,7 @@ "name": "Generic PP-GF @BBL X1C", "inherits": "Generic PP-GF @base", "from": "system", - "setting_id": "SP97_03", + "setting_id": "GFSP97_03", "instantiation": "true", "compatible_printers": [ "Bambu Lab P1P 0.4 nozzle", diff --git a/resources/profiles/BBL/filament/Generic PP-GF @base.json b/resources/profiles/BBL/filament/Generic PP-GF @base.json index a6021b859..b58eace53 100644 --- a/resources/profiles/BBL/filament/Generic PP-GF @base.json +++ b/resources/profiles/BBL/filament/Generic PP-GF @base.json @@ -3,7 +3,7 @@ "name": "Generic PP-GF @base", "inherits": "fdm_filament_pp", "from": "system", - "filament_id": "P95", + "filament_id": "GFP95", "instantiation": "false", "filament_cost": [ "59.99" diff --git a/resources/profiles/BBL/filament/fdm_filament_pp.json b/resources/profiles/BBL/filament/fdm_filament_pp.json index 8fe97b0aa..83a427825 100644 --- a/resources/profiles/BBL/filament/fdm_filament_pp.json +++ b/resources/profiles/BBL/filament/fdm_filament_pp.json @@ -3,7 +3,6 @@ "name": "fdm_filament_pp", "inherits": "fdm_filament_common", "from": "system", - "filament_id": "P97", "instantiation": "false", "additional_cooling_fan_speed": [ "70"