diff --git a/resources/profiles/Qidi.json b/resources/profiles/Qidi.json index 61f549a78..58d87ba70 100644 --- a/resources/profiles/Qidi.json +++ b/resources/profiles/Qidi.json @@ -545,8 +545,8 @@ "sub_path": "filament/fdm_filament_tpu.json" }, { - "name": "Generic ABS", - "sub_path": "filament/Generic ABS.json" + "name": "Generic ABS @Qidi", + "sub_path": "filament/Generic ABS @Qidi.json" }, { "name": "Generic ABS @Qidi Q1 Pro 0.2 nozzle", @@ -569,8 +569,8 @@ "sub_path": "filament/Generic ABS @Qidi 0.2 nozzle.json" }, { - "name": "Generic PETG", - "sub_path": "filament/Generic PETG.json" + "name": "Generic PETG @Qidi", + "sub_path": "filament/Generic PETG @Qidi.json" }, { "name": "Generic PETG @Qidi Q1 Pro 0.2 nozzle", @@ -593,8 +593,8 @@ "sub_path": "filament/Generic PETG @Qidi 0.2 nozzle.json" }, { - "name": "Generic PLA", - "sub_path": "filament/Generic PLA.json" + "name": "Generic PLA @Qidi", + "sub_path": "filament/Generic PLA @Qidi.json" }, { "name": "Generic PLA @Qidi Q1 Pro 0.2 nozzle", @@ -617,8 +617,8 @@ "sub_path": "filament/Generic PLA @Qidi 0.2 nozzle.json" }, { - "name": "QIDI ABS Odorless", - "sub_path": "filament/QIDI ABS Odorless.json" + "name": "QIDI ABS Odorless @Qidi", + "sub_path": "filament/QIDI ABS Odorless @Qidi.json" }, { "name": "QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle", @@ -645,8 +645,8 @@ "sub_path": "filament/QIDI ABS Odorless @Qidi 0.8 nozzle.json" }, { - "name": "QIDI ABS Rapido", - "sub_path": "filament/QIDI ABS Rapido.json" + "name": "QIDI ABS Rapido @Qidi", + "sub_path": "filament/QIDI ABS Rapido @Qidi.json" }, { "name": "QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle", @@ -673,8 +673,8 @@ "sub_path": "filament/QIDI ABS Rapido @Qidi 0.8 nozzle.json" }, { - "name": "QIDI ABS-GF25", - "sub_path": "filament/QIDI ABS-GF25.json" + "name": "QIDI ABS-GF25 @Qidi", + "sub_path": "filament/QIDI ABS-GF25 @Qidi.json" }, { "name": "QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle", @@ -689,8 +689,8 @@ "sub_path": "filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json" }, { - "name": "QIDI ASA", - "sub_path": "filament/QIDI ASA.json" + "name": "QIDI ASA @Qidi", + "sub_path": "filament/QIDI ASA @Qidi.json" }, { "name": "QIDI ASA @Qidi Q1 Pro 0.2 nozzle", @@ -713,16 +713,16 @@ "sub_path": "filament/QIDI ASA @Qidi 0.2 nozzle.json" }, { - "name": "QIDI ASA-Aero", - "sub_path": "filament/QIDI ASA-Aero.json" + "name": "QIDI ASA-Aero @Qidi", + "sub_path": "filament/QIDI ASA-Aero @Qidi.json" }, { "name": "QIDI ASA-Aero @Qidi Q1 Pro 0.4 nozzle", "sub_path": "filament/QIDI ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json" }, { - "name": "QIDI PAHT-CF", - "sub_path": "filament/QIDI PAHT-CF.json" + "name": "QIDI PAHT-CF @Qidi", + "sub_path": "filament/QIDI PAHT-CF @Qidi.json" }, { "name": "QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle", @@ -737,8 +737,8 @@ "sub_path": "filament/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle.json" }, { - "name": "QIDI PET-CF", - "sub_path": "filament/QIDI PET-CF.json" + "name": "QIDI PET-CF @Qidi", + "sub_path": "filament/QIDI PET-CF @Qidi.json" }, { "name": "QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle", @@ -753,8 +753,8 @@ "sub_path": "filament/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle.json" }, { - "name": "QIDI PETG Tough", - "sub_path": "filament/QIDI PETG Tough.json" + "name": "QIDI PETG Tough @Qidi", + "sub_path": "filament/QIDI PETG Tough @Qidi.json" }, { "name": "QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle", @@ -773,8 +773,8 @@ "sub_path": "filament/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle.json" }, { - "name": "QIDI PLA Rapido", - "sub_path": "filament/QIDI PLA Rapido.json" + "name": "QIDI PLA Rapido @Qidi", + "sub_path": "filament/QIDI PLA Rapido @Qidi.json" }, { "name": "QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle", @@ -793,8 +793,8 @@ "sub_path": "filament/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle.json" }, { - "name": "QIDI PLA Rapido Matte", - "sub_path": "filament/QIDI PLA Rapido Matte.json" + "name": "QIDI PLA Rapido Matte @Qidi", + "sub_path": "filament/QIDI PLA Rapido Matte @Qidi.json" }, { "name": "QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle", @@ -813,8 +813,8 @@ "sub_path": "filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle.json" }, { - "name": "QIDI PLA-CF", - "sub_path": "filament/QIDI PLA-CF.json" + "name": "QIDI PLA-CF @Qidi", + "sub_path": "filament/QIDI PLA-CF @Qidi.json" }, { "name": "QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle", @@ -837,8 +837,8 @@ "sub_path": "filament/QIDI PLA-CF @Qidi 0.8 nozzle.json" }, { - "name": "QIDI PA-Ultra", - "sub_path": "filament/QIDI PA-Ultra.json" + "name": "QIDI PA-Ultra @Qidi", + "sub_path": "filament/QIDI PA-Ultra @Qidi.json" }, { "name": "QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle", @@ -853,8 +853,8 @@ "sub_path": "filament/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json" }, { - "name": "QIDI ABS-GF10", - "sub_path": "filament/QIDI ABS-GF10.json" + "name": "QIDI ABS-GF10 @Qidi", + "sub_path": "filament/QIDI ABS-GF10 @Qidi.json" }, { "name": "QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle", @@ -869,16 +869,16 @@ "sub_path": "filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json" }, { - "name": "Generic TPU", - "sub_path": "filament/Generic TPU.json" + "name": "Generic TPU @Qidi", + "sub_path": "filament/Generic TPU @Qidi.json" }, { "name": "Generic TPU @Qidi Q1 Pro 0.4 nozzle", "sub_path": "filament/Generic TPU @Qidi Q1 Pro 0.4 nozzle.json" }, { - "name": "Generic ASA", - "sub_path": "filament/Generic ASA.json" + "name": "Generic ASA @Qidi", + "sub_path": "filament/Generic ASA @Qidi.json" }, { "name": "Generic ASA @Qidi Q1 Pro 0.2 nozzle", @@ -925,8 +925,8 @@ "sub_path": "filament/Generic PVA @Qidi.json" }, { - "name": "QIDI ABS-GF", - "sub_path": "filament/QIDI ABS-GF.json" + "name": "QIDI ABS-GF @Qidi", + "sub_path": "filament/QIDI ABS-GF @Qidi.json" }, { "name": "QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle", @@ -945,8 +945,8 @@ "sub_path": "filament/Generic PLA-CF @Qidi.json" }, { - "name": "QIDI TPU 95A-HF", - "sub_path": "filament/QIDI TPU 95A-HF.json" + "name": "QIDI TPU 95A-HF @Qidi", + "sub_path": "filament/QIDI TPU 95A-HF @Qidi.json" }, { "name": "QIDI TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle", diff --git a/resources/profiles/Qidi/filament/Generic ABS @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi 0.2 nozzle.json index 8476f5ab0..8a066b3f0 100644 --- a/resources/profiles/Qidi/filament/Generic ABS @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "Generic ABS @Qidi 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic ABS", + "inherits": "Generic ABS @Qidi", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.2 nozzle.json index b6f4a614f..f62f24d76 100644 --- a/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "Generic ABS @Qidi Q1 Pro 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic ABS", + "inherits": "Generic ABS @Qidi", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.4 nozzle.json index ffd1d6d8a..bb21ee5df 100644 --- a/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.4 nozzle.json @@ -5,7 +5,7 @@ "name": "Generic ABS @Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic ABS", + "inherits": "Generic ABS @Qidi", "fan_max_speed": [ "80" ], diff --git a/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.6 nozzle.json index 34df629cb..bee58304c 100644 --- a/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.6 nozzle.json @@ -5,7 +5,7 @@ "name": "Generic ABS @Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic ABS", + "inherits": "Generic ABS @Qidi", "pressure_advance": [ "0.014" ], diff --git a/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.8 nozzle.json index 67634f436..760e8994e 100644 --- a/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi Q1 Pro 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "Generic ABS @Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic ABS", + "inherits": "Generic ABS @Qidi", "pressure_advance": [ "0.011" ], diff --git a/resources/profiles/Qidi/filament/Generic ABS.json b/resources/profiles/Qidi/filament/Generic ABS @Qidi.json similarity index 97% rename from resources/profiles/Qidi/filament/Generic ABS.json rename to resources/profiles/Qidi/filament/Generic ABS @Qidi.json index c6b8e024b..d7972ac67 100644 --- a/resources/profiles/Qidi/filament/Generic ABS.json +++ b/resources/profiles/Qidi/filament/Generic ABS @Qidi.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFB99", "setting_id": "GFSB99_Qidi_00", - "name": "Generic ABS", + "name": "Generic ABS @Qidi", "from": "system", "instantiation": "true", "inherits": "fdm_filament_abs", diff --git a/resources/profiles/Qidi/filament/Generic ASA @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi 0.2 nozzle.json index 79266a1ad..d8cca42f0 100644 --- a/resources/profiles/Qidi/filament/Generic ASA @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "Generic ASA @Qidi 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic ASA", + "inherits": "Generic ASA @Qidi", "filament_flow_ratio": [ "0.92" ], diff --git a/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.2 nozzle.json index c0cd8807e..66fcc8824 100644 --- a/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "Generic ASA @Qidi Q1 Pro 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic ASA", + "inherits": "Generic ASA @Qidi", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.4 nozzle.json index 2686b3a8b..9cfcdd648 100644 --- a/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.4 nozzle.json @@ -5,7 +5,7 @@ "name": "Generic ASA @Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic ASA", + "inherits": "Generic ASA @Qidi", "fan_cooling_layer_time": [ "40" ], diff --git a/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.6 nozzle.json index ca5917702..21c1ab40e 100644 --- a/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.6 nozzle.json @@ -5,7 +5,7 @@ "name": "Generic ASA @Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic ASA", + "inherits": "Generic ASA @Qidi", "activate_chamber_temp_control": [ "0" ], diff --git a/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.8 nozzle.json index 0e85731f7..3945c86d9 100644 --- a/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi Q1 Pro 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "Generic ASA @Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic ASA", + "inherits": "Generic ASA @Qidi", "activate_chamber_temp_control": [ "0" ], diff --git a/resources/profiles/Qidi/filament/Generic ASA.json b/resources/profiles/Qidi/filament/Generic ASA @Qidi.json similarity index 97% rename from resources/profiles/Qidi/filament/Generic ASA.json rename to resources/profiles/Qidi/filament/Generic ASA @Qidi.json index d61246d0a..ba911e554 100644 --- a/resources/profiles/Qidi/filament/Generic ASA.json +++ b/resources/profiles/Qidi/filament/Generic ASA @Qidi.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFB98", "setting_id": "GFSB98_Qidi_01", - "name": "Generic ASA", + "name": "Generic ASA @Qidi", "from": "system", "instantiation": "true", "inherits": "fdm_filament_asa", diff --git a/resources/profiles/Qidi/filament/Generic PETG @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi 0.2 nozzle.json index e14cea583..4990b2ab6 100644 --- a/resources/profiles/Qidi/filament/Generic PETG @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "Generic PETG @Qidi 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic PETG", + "inherits": "Generic PETG @Qidi", "slow_down_min_speed": [ "10" ], diff --git a/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.2 nozzle.json index 890b94cfa..b40b68cc8 100644 --- a/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "Generic PETG @Qidi Q1 Pro 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic PETG", + "inherits": "Generic PETG @Qidi", "filament_max_volumetric_speed": [ "1" ], diff --git a/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.4 nozzle.json index e8839183e..df5b5d663 100644 --- a/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.4 nozzle.json @@ -5,7 +5,7 @@ "name": "Generic PETG @Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic PETG", + "inherits": "Generic PETG @Qidi", "hot_plate_temp_initial_layer": [ "80" ], diff --git a/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.6 nozzle.json index 43928c8f0..f35b769e6 100644 --- a/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.6 nozzle.json @@ -5,7 +5,7 @@ "name": "Generic PETG @Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic PETG", + "inherits": "Generic PETG @Qidi", "compatible_printers": [ "Qidi Q1 Pro 0.6 nozzle" ] diff --git a/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.8 nozzle.json index 741035916..8147b7e9a 100644 --- a/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi Q1 Pro 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "Generic PETG @Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic PETG", + "inherits": "Generic PETG @Qidi", "compatible_printers": [ "Qidi Q1 Pro 0.8 nozzle" ] diff --git a/resources/profiles/Qidi/filament/Generic PETG.json b/resources/profiles/Qidi/filament/Generic PETG @Qidi.json similarity index 97% rename from resources/profiles/Qidi/filament/Generic PETG.json rename to resources/profiles/Qidi/filament/Generic PETG @Qidi.json index a35283c64..617d3e105 100644 --- a/resources/profiles/Qidi/filament/Generic PETG.json +++ b/resources/profiles/Qidi/filament/Generic PETG @Qidi.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFG99", "setting_id": "GFSG99_Qidi_00", - "name": "Generic PETG", + "name": "Generic PETG @Qidi", "from": "system", "instantiation": "true", "inherits": "fdm_filament_pet", diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi 0.2 nozzle.json index 073516bae..4a6287619 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "Generic PLA @Qidi 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic PLA", + "inherits": "Generic PLA @Qidi", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.2 nozzle.json index a70647842..1b23a4753 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "Generic PLA @Qidi Q1 Pro 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic PLA", + "inherits": "Generic PLA @Qidi", "pressure_advance": [ "0.042" ], diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.4 nozzle.json index 32690ef91..2e8a082aa 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.4 nozzle.json @@ -5,7 +5,7 @@ "name": "Generic PLA @Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic PLA", + "inherits": "Generic PLA @Qidi", "full_fan_speed_layer": [ "0" ], diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.6 nozzle.json index 9ac62a68b..1e1bbc634 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.6 nozzle.json @@ -5,7 +5,7 @@ "name": "Generic PLA @Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic PLA", + "inherits": "Generic PLA @Qidi", "pressure_advance": [ "0.016" ], diff --git a/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.8 nozzle.json index f647a2a60..c9feb119b 100644 --- a/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi Q1 Pro 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "Generic PLA @Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "Generic PLA", + "inherits": "Generic PLA @Qidi", "pressure_advance": [ "0.008" ], diff --git a/resources/profiles/Qidi/filament/Generic PLA.json b/resources/profiles/Qidi/filament/Generic PLA @Qidi.json similarity index 97% rename from resources/profiles/Qidi/filament/Generic PLA.json rename to resources/profiles/Qidi/filament/Generic PLA @Qidi.json index ade8cf0f6..b32a2a27d 100644 --- a/resources/profiles/Qidi/filament/Generic PLA.json +++ b/resources/profiles/Qidi/filament/Generic PLA @Qidi.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFL99", "setting_id": "GFSL99_Qidi_00", - "name": "Generic PLA", + "name": "Generic PLA @Qidi", "from": "system", "instantiation": "true", "inherits": "fdm_filament_pla", diff --git a/resources/profiles/Qidi/filament/Generic TPU @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Generic TPU @Qidi Q1 Pro 0.4 nozzle.json index f0e7190d4..3cba06ec1 100644 --- a/resources/profiles/Qidi/filament/Generic TPU @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Generic TPU @Qidi Q1 Pro 0.4 nozzle.json @@ -5,6 +5,7 @@ "name": "Generic TPU @Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", + "inherits": "Generic TPU @Qidi", "fan_cooling_layer_time": [ "60" ], diff --git a/resources/profiles/Qidi/filament/Generic TPU.json b/resources/profiles/Qidi/filament/Generic TPU @Qidi.json similarity index 97% rename from resources/profiles/Qidi/filament/Generic TPU.json rename to resources/profiles/Qidi/filament/Generic TPU @Qidi.json index 3c181fdec..f000d152b 100644 --- a/resources/profiles/Qidi/filament/Generic TPU.json +++ b/resources/profiles/Qidi/filament/Generic TPU @Qidi.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFU99", "setting_id": "GFSU99_Qidi_00", - "name": "Generic TPU", + "name": "Generic TPU @Qidi", "from": "system", "instantiation": "true", "inherits": "fdm_filament_tpu", diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi 0.2 nozzle.json index 9cfa1994b..db54830e8 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ABS Odorless @Qidi 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS Odorless", + "inherits": "QIDI ABS Odorless @Qidi", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi 0.8 nozzle.json index 4c2e5f7a3..f1fd1ac7f 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ABS Odorless @Qidi 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS Odorless", + "inherits": "QIDI ABS Odorless @Qidi", "nozzle_temperature": [ "270" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle.json index ed130bf7d..0ba947c85 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ABS Odorless @Qidi Q1 Pro 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS Odorless", + "inherits": "QIDI ABS Odorless @Qidi", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle.json index 79962ed67..9dc6874c0 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ABS Odorless @Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS Odorless", + "inherits": "QIDI ABS Odorless @Qidi", "filament_max_volumetric_speed": [ "24.5" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle.json index ee7830b46..90c1abe80 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ABS Odorless @Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS Odorless", + "inherits": "QIDI ABS Odorless @Qidi", "filament_max_volumetric_speed": [ "24.5" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle.json index b7a41e700..b6a0a6c66 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ABS Odorless @Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS Odorless", + "inherits": "QIDI ABS Odorless @Qidi", "filament_max_volumetric_speed": [ "24.5" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS Odorless.json b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi.json similarity index 96% rename from resources/profiles/Qidi/filament/QIDI ABS Odorless.json rename to resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi.json index f9705aa01..ce3cbd143 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Odorless.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Odorless @Qidi.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFB00", "setting_id": "GFSB00_Qidi_07", - "name": "QIDI ABS Odorless", + "name": "QIDI ABS Odorless @Qidi", "from": "system", "instantiation": "true", "inherits": "fdm_filament_abs", diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi 0.2 nozzle.json index 2d81c68f7..c84d4ad66 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ABS Rapido @Qidi 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS Rapido", + "inherits": "QIDI ABS Rapido @Qidi", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi 0.8 nozzle.json index 6ac02f50c..86550c626 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ABS Rapido @Qidi 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS Rapido", + "inherits": "QIDI ABS Rapido @Qidi", "nozzle_temperature": [ "270" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle.json index 4fb422abe..7ee73af27 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ABS Rapido @Qidi Q1 Pro 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS Rapido", + "inherits": "QIDI ABS Rapido @Qidi", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle.json index 66fc7c997..9086b4658 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ABS Rapido @Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS Rapido", + "inherits": "QIDI ABS Rapido @Qidi", "activate_chamber_temp_control": [ "0" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle.json index 680f5d3a0..cc61f266e 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ABS Rapido @Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS Rapido", + "inherits": "QIDI ABS Rapido @Qidi", "filament_max_volumetric_speed": [ "24.5" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle.json index 29b84c0c4..e447ff345 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ABS Rapido @Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS Rapido", + "inherits": "QIDI ABS Rapido @Qidi", "filament_max_volumetric_speed": [ "24.5" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS Rapido.json b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi.json similarity index 96% rename from resources/profiles/Qidi/filament/QIDI ABS Rapido.json rename to resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi.json index 2e666a937..49c81f07b 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS Rapido.json +++ b/resources/profiles/Qidi/filament/QIDI ABS Rapido @Qidi.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFB00", "setting_id": "GFSB00_Qidi_00", - "name": "QIDI ABS Rapido", + "name": "QIDI ABS Rapido @Qidi", "from": "system", "instantiation": "true", "inherits": "fdm_filament_abs", diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle.json index 6d473c155..dbd6092ba 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ABS-GF @Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS-GF", + "inherits": "QIDI ABS-GF @Qidi", "filament_max_volumetric_speed": [ "22" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle.json index a78b9f02c..98f23b01b 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ABS-GF @Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS-GF", + "inherits": "QIDI ABS-GF @Qidi", "filament_max_volumetric_speed": [ "22" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle.json index 60931bf78..ccb08d81f 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ABS-GF @Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS-GF", + "inherits": "QIDI ABS-GF @Qidi", "filament_max_volumetric_speed": [ "22" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF.json b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi.json similarity index 97% rename from resources/profiles/Qidi/filament/QIDI ABS-GF.json rename to resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi.json index 4e1069755..914554c30 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF @Qidi.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFB00", "setting_id": "GFSB00_Qidi_14", - "name": "QIDI ABS-GF", + "name": "QIDI ABS-GF @Qidi", "from": "system", "instantiation": "true", "inherits": "fdm_filament_abs", diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle.json index 7f1b28efe..1f6d69bdd 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ABS-GF10 @Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS-GF10", + "inherits": "QIDI ABS-GF10 @Qidi", "filament_max_volumetric_speed": [ "22" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle.json index b7ad11dbe..597c33fd6 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ABS-GF10 @Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS-GF10", + "inherits": "QIDI ABS-GF10 @Qidi", "filament_max_volumetric_speed": [ "22" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json index 6feb5ab67..be6fca4f8 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ABS-GF10 @Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS-GF10", + "inherits": "QIDI ABS-GF10 @Qidi", "filament_max_volumetric_speed": [ "22" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF10.json b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi.json similarity index 97% rename from resources/profiles/Qidi/filament/QIDI ABS-GF10.json rename to resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi.json index efacafaba..b132f7356 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF10.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF10 @Qidi.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFB00", "setting_id": "GFSB00_Qidi_18", - "name": "QIDI ABS-GF10", + "name": "QIDI ABS-GF10 @Qidi", "from": "system", "instantiation": "true", "inherits": "fdm_filament_abs", 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 5afbd20fb..3e6c49d62 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 @@ -5,7 +5,7 @@ "name": "QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS-GF25", + "inherits": "QIDI ABS-GF25 @Qidi", "filament_max_volumetric_speed": [ "22" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json index 08985b66c..c6a6f3850 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS-GF25", + "inherits": "QIDI ABS-GF25 @Qidi", "filament_max_volumetric_speed": [ "22" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json index d71eb43c9..2e9fb3571 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ABS-GF25", + "inherits": "QIDI ABS-GF25 @Qidi", "filament_max_volumetric_speed": [ "22" ], diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi.json similarity index 97% rename from resources/profiles/Qidi/filament/QIDI ABS-GF25.json rename to resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi.json index 7dcdc8fac..3b80d375c 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFB00", "setting_id": "GFSB00_Qidi_22", - "name": "QIDI ABS-GF25", + "name": "QIDI ABS-GF25 @Qidi", "from": "system", "instantiation": "true", "inherits": "fdm_filament_abs", diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi 0.2 nozzle.json index 0fea65904..66fd97f87 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ASA @Qidi 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ASA", + "inherits": "QIDI ASA @Qidi", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.2 nozzle.json index 5a895791c..146460e98 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ASA @Qidi Q1 Pro 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ASA", + "inherits": "QIDI ASA @Qidi", "filament_max_volumetric_speed": [ "2" ], diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json index 4b8a21119..61d203c63 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.4 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ASA @Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ASA", + "inherits": "QIDI ASA @Qidi", "chamber_temperature": [ "55" ], diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.6 nozzle.json index 627bac2b5..9708a2f2e 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.6 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ASA @Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ASA", + "inherits": "QIDI ASA @Qidi", "fan_cooling_layer_time": [ "40" ], diff --git a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.8 nozzle.json index c8a34d13b..109f22448 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi Q1 Pro 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ASA @Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ASA", + "inherits": "QIDI ASA @Qidi", "fan_cooling_layer_time": [ "40" ], diff --git a/resources/profiles/Qidi/filament/QIDI ASA.json b/resources/profiles/Qidi/filament/QIDI ASA @Qidi.json similarity index 98% rename from resources/profiles/Qidi/filament/QIDI ASA.json rename to resources/profiles/Qidi/filament/QIDI ASA @Qidi.json index 7af3af5cd..bec9e38d9 100644 --- a/resources/profiles/Qidi/filament/QIDI ASA.json +++ b/resources/profiles/Qidi/filament/QIDI ASA @Qidi.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFB01", "setting_id": "GFSB01_Qidi_00", - "name": "QIDI ASA", + "name": "QIDI ASA @Qidi", "from": "system", "instantiation": "true", "inherits": "fdm_filament_asa", diff --git a/resources/profiles/Qidi/filament/Qidi ASA-Aero.json b/resources/profiles/Qidi/filament/QIDI ASA-Aero @Qidi.json similarity index 97% rename from resources/profiles/Qidi/filament/Qidi ASA-Aero.json rename to resources/profiles/Qidi/filament/QIDI ASA-Aero @Qidi.json index d4523b1b2..30b02a2b3 100644 --- a/resources/profiles/Qidi/filament/Qidi ASA-Aero.json +++ b/resources/profiles/Qidi/filament/QIDI ASA-Aero @Qidi.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFB01", "setting_id": "GFSB01_Qidi_06", - "name": "QIDI ASA-Aero", + "name": "QIDI ASA-Aero @Qidi", "from": "system", "instantiation": "true", "inherits": "fdm_filament_asa", diff --git a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle.json index 3c5df6bff..6063c8a6c 100644 --- a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PA-Ultra @Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PA-Ultra", + "inherits": "QIDI PA-Ultra @Qidi", "filament_max_volumetric_speed": [ "4" ], diff --git a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle.json index 8577ebf1c..679913bb1 100644 --- a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PA-Ultra @Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PA-Ultra", + "inherits": "QIDI PA-Ultra @Qidi", "filament_max_volumetric_speed": [ "4" ], diff --git a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json index b609ed70c..e4ce33804 100644 --- a/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PA-Ultra @Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PA-Ultra", + "inherits": "QIDI PA-Ultra @Qidi", "filament_max_volumetric_speed": [ "4" ], diff --git a/resources/profiles/Qidi/filament/QIDI PA-Ultra.json b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi.json similarity index 97% rename from resources/profiles/Qidi/filament/QIDI PA-Ultra.json rename to resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi.json index d1af9814b..35922d8e9 100644 --- a/resources/profiles/Qidi/filament/QIDI PA-Ultra.json +++ b/resources/profiles/Qidi/filament/QIDI PA-Ultra @Qidi.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFN04", "setting_id": "GFSN04_Qidi_04", - "name": "QIDI PA-Ultra", + "name": "QIDI PA-Ultra @Qidi", "from": "system", "instantiation": "true", "inherits": "fdm_filament_pa", diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle.json index 6f71e7b3c..7e0057857 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PAHT-CF @Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PAHT-CF", + "inherits": "QIDI PAHT-CF @Qidi", "fan_cooling_layer_time": [ "10" ], diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle.json index 67573f18e..9bb457896 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PAHT-CF @Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PAHT-CF", + "inherits": "QIDI PAHT-CF @Qidi", "fan_cooling_layer_time": [ "10" ], diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle.json index ba0c5d387..a0c27db03 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PAHT-CF @Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PAHT-CF", + "inherits": "QIDI PAHT-CF @Qidi", "fan_cooling_layer_time": [ "10" ], diff --git a/resources/profiles/Qidi/filament/QIDI PAHT-CF.json b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi.json similarity index 97% rename from resources/profiles/Qidi/filament/QIDI PAHT-CF.json rename to resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi.json index 2670f0c18..55d432b88 100644 --- a/resources/profiles/Qidi/filament/QIDI PAHT-CF.json +++ b/resources/profiles/Qidi/filament/QIDI PAHT-CF @Qidi.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFN04", "setting_id": "GFSN04_Qidi_00", - "name": "QIDI PAHT-CF", + "name": "QIDI PAHT-CF @Qidi", "from": "system", "instantiation": "true", "inherits": "fdm_filament_pa", diff --git a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle.json index f376bbc05..6e2764077 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PET-CF @Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PET-CF", + "inherits": "QIDI PET-CF @Qidi", "fan_cooling_layer_time": [ "10" ], diff --git a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle.json index 5df9d565c..03fcb21a9 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PET-CF @Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PET-CF", + "inherits": "QIDI PET-CF @Qidi", "fan_cooling_layer_time": [ "10" ], diff --git a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle.json index 69e8d7df4..5aa45ddf9 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PET-CF @Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PET-CF", + "inherits": "QIDI PET-CF @Qidi", "fan_cooling_layer_time": [ "10" ], diff --git a/resources/profiles/Qidi/filament/QIDI PET-CF.json b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi.json similarity index 98% rename from resources/profiles/Qidi/filament/QIDI PET-CF.json rename to resources/profiles/Qidi/filament/QIDI PET-CF @Qidi.json index 7e105c897..c86ab4196 100644 --- a/resources/profiles/Qidi/filament/QIDI PET-CF.json +++ b/resources/profiles/Qidi/filament/QIDI PET-CF @Qidi.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFT01", "setting_id": "GFST01_Qidi_00", - "name": "QIDI PET-CF", + "name": "QIDI PET-CF @Qidi", "from": "system", "instantiation": "true", "inherits": "fdm_filament_pet", diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle.json index e045e8be7..567b6a061 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PETG Tough @Qidi Q1 Pro 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PETG Tough", + "inherits": "QIDI PETG Tough @Qidi", "filament_max_volumetric_speed": [ "1" ], diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle.json index c3931c272..37818a9de 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PETG Tough @Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PETG Tough", + "inherits": "QIDI PETG Tough @Qidi", "filament_max_volumetric_speed": [ "13" ], diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle.json index b3ee6c281..61259f45b 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PETG Tough @Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PETG Tough", + "inherits": "QIDI PETG Tough @Qidi", "filament_max_volumetric_speed": [ "13" ], diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle.json index 7e26e5a16..7cd25c2ea 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PETG Tough @Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PETG Tough", + "inherits": "QIDI PETG Tough @Qidi", "filament_max_volumetric_speed": [ "13" ], diff --git a/resources/profiles/Qidi/filament/QIDI PETG Tough.json b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi.json similarity index 97% rename from resources/profiles/Qidi/filament/QIDI PETG Tough.json rename to resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi.json index 5e6e02a12..e3f6335ad 100644 --- a/resources/profiles/Qidi/filament/QIDI PETG Tough.json +++ b/resources/profiles/Qidi/filament/QIDI PETG Tough @Qidi.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFT01", "setting_id": "GFST01_Qidi_04", - "name": "QIDI PETG Tough", + "name": "QIDI PETG Tough @Qidi", "from": "system", "instantiation": "true", "inherits": "fdm_filament_pet", diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json index 96b4eb738..6ac6df0a2 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PLA Rapido @Qidi Q1 Pro 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PLA Rapido", + "inherits": "QIDI PLA Rapido @Qidi", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json index 825fc4b52..3c3b18e98 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PLA Rapido @Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PLA Rapido", + "inherits": "QIDI PLA Rapido @Qidi", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle.json index 700ca5437..a56f76220 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PLA Rapido @Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PLA Rapido", + "inherits": "QIDI PLA Rapido @Qidi", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle.json index e74865480..10eb0385d 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PLA Rapido @Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PLA Rapido", + "inherits": "QIDI PLA Rapido @Qidi", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi.json similarity index 94% rename from resources/profiles/Qidi/filament/QIDI PLA Rapido.json rename to resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi.json index 3526cef8b..4d7e65113 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido @Qidi.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFA00", "setting_id": "GFSA00_Qidi_00", - "name": "QIDI PLA Rapido", + "name": "QIDI PLA Rapido @Qidi", "from": "system", "instantiation": "true", "inherits": "fdm_filament_pla", diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle.json index 14cc62ebb..32884b438 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PLA Rapido Matte @Qidi Q1 Pro 0.2 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PLA Rapido Matte", + "inherits": "QIDI PLA Rapido Matte @Qidi", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle.json index 13ad4bad3..a130d1339 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PLA Rapido Matte @Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PLA Rapido Matte", + "inherits": "QIDI PLA Rapido Matte @Qidi", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle.json index b7bf756b6..b33c38657 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PLA Rapido Matte @Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PLA Rapido Matte", + "inherits": "QIDI PLA Rapido Matte @Qidi", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle.json index 78a777f7b..35e8254b9 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PLA Rapido Matte @Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PLA Rapido Matte", + "inherits": "QIDI PLA Rapido Matte @Qidi", "activate_air_filtration": [ "1" ], diff --git a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte.json b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi.json similarity index 94% rename from resources/profiles/Qidi/filament/QIDI PLA Rapido Matte.json rename to resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi.json index 20d2e1739..af6850044 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte.json +++ b/resources/profiles/Qidi/filament/QIDI PLA Rapido Matte @Qidi.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFA00", "setting_id": "GFSA00_Qidi_05", - "name": "QIDI PLA Rapido Matte", + "name": "QIDI PLA Rapido Matte @Qidi", "from": "system", "instantiation": "true", "inherits": "fdm_filament_pla", diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi 0.6 nozzle.json index ce10301d2..77d3436a0 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi 0.6 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PLA-CF @Qidi 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PLA-CF", + "inherits": "QIDI PLA-CF @Qidi", "pressure_advance": [ "0.01" ], diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi 0.8 nozzle.json index feaff8631..0111cf8b2 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PLA-CF @Qidi 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PLA-CF", + "inherits": "QIDI PLA-CF @Qidi", "pressure_advance": [ "0.008" ], diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json index 10bc3548b..112cb6b8f 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PLA-CF @Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PLA-CF", + "inherits": "QIDI PLA-CF @Qidi", "extrusion_multiplier": [ "0.93" ], diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json index e811867d5..b89513789 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PLA-CF @Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PLA-CF", + "inherits": "QIDI PLA-CF @Qidi", "extrusion_multiplier": [ "0.93" ], diff --git a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json index 5da48ca93..bcae5ff8d 100644 --- a/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI PLA-CF @Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI PLA-CF", + "inherits": "QIDI PLA-CF @Qidi", "extrusion_multiplier": [ "0.93" ], diff --git a/resources/profiles/Qidi/filament/Qidi PLA-CF.json b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi.json similarity index 95% rename from resources/profiles/Qidi/filament/Qidi PLA-CF.json rename to resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi.json index ebc781185..29da84718 100644 --- a/resources/profiles/Qidi/filament/Qidi PLA-CF.json +++ b/resources/profiles/Qidi/filament/QIDI PLA-CF @Qidi.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFA00", "setting_id": "GFSA00_Qidi_10", - "name": "QIDI PLA-CF", + "name": "QIDI PLA-CF @Qidi", "from": "system", "instantiation": "true", "inherits": "fdm_filament_pla", diff --git a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF.json b/resources/profiles/Qidi/filament/QIDI TPU 95A-HF @Qidi.json similarity index 96% rename from resources/profiles/Qidi/filament/Qidi TPU 95A-HF.json rename to resources/profiles/Qidi/filament/QIDI TPU 95A-HF @Qidi.json index e64c92ad3..f9a067ed9 100644 --- a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF.json +++ b/resources/profiles/Qidi/filament/QIDI TPU 95A-HF @Qidi.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFU00", "setting_id": "GFSU00_Qidi_00", - "name": "QIDI TPU 95A-HF", + "name": "QIDI TPU 95A-HF @Qidi", "from": "system", "instantiation": "true", "inherits": "fdm_filament_tpu", diff --git a/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json index 543326797..9a910ab1f 100644 --- a/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi ASA-Aero @Qidi Q1 Pro 0.4 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI ASA-Aero @Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI ASA-Aero", + "inherits": "QIDI ASA-Aero @Qidi", "fan_cooling_layer_time": [ "40" ], diff --git a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle.json index 7626a602c..8c78605c6 100644 --- a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI TPU 95A-HF @Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI TPU 95A-HF", + "inherits": "QIDI TPU 95A-HF @Qidi", "fan_cooling_layer_time": [ "60" ], diff --git a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle.json index 08260a6f0..fdde3a471 100644 --- a/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/Qidi TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle.json @@ -5,7 +5,7 @@ "name": "QIDI TPU 95A-HF @Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", - "inherits": "QIDI TPU 95A-HF", + "inherits": "QIDI TPU 95A-HF @Qidi", "fan_cooling_layer_time": [ "60" ], diff --git a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.2 nozzle.json b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.2 nozzle.json index c53a6175e..c90a385ab 100644 --- a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.2 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_Qidi_001", + "setting_id": "GM_Qidi_007", "name": "Qidi Q1 Pro 0.2 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json index ac4679d9d..eaf316750 100644 --- a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_Qidi_002", + "setting_id": "GM_Qidi_008", "name": "Qidi Q1 Pro 0.4 nozzle", "from": "system", "instantiation": "true", @@ -62,7 +62,7 @@ ], "layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nLOG_Z\nG92 E0\n", "machine_end_gcode": "M141 S0\nM104 S0\nM140 S0\nG1 E-3 F1800\nG0 Z{min(max_print_height, max_layer_z + 3)} F600\nG0 X0 Y0 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}", - "machine_start_gcode": "PRINT_START BED=[first_layer_bed_temperature] HOTEND=[first_layer_temperature] CHAMBER=[chamber_temperature]\nM83\nM140 S[first_layer_bed_temperature]\nM104 S[first_layer_temperature]\nG4 P3000\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 3} Z0\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 6}\nG1 Z1 F600", + "machine_start_gcode": "PRINT_START BED=[hot_plate_temp_initial_layer] HOTEND=[nozzle_temperature_initial_layer] CHAMBER=[chamber_temperatures]\nM83\nM140 S[hot_plate_temp_initial_layer]\nM104 S[nozzle_temperature_initial_layer]\nG4 P3000\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 3} Z0\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 6}\nG1 Z1 F600", "thumbnails_format": "PNG", "default_filament_profile": [ "Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.6 nozzle.json index 497a1b130..9ef265e6c 100644 --- a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.6 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_Qidi_003", + "setting_id": "GM_Qidi_009", "name": "Qidi Q1 Pro 0.6 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.8 nozzle.json index 6e575e9d5..cb632d5cc 100644 --- a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.8 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_Qidi_004", + "setting_id": "GM_Qidi_010", "name": "Qidi Q1 Pro 0.8 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json index 9b1e5a234..a3b80dca0 100644 --- a/resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_Qidi_005", + "setting_id": "GM_Qidi_001", "name": "Qidi X-CF Pro 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json index b4a763313..8dfd703ef 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_Qidi_006", + "setting_id": "GM_Qidi_002", "name": "Qidi X-Max 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.2 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.2 nozzle.json index 331ae3e91..dcb9066dd 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.2 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_Qidi_007", + "setting_id": "GM_Qidi_011", "name": "Qidi X-Max 3 0.2 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json index 9baf1e623..a03cee665 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_Qidi_008", + "setting_id": "GM_Qidi_003", "name": "Qidi X-Max 3 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.6 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.6 nozzle.json index 5f0c7a49b..5f34cf652 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.6 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_Qidi_009", + "setting_id": "GM_Qidi_012", "name": "Qidi X-Max 3 0.6 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.8 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.8 nozzle.json index a952fc878..0daffab7f 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Max 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Max 3 0.8 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_Qidi_010", + "setting_id": "GM_Qidi_013", "name": "Qidi X-Max 3 0.8 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json index d8d00e020..aa149e036 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_Qidi_011", + "setting_id": "GM_Qidi_004", "name": "Qidi X-Plus 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.2 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.2 nozzle.json index 5eb3baeb9..db6421a6d 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.2 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_Qidi_012", + "setting_id": "GM_Qidi_014", "name": "Qidi X-Plus 3 0.2 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json index d9e955b11..fdf66e309 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_Qidi_013", + "setting_id": "GM_Qidi_005", "name": "Qidi X-Plus 3 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.6 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.6 nozzle.json index 0ca62c430..76ea4b35d 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.6 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.6 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_Qidi_014", + "setting_id": "GM_Qidi_015", "name": "Qidi X-Plus 3 0.6 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.8 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.8 nozzle.json index 1ea338903..a603637d4 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.8 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Plus 3 0.8 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_Qidi_015", + "setting_id": "GM_Qidi_016", "name": "Qidi X-Plus 3 0.8 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.2 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.2 nozzle.json index 80271a113..30afe5c9b 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.2 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.2 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_Qidi_016", + "setting_id": "GM_Qidi_017", "name": "Qidi X-Smart 3 0.2 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json index 44636a761..d116c5ac5 100644 --- a/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json @@ -1,6 +1,6 @@ { "type": "machine", - "setting_id": "GM_Qidi_017", + "setting_id": "GM_Qidi_006", "name": "Qidi X-Smart 3 0.4 nozzle", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Qidi/machine/fdm_qidi_x3_common.json b/resources/profiles/Qidi/machine/fdm_qidi_x3_common.json index 7f711314e..4383b8a56 100644 --- a/resources/profiles/Qidi/machine/fdm_qidi_x3_common.json +++ b/resources/profiles/Qidi/machine/fdm_qidi_x3_common.json @@ -23,7 +23,7 @@ "210x210" ], "thumbnails_format": "ColPic", - "machine_start_gcode": "PRINT_START\nG28\nM141 S0\nG0 Z50 F600\nM190 S[first_layer_bed_temperature]\nG28 Z\nG29; mesh bed leveling ,comment this code to close it\nG0 X0 Y0 Z50 F6000\nM109 S[first_layer_temperature]\nM106 P3 S255\nM83\nG4 P3000\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 12} E{-10 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 E{10 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\n", + "machine_start_gcode": "PRINT_START\nG28\nM141 S0\nG0 Z50 F600\nM190 S[hot_plate_temp_initial_layer]\nG28 Z\nG29; mesh bed leveling ,comment this code to close it\nG0 X0 Y0 Z50 F6000\nM109 S[nozzle_temperature_initial_layer]\nM106 P3 S255\nM83\nG4 P3000\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 12} E{-10 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 E{10 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\n", "machine_end_gcode": "M141 S0\nM104 S0\nM140 S0\nG1 E-3 F1800\nG0 Z{min(max_print_height, max_layer_z + 3)} F600\nG0 X0 Y0 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}", "scan_first_layer": "0" }