diff --git a/resources/profiles/Z-Bolt.json b/resources/profiles/Z-Bolt.json index 75292a6d8d..b49dd51fed 100644 --- a/resources/profiles/Z-Bolt.json +++ b/resources/profiles/Z-Bolt.json @@ -1,7 +1,7 @@ { "name": "Z-Bolt", "url": "", - "version": "02.03.02.70", + "version": "02.03.02.71", "force_update": "0", "description": "Z-Bolt configurations", "machine_model_list": [ @@ -210,8 +210,8 @@ ], "filament_list": [ { - "name": "Generic ABS @Z-Bolt", - "sub_path": "filament/Generic ABS @Z-Bolt.json" + "name": "Generic ABS @Z-Bolt Base", + "sub_path": "filament/Generic ABS @Z-Bolt Base.json" }, { "name": "Generic ABS @Z-Bolt 0.4 nozzle", @@ -226,8 +226,8 @@ "sub_path": "filament/Generic ABS @Z-Bolt 0.8 nozzle.json" }, { - "name": "Generic PA @Z-Bolt", - "sub_path": "filament/Generic PA @Z-Bolt.json" + "name": "Generic PA @Z-Bolt Base", + "sub_path": "filament/Generic PA @Z-Bolt Base.json" }, { "name": "Generic PA @Z-Bolt 0.4 nozzle", @@ -242,8 +242,8 @@ "sub_path": "filament/Generic PA @Z-Bolt 0.8 nozzle.json" }, { - "name": "Generic PETG @Z-Bolt", - "sub_path": "filament/Generic PETG @Z-Bolt.json" + "name": "Generic PETG @Z-Bolt Base", + "sub_path": "filament/Generic PETG @Z-Bolt Base.json" }, { "name": "Generic PETG @Z-Bolt 0.4 nozzle", @@ -258,8 +258,8 @@ "sub_path": "filament/Generic PETG @Z-Bolt 0.8 nozzle.json" }, { - "name": "Generic PLA @Z-Bolt", - "sub_path": "filament/Generic PLA @Z-Bolt.json" + "name": "Generic PLA @Z-Bolt Base", + "sub_path": "filament/Generic PLA @Z-Bolt Base.json" }, { "name": "Generic PLA @Z-Bolt 0.4 nozzle", @@ -274,8 +274,8 @@ "sub_path": "filament/Generic PLA @Z-Bolt 0.8 nozzle.json" }, { - "name": "Generic ABS HT @Z-Bolt", - "sub_path": "filament/Generic ABS HT @Z-Bolt.json" + "name": "Generic ABS HT @Z-Bolt Base", + "sub_path": "filament/Generic ABS HT @Z-Bolt Base.json" }, { "name": "Generic ABS HT @Z-Bolt 0.4 nozzle", diff --git a/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.4 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.4 nozzle.json index 1a10442b46..b664f07ab2 100644 --- a/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.4 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS @Z-Bolt 0.4 nozzle", - "inherits": "Generic ABS @Z-Bolt", - "renamed_from": "Z-Bolt ABS @0.4 nozzle", + "inherits": "Generic ABS @Z-Bolt Base", + "renamed_from": "Z-Bolt ABS;Generic ABS @Z-Bolt;Z-Bolt ABS @0.4 nozzle", "from": "system", "setting_id": "GFSL204", "filament_id": "GFL204", diff --git a/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.6 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.6 nozzle.json index ddf8081c5d..6c4ee60de0 100644 --- a/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.6 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic ABS @Z-Bolt 0.6 nozzle", - "inherits": "Generic ABS @Z-Bolt", + "inherits": "Generic ABS @Z-Bolt Base", "renamed_from": "Z-Bolt ABS @0.6 nozzle", "from": "system", "setting_id": "GFSL206", diff --git a/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.8 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.8 nozzle.json index 38c532502e..586c520060 100644 --- a/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt 0.8 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic ABS @Z-Bolt 0.8 nozzle", - "inherits": "Generic ABS @Z-Bolt", + "inherits": "Generic ABS @Z-Bolt Base", "renamed_from": "Z-Bolt ABS @0.8 nozzle", "from": "system", "setting_id": "GFSL208", diff --git a/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt Base.json b/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt Base.json new file mode 100644 index 0000000000..6b2c8e89f9 --- /dev/null +++ b/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt Base.json @@ -0,0 +1,34 @@ +{ + "type": "filament", + "name": "Generic ABS @Z-Bolt Base", + "inherits": "fdm_filament_abs", + "renamed_from": "Z-Bolt ABS;Generic ABS @Z-Bolt", + "from": "system", + "setting_id": "GFSL200", + "filament_id": "GFL200", + "instantiation": "false", + "filament_max_volumetric_speed": [ + "20" + ], + "fan_min_speed": [ + "25" + ], + "hot_plate_temp": [ + "110" + ], + "hot_plate_temp_initial_layer": [ + "110" + ], + "nozzle_temperature": [ + "260" + ], + "nozzle_temperature_initial_layer": [ + "260" + ], + "textured_plate_temp": [ + "110" + ], + "textured_plate_temp_initial_layer": [ + "110" + ] +} diff --git a/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt.json b/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt.json deleted file mode 100644 index f656e2416f..0000000000 --- a/resources/profiles/Z-Bolt/filament/Generic ABS @Z-Bolt.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "type": "filament", - "name": "Generic ABS @Z-Bolt", - "inherits": "fdm_filament_abs", - "renamed_from": "Z-Bolt ABS", - "from": "system", - "setting_id": "GFSL200", - "filament_id": "GFL200", - "instantiation": "true", - "compatible_printers": [ - "Z-Bolt S300 0.4 nozzle", - "Z-Bolt S300 Dual 0.4 nozzle", - "Z-Bolt S400 0.4 nozzle", - "Z-Bolt S400 Dual 0.4 nozzle", - "Z-Bolt S600 0.4 nozzle", - "Z-Bolt S600 Dual 0.4 nozzle", - "Z-Bolt S800 Dual 0.4 nozzle", - "Z-Bolt S1000 0.4 nozzle", - "Z-Bolt S1000 Dual 0.4 nozzle", - "Z-Bolt S300 0.6 nozzle", - "Z-Bolt S300 Dual 0.6 nozzle", - "Z-Bolt S400 0.6 nozzle", - "Z-Bolt S400 Dual 0.6 nozzle", - "Z-Bolt S600 0.6 nozzle", - "Z-Bolt S600 Dual 0.6 nozzle", - "Z-Bolt S800 Dual 0.6 nozzle", - "Z-Bolt S1000 0.6 nozzle", - "Z-Bolt S1000 Dual 0.6 nozzle", - "Z-Bolt S300 0.8 nozzle", - "Z-Bolt S300 Dual 0.8 nozzle", - "Z-Bolt S400 0.8 nozzle", - "Z-Bolt S400 Dual 0.8 nozzle", - "Z-Bolt S600 0.8 nozzle", - "Z-Bolt S600 Dual 0.8 nozzle", - "Z-Bolt S800 Dual 0.8 nozzle", - "Z-Bolt S1000 0.8 nozzle", - "Z-Bolt S1000 Dual 0.8 nozzle" - ], - "filament_max_volumetric_speed": [ - "20" - ], - "fan_min_speed": [ - "25" - ], - "hot_plate_temp": [ - "110" - ], - "hot_plate_temp_initial_layer": [ - "110" - ], - "nozzle_temperature": [ - "260" - ], - "nozzle_temperature_initial_layer": [ - "260" - ], - "textured_plate_temp": [ - "110" - ], - "textured_plate_temp_initial_layer": [ - "110" - ] -} diff --git a/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.4 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.4 nozzle.json index cd6027fe48..bf3019b67f 100644 --- a/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.4 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic ABS HT @Z-Bolt 0.4 nozzle", - "inherits": "Generic ABS HT @Z-Bolt", - "renamed_from": "Z-Bolt ABS HT @0.4 nozzle", + "inherits": "Generic ABS HT @Z-Bolt Base", + "renamed_from": "Z-Bolt ABS HT;Generic ABS HT @Z-Bolt;Z-Bolt ABS HT @0.4 nozzle", "from": "system", "setting_id": "GFSL504", "filament_id": "GFL504", diff --git a/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.6 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.6 nozzle.json index 94e0acbdf3..588e4b37c4 100644 --- a/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.6 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic ABS HT @Z-Bolt 0.6 nozzle", - "inherits": "Generic ABS HT @Z-Bolt", + "inherits": "Generic ABS HT @Z-Bolt Base", "renamed_from": "Z-Bolt ABS HT @0.6 nozzle", "from": "system", "setting_id": "GFSL506", diff --git a/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.8 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.8 nozzle.json index dcfbec681a..94bd6ae8bb 100644 --- a/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt 0.8 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic ABS HT @Z-Bolt 0.8 nozzle", - "inherits": "Generic ABS HT @Z-Bolt", + "inherits": "Generic ABS HT @Z-Bolt Base", "renamed_from": "Z-Bolt ABS HT @0.8 nozzle", "from": "system", "setting_id": "GFSL508", diff --git a/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt Base.json b/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt Base.json new file mode 100644 index 0000000000..677046a909 --- /dev/null +++ b/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt Base.json @@ -0,0 +1,14 @@ +{ + "type": "filament", + "name": "Generic ABS HT @Z-Bolt Base", + "inherits": "Generic ABS @Z-Bolt Base", + "renamed_from": "Z-Bolt ABS HT;Generic ABS HT @Z-Bolt", + "from": "system", + "setting_id": "GFSL500", + "filament_id": "GFL500", + "instantiation": "false", + "description": "Use this filament profile to print big ABS models with chamber heating", + "chamber_temperatures": [ + "60" + ] +} diff --git a/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt.json b/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt.json deleted file mode 100644 index d4ef520919..0000000000 --- a/resources/profiles/Z-Bolt/filament/Generic ABS HT @Z-Bolt.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "type": "filament", - "name": "Generic ABS HT @Z-Bolt", - "inherits": "Generic ABS @Z-Bolt", - "renamed_from": "Z-Bolt ABS HT", - "from": "system", - "setting_id": "GFSL500", - "filament_id": "GFL500", - "instantiation": "true", - "description": "Use this filament profile to print big ABS models with chamber heating", - "chamber_temperatures": [ - "60" - ], - "compatible_printers": [ - "Z-Bolt S300 0.4 nozzle", - "Z-Bolt S300 Dual 0.4 nozzle", - "Z-Bolt S400 0.4 nozzle", - "Z-Bolt S400 Dual 0.4 nozzle", - "Z-Bolt S600 0.4 nozzle", - "Z-Bolt S600 Dual 0.4 nozzle", - "Z-Bolt S800 Dual 0.4 nozzle", - "Z-Bolt S1000 0.4 nozzle", - "Z-Bolt S1000 Dual 0.4 nozzle", - "Z-Bolt S300 0.6 nozzle", - "Z-Bolt S300 Dual 0.6 nozzle", - "Z-Bolt S400 0.6 nozzle", - "Z-Bolt S400 Dual 0.6 nozzle", - "Z-Bolt S600 0.6 nozzle", - "Z-Bolt S600 Dual 0.6 nozzle", - "Z-Bolt S800 Dual 0.6 nozzle", - "Z-Bolt S1000 0.6 nozzle", - "Z-Bolt S1000 Dual 0.6 nozzle", - "Z-Bolt S300 0.8 nozzle", - "Z-Bolt S300 Dual 0.8 nozzle", - "Z-Bolt S400 0.8 nozzle", - "Z-Bolt S400 Dual 0.8 nozzle", - "Z-Bolt S600 0.8 nozzle", - "Z-Bolt S600 Dual 0.8 nozzle", - "Z-Bolt S800 Dual 0.8 nozzle", - "Z-Bolt S1000 0.8 nozzle", - "Z-Bolt S1000 Dual 0.8 nozzle" - ] -} diff --git a/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.4 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.4 nozzle.json index c393fb2cbe..898a727533 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.4 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PA @Z-Bolt 0.4 nozzle", - "inherits": "Generic PA @Z-Bolt", - "renamed_from": "Z-Bolt PA @0.4 nozzle", + "inherits": "Generic PA @Z-Bolt Base", + "renamed_from": "Z-Bolt PA;Generic PA @Z-Bolt;Z-Bolt PA @0.4 nozzle", "from": "system", "setting_id": "GFSL404", "filament_id": "GFL404", diff --git a/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.6 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.6 nozzle.json index f65d5db2da..84da8ad404 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.6 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic PA @Z-Bolt 0.6 nozzle", - "inherits": "Generic PA @Z-Bolt", + "inherits": "Generic PA @Z-Bolt Base", "renamed_from": "Z-Bolt PA @0.6 nozzle", "from": "system", "setting_id": "GFSL406", diff --git a/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.8 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.8 nozzle.json index 301319da4c..da2b1d8da8 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt 0.8 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic PA @Z-Bolt 0.8 nozzle", - "inherits": "Generic PA @Z-Bolt", + "inherits": "Generic PA @Z-Bolt Base", "renamed_from": "Z-Bolt PA @0.8 nozzle", "from": "system", "setting_id": "GFSL408", diff --git a/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt Base.json b/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt Base.json new file mode 100644 index 0000000000..04a78f56a6 --- /dev/null +++ b/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt Base.json @@ -0,0 +1,52 @@ +{ + "type": "filament", + "name": "Generic PA @Z-Bolt Base", + "inherits": "fdm_filament_pa", + "renamed_from": "Z-Bolt PA;Generic PA @Z-Bolt", + "from": "system", + "setting_id": "GFSL400", + "filament_id": "GFL400", + "instantiation": "false", + "filament_max_volumetric_speed": [ + "8" + ], + "fan_cooling_layer_time": [ + "5" + ], + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "10" + ], + "filament_flow_ratio": [ + "0.96" + ], + "overhang_fan_speed": [ + "30" + ], + "overhang_fan_threshold": [ + "0%" + ], + "hot_plate_temp": [ + "140" + ], + "hot_plate_temp_initial_layer": [ + "140" + ], + "nozzle_temperature": [ + "270" + ], + "nozzle_temperature_initial_layer": [ + "270" + ], + "textured_plate_temp": [ + "130" + ], + "textured_plate_temp_initial_layer": [ + "140" + ], + "chamber_temperatures": [ + "80" + ] +} diff --git a/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt.json b/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt.json deleted file mode 100644 index a02fb94ef0..0000000000 --- a/resources/profiles/Z-Bolt/filament/Generic PA @Z-Bolt.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "type": "filament", - "name": "Generic PA @Z-Bolt", - "inherits": "fdm_filament_pa", - "renamed_from": "Z-Bolt PA", - "from": "system", - "setting_id": "GFSL400", - "filament_id": "GFL400", - "instantiation": "true", - "compatible_printers": [ - "Z-Bolt S300 0.4 nozzle", - "Z-Bolt S300 Dual 0.4 nozzle", - "Z-Bolt S400 0.4 nozzle", - "Z-Bolt S400 Dual 0.4 nozzle", - "Z-Bolt S600 0.4 nozzle", - "Z-Bolt S600 Dual 0.4 nozzle", - "Z-Bolt S800 Dual 0.4 nozzle", - "Z-Bolt S1000 0.4 nozzle", - "Z-Bolt S1000 Dual 0.4 nozzle", - "Z-Bolt S300 0.6 nozzle", - "Z-Bolt S300 Dual 0.6 nozzle", - "Z-Bolt S400 0.6 nozzle", - "Z-Bolt S400 Dual 0.6 nozzle", - "Z-Bolt S600 0.6 nozzle", - "Z-Bolt S600 Dual 0.6 nozzle", - "Z-Bolt S800 Dual 0.6 nozzle", - "Z-Bolt S1000 0.6 nozzle", - "Z-Bolt S1000 Dual 0.6 nozzle", - "Z-Bolt S300 0.8 nozzle", - "Z-Bolt S300 Dual 0.8 nozzle", - "Z-Bolt S400 0.8 nozzle", - "Z-Bolt S400 Dual 0.8 nozzle", - "Z-Bolt S600 0.8 nozzle", - "Z-Bolt S600 Dual 0.8 nozzle", - "Z-Bolt S800 Dual 0.8 nozzle", - "Z-Bolt S1000 0.8 nozzle", - "Z-Bolt S1000 Dual 0.8 nozzle" - ], - "filament_max_volumetric_speed": [ - "8" - ], - "fan_cooling_layer_time": [ - "5" - ], - "fan_max_speed": [ - "30" - ], - "fan_min_speed": [ - "10" - ], - "filament_flow_ratio": [ - "0.96" - ], - "overhang_fan_speed": [ - "30" - ], - "overhang_fan_threshold": [ - "0%" - ], - "hot_plate_temp": [ - "140" - ], - "hot_plate_temp_initial_layer": [ - "140" - ], - "nozzle_temperature": [ - "270" - ], - "nozzle_temperature_initial_layer": [ - "270" - ], - "textured_plate_temp": [ - "130" - ], - "textured_plate_temp_initial_layer": [ - "140" - ], - "chamber_temperatures": [ - "80" - ] -} diff --git a/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.4 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.4 nozzle.json index 6a932ad9d2..8577825333 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.4 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PETG @Z-Bolt 0.4 nozzle", - "inherits": "Generic PETG @Z-Bolt", - "renamed_from": "Z-Bolt PETG @0.4 nozzle", + "inherits": "Generic PETG @Z-Bolt Base", + "renamed_from": "Z-Bolt PETG;Generic PETG @Z-Bolt;Z-Bolt PETG @0.4 nozzle", "from": "system", "setting_id": "GFSL304", "filament_id": "GFL304", diff --git a/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.6 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.6 nozzle.json index 9c845caa69..3f46a7b70e 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.6 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic PETG @Z-Bolt 0.6 nozzle", - "inherits": "Generic PETG @Z-Bolt", + "inherits": "Generic PETG @Z-Bolt Base", "renamed_from": "Z-Bolt PETG @0.6 nozzle", "from": "system", "setting_id": "GFSL306", diff --git a/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.8 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.8 nozzle.json index d7705f50c1..9e2bd0a7f5 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt 0.8 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic PETG @Z-Bolt 0.8 nozzle", - "inherits": "Generic PETG @Z-Bolt", + "inherits": "Generic PETG @Z-Bolt Base", "renamed_from": "Z-Bolt PETG @0.8 nozzle", "from": "system", "setting_id": "GFSL308", diff --git a/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt Base.json b/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt Base.json new file mode 100644 index 0000000000..a2b16dd28a --- /dev/null +++ b/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt Base.json @@ -0,0 +1,58 @@ +{ + "type": "filament", + "name": "Generic PETG @Z-Bolt Base", + "inherits": "fdm_filament_pet", + "renamed_from": "Z-Bolt PETG;Generic PETG @Z-Bolt", + "from": "system", + "setting_id": "GFSL300", + "filament_id": "GFL300", + "instantiation": "false", + "fan_cooling_layer_time": [ + "30" + ], + "fan_max_speed": [ + "90" + ], + "fan_min_speed": [ + "45" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "full_fan_speed_layer": [ + "3" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "10%" + ], + "slow_down_layer_time": [ + "12" + ], + "slow_down_min_speed": [ + "20" + ], + "nozzle_temperature": [ + "250" + ], + "nozzle_temperature_initial_layer": [ + "250" + ], + "hot_plate_temp": [ + "75" + ], + "hot_plate_temp_initial_layer": [ + "75" + ], + "textured_plate_temp": [ + "75" + ], + "textured_plate_temp_initial_layer": [ + "75" + ] +} diff --git a/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt.json b/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt.json deleted file mode 100644 index d6cd4d4376..0000000000 --- a/resources/profiles/Z-Bolt/filament/Generic PETG @Z-Bolt.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "type": "filament", - "name": "Generic PETG @Z-Bolt", - "inherits": "fdm_filament_pet", - "renamed_from": "Z-Bolt PETG", - "from": "system", - "setting_id": "GFSL300", - "filament_id": "GFL300", - "instantiation": "true", - "compatible_printers": [ - "Z-Bolt S300 0.4 nozzle", - "Z-Bolt S300 Dual 0.4 nozzle", - "Z-Bolt S400 0.4 nozzle", - "Z-Bolt S400 Dual 0.4 nozzle", - "Z-Bolt S600 0.4 nozzle", - "Z-Bolt S600 Dual 0.4 nozzle", - "Z-Bolt S800 Dual 0.4 nozzle", - "Z-Bolt S1000 0.4 nozzle", - "Z-Bolt S1000 Dual 0.4 nozzle", - "Z-Bolt S300 0.6 nozzle", - "Z-Bolt S300 Dual 0.6 nozzle", - "Z-Bolt S400 0.6 nozzle", - "Z-Bolt S400 Dual 0.6 nozzle", - "Z-Bolt S600 0.6 nozzle", - "Z-Bolt S600 Dual 0.6 nozzle", - "Z-Bolt S800 Dual 0.6 nozzle", - "Z-Bolt S1000 0.6 nozzle", - "Z-Bolt S1000 Dual 0.6 nozzle", - "Z-Bolt S300 0.8 nozzle", - "Z-Bolt S300 Dual 0.8 nozzle", - "Z-Bolt S400 0.8 nozzle", - "Z-Bolt S400 Dual 0.8 nozzle", - "Z-Bolt S600 0.8 nozzle", - "Z-Bolt S600 Dual 0.8 nozzle", - "Z-Bolt S800 Dual 0.8 nozzle", - "Z-Bolt S1000 0.8 nozzle", - "Z-Bolt S1000 Dual 0.8 nozzle" - ], - "fan_cooling_layer_time": [ - "30" - ], - "fan_max_speed": [ - "90" - ], - "fan_min_speed": [ - "45" - ], - "filament_flow_ratio": [ - "0.95" - ], - "filament_max_volumetric_speed": [ - "12" - ], - "full_fan_speed_layer": [ - "3" - ], - "overhang_fan_speed": [ - "90" - ], - "overhang_fan_threshold": [ - "10%" - ], - "slow_down_layer_time": [ - "12" - ], - "slow_down_min_speed": [ - "20" - ], - "nozzle_temperature": [ - "250" - ], - "nozzle_temperature_initial_layer": [ - "250" - ], - "hot_plate_temp": [ - "75" - ], - "hot_plate_temp_initial_layer": [ - "75" - ], - "textured_plate_temp": [ - "75" - ], - "textured_plate_temp_initial_layer": [ - "75" - ] -} diff --git a/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.4 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.4 nozzle.json index c0fc63c6af..e2e0193b4f 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.4 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.4 nozzle.json @@ -1,8 +1,8 @@ { "type": "filament", "name": "Generic PLA @Z-Bolt 0.4 nozzle", - "inherits": "Generic PLA @Z-Bolt", - "renamed_from": "Z-Bolt PLA @0.4 nozzle", + "inherits": "Generic PLA @Z-Bolt Base", + "renamed_from": "Z-Bolt PLA;Generic PLA @Z-Bolt;Z-Bolt PLA @0.4 nozzle", "from": "system", "setting_id": "GFSL100", "filament_id": "GFL100", diff --git a/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.6 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.6 nozzle.json index c41e49c876..659cc8dfdb 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.6 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic PLA @Z-Bolt 0.6 nozzle", - "inherits": "Generic PLA @Z-Bolt", + "inherits": "Generic PLA @Z-Bolt Base", "renamed_from": "Z-Bolt PLA @0.6 nozzle", "from": "system", "setting_id": "GFSL106", diff --git a/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.8 nozzle.json b/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.8 nozzle.json index 5dcb65cd48..a444c45a3d 100644 --- a/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt 0.8 nozzle.json @@ -1,7 +1,7 @@ { "type": "filament", "name": "Generic PLA @Z-Bolt 0.8 nozzle", - "inherits": "Generic PLA @Z-Bolt", + "inherits": "Generic PLA @Z-Bolt Base", "renamed_from": "Z-Bolt PLA @0.8 nozzle", "from": "system", "setting_id": "GFSL108", diff --git a/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt Base.json b/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt Base.json new file mode 100644 index 0000000000..28763f236e --- /dev/null +++ b/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt Base.json @@ -0,0 +1,37 @@ +{ + "type": "filament", + "name": "Generic PLA @Z-Bolt Base", + "inherits": "fdm_filament_pla", + "renamed_from": "Z-Bolt PLA;Generic PLA @Z-Bolt", + "from": "system", + "setting_id": "GFSL100", + "filament_id": "GFL100", + "instantiation": "false", + "filament_max_volumetric_speed": [ + "20" + ], + "fan_min_speed": [ + "100" + ], + "full_fan_speed_layer": [ + "4" + ], + "hot_plate_temp": [ + "60" + ], + "hot_plate_temp_initial_layer": [ + "60" + ], + "nozzle_temperature": [ + "225" + ], + "nozzle_temperature_initial_layer": [ + "225" + ], + "textured_plate_temp": [ + "60" + ], + "textured_plate_temp_initial_layer": [ + "60" + ] +} diff --git a/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt.json b/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt.json deleted file mode 100644 index e784c61d73..0000000000 --- a/resources/profiles/Z-Bolt/filament/Generic PLA @Z-Bolt.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "type": "filament", - "name": "Generic PLA @Z-Bolt", - "inherits": "fdm_filament_pla", - "renamed_from": "Z-Bolt PLA", - "from": "system", - "setting_id": "GFSL100", - "filament_id": "GFL100", - "instantiation": "true", - "compatible_printers": [ - "Z-Bolt S300 0.4 nozzle", - "Z-Bolt S300 Dual 0.4 nozzle", - "Z-Bolt S400 0.4 nozzle", - "Z-Bolt S400 Dual 0.4 nozzle", - "Z-Bolt S600 0.4 nozzle", - "Z-Bolt S600 Dual 0.4 nozzle", - "Z-Bolt S800 Dual 0.4 nozzle", - "Z-Bolt S1000 0.4 nozzle", - "Z-Bolt S1000 Dual 0.4 nozzle", - "Z-Bolt S300 0.6 nozzle", - "Z-Bolt S300 Dual 0.6 nozzle", - "Z-Bolt S400 0.6 nozzle", - "Z-Bolt S400 Dual 0.6 nozzle", - "Z-Bolt S600 0.6 nozzle", - "Z-Bolt S600 Dual 0.6 nozzle", - "Z-Bolt S800 Dual 0.6 nozzle", - "Z-Bolt S1000 0.6 nozzle", - "Z-Bolt S1000 Dual 0.6 nozzle", - "Z-Bolt S300 0.8 nozzle", - "Z-Bolt S300 Dual 0.8 nozzle", - "Z-Bolt S400 0.8 nozzle", - "Z-Bolt S400 Dual 0.8 nozzle", - "Z-Bolt S600 0.8 nozzle", - "Z-Bolt S600 Dual 0.8 nozzle", - "Z-Bolt S800 Dual 0.8 nozzle", - "Z-Bolt S1000 0.8 nozzle", - "Z-Bolt S1000 Dual 0.8 nozzle" - ], - "filament_max_volumetric_speed": [ - "20" - ], - "fan_min_speed": [ - "100" - ], - "full_fan_speed_layer": [ - "4" - ], - "hot_plate_temp": [ - "60" - ], - "hot_plate_temp_initial_layer": [ - "60" - ], - "nozzle_temperature": [ - "225" - ], - "nozzle_temperature_initial_layer": [ - "225" - ], - "textured_plate_temp": [ - "60" - ], - "textured_plate_temp_initial_layer": [ - "60" - ] -} diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 0.4 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 0.4 nozzle.json index f79d51ab42..70fed7cb57 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 0.4 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 0.4 nozzle.json @@ -22,7 +22,7 @@ "0x1000" ], "default_filament_profile": [ - "Generic PLA @Z-Bolt" + "Generic PLA @Z-Bolt 0.4 nozzle" ], "default_print_profile": "0.20mm Standard @Z-Bolt S1000", "extruder_colour": [ diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 0.6 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 0.6 nozzle.json index e2fca3eb40..c08a1d571d 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 0.6 nozzle.json @@ -11,6 +11,9 @@ ], "printer_model": "Z-Bolt S1000", "printer_variant": "0.6", + "default_filament_profile": [ + "Generic PLA @Z-Bolt 0.6 nozzle" + ], "default_print_profile": "0.30mm Standard @Z-Bolt S1000 0.6 nozzle", "max_layer_height": [ "0.42" diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 0.8 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 0.8 nozzle.json index 9225f18d7b..2bf984384b 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 0.8 nozzle.json @@ -11,6 +11,9 @@ ], "printer_model": "Z-Bolt S1000", "printer_variant": "0.8", + "default_filament_profile": [ + "Generic PLA @Z-Bolt 0.8 nozzle" + ], "default_print_profile": "0.40mm Standard @Z-Bolt S1000 0.8 nozzle", "max_layer_height": [ "0.48" diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual 0.6 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual 0.6 nozzle.json index 1dc2b4d832..d238ff4a74 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual 0.6 nozzle.json @@ -12,6 +12,9 @@ ], "printer_model": "Z-Bolt S1000 Dual", "printer_variant": "0.6", + "default_filament_profile": [ + "Generic PLA @Z-Bolt 0.6 nozzle" + ], "default_print_profile": "0.30mm Standard @Z-Bolt S1000 0.6 nozzle", "max_layer_height": [ "0.42" diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual 0.8 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual 0.8 nozzle.json index a69f80df99..cdb92d7d38 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual 0.8 nozzle.json @@ -12,6 +12,9 @@ ], "printer_model": "Z-Bolt S1000 Dual", "printer_variant": "0.8", + "default_filament_profile": [ + "Generic PLA @Z-Bolt 0.8 nozzle" + ], "default_print_profile": "0.40mm Standard @Z-Bolt S1000 0.8 nozzle", "max_layer_height": [ "0.48" diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual.json index 261e2c0ae6..4b3f4f5c41 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000 Dual.json @@ -8,7 +8,7 @@ "bed_model": "Z-Bolt_S1000_buildplate_model.stl", "bed_texture": "Z-Bolt_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Generic PLA @Z-Bolt;Generic ABS @Z-Bolt;Generic PETG @Z-Bolt;Generic PA @Z-Bolt;Generic ABS HT @Z-Bolt", + "default_materials": "Generic PLA @Z-Bolt 0.4 nozzle;Generic PLA @Z-Bolt 0.6 nozzle;Generic PLA @Z-Bolt 0.8 nozzle;Generic ABS @Z-Bolt 0.4 nozzle;Generic ABS @Z-Bolt 0.6 nozzle;Generic ABS @Z-Bolt 0.8 nozzle;Generic PETG @Z-Bolt 0.4 nozzle;Generic PETG @Z-Bolt 0.6 nozzle;Generic PETG @Z-Bolt 0.8 nozzle;Generic PA @Z-Bolt 0.4 nozzle;Generic PA @Z-Bolt 0.6 nozzle;Generic PA @Z-Bolt 0.8 nozzle;Generic ABS HT @Z-Bolt 0.4 nozzle;Generic ABS HT @Z-Bolt 0.6 nozzle;Generic ABS HT @Z-Bolt 0.8 nozzle", "thumbnails": "144x144/PNG,900x900/PNG", "thumbnails_format": "PNG" } diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000.json index b56abc143c..99cca4b370 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S1000.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S1000.json @@ -8,7 +8,7 @@ "bed_model": "Z-Bolt_S1000_buildplate_model.stl", "bed_texture": "Z-Bolt_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Generic PLA @Z-Bolt;Generic ABS @Z-Bolt;Generic PETG @Z-Bolt;Generic PA @Z-Bolt;Generic ABS HT @Z-Bolt", + "default_materials": "Generic PLA @Z-Bolt 0.4 nozzle;Generic PLA @Z-Bolt 0.6 nozzle;Generic PLA @Z-Bolt 0.8 nozzle;Generic ABS @Z-Bolt 0.4 nozzle;Generic ABS @Z-Bolt 0.6 nozzle;Generic ABS @Z-Bolt 0.8 nozzle;Generic PETG @Z-Bolt 0.4 nozzle;Generic PETG @Z-Bolt 0.6 nozzle;Generic PETG @Z-Bolt 0.8 nozzle;Generic PA @Z-Bolt 0.4 nozzle;Generic PA @Z-Bolt 0.6 nozzle;Generic PA @Z-Bolt 0.8 nozzle;Generic ABS HT @Z-Bolt 0.4 nozzle;Generic ABS HT @Z-Bolt 0.6 nozzle;Generic ABS HT @Z-Bolt 0.8 nozzle", "thumbnails": "144x144/PNG,900x900/PNG", "thumbnails_format": "PNG" } diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S300 0.4 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S300 0.4 nozzle.json index bf051818ce..c5e00dd1a7 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S300 0.4 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S300 0.4 nozzle.json @@ -22,7 +22,7 @@ "0x300" ], "default_filament_profile": [ - "Generic PLA @Z-Bolt" + "Generic PLA @Z-Bolt 0.4 nozzle" ], "default_print_profile": "0.20mm Standard @Z-Bolt S300", "extruder_colour": [ diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S300 0.6 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S300 0.6 nozzle.json index 0ebceafaca..13a87042e9 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S300 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S300 0.6 nozzle.json @@ -11,6 +11,9 @@ ], "printer_model": "Z-Bolt S300", "printer_variant": "0.6", + "default_filament_profile": [ + "Generic PLA @Z-Bolt 0.6 nozzle" + ], "default_print_profile": "0.30mm Standard @Z-Bolt S300 0.6 nozzle", "max_layer_height": [ "0.42" diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S300 0.8 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S300 0.8 nozzle.json index 2946253909..0debe4be4b 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S300 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S300 0.8 nozzle.json @@ -11,6 +11,9 @@ ], "printer_model": "Z-Bolt S300", "printer_variant": "0.8", + "default_filament_profile": [ + "Generic PLA @Z-Bolt 0.8 nozzle" + ], "default_print_profile": "0.40mm Standard @Z-Bolt S300 0.8 nozzle", "max_layer_height": [ "0.48" diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual 0.6 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual 0.6 nozzle.json index 39f5af1682..1237a4e451 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual 0.6 nozzle.json @@ -12,6 +12,9 @@ ], "printer_model": "Z-Bolt S300 Dual", "printer_variant": "0.6", + "default_filament_profile": [ + "Generic PLA @Z-Bolt 0.6 nozzle" + ], "default_print_profile": "0.30mm Standard @Z-Bolt S300 0.6 nozzle", "max_layer_height": [ "0.42" diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual 0.8 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual 0.8 nozzle.json index 2cf0a262ab..03b2353be4 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual 0.8 nozzle.json @@ -12,6 +12,9 @@ ], "printer_model": "Z-Bolt S300 Dual", "printer_variant": "0.8", + "default_filament_profile": [ + "Generic PLA @Z-Bolt 0.8 nozzle" + ], "default_print_profile": "0.40mm Standard @Z-Bolt S300 0.8 nozzle", "max_layer_height": [ "0.48" diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual.json index 74fa3d418a..e0911a3bf6 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S300 Dual.json @@ -8,5 +8,5 @@ "bed_model": "Z-Bolt_S300_buildplate_model.stl", "bed_texture": "Z-Bolt_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Generic PLA @Z-Bolt;Generic ABS @Z-Bolt;Generic PETG @Z-Bolt;Generic PA @Z-Bolt;Generic ABS HT @Z-Bolt" + "default_materials": "Generic PLA @Z-Bolt 0.4 nozzle;Generic PLA @Z-Bolt 0.6 nozzle;Generic PLA @Z-Bolt 0.8 nozzle;Generic ABS @Z-Bolt 0.4 nozzle;Generic ABS @Z-Bolt 0.6 nozzle;Generic ABS @Z-Bolt 0.8 nozzle;Generic PETG @Z-Bolt 0.4 nozzle;Generic PETG @Z-Bolt 0.6 nozzle;Generic PETG @Z-Bolt 0.8 nozzle;Generic PA @Z-Bolt 0.4 nozzle;Generic PA @Z-Bolt 0.6 nozzle;Generic PA @Z-Bolt 0.8 nozzle;Generic ABS HT @Z-Bolt 0.4 nozzle;Generic ABS HT @Z-Bolt 0.6 nozzle;Generic ABS HT @Z-Bolt 0.8 nozzle" } diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S300.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S300.json index 3eeabf1506..0c70736743 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S300.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S300.json @@ -8,5 +8,5 @@ "bed_model": "Z-Bolt_S300_buildplate_model.stl", "bed_texture": "Z-Bolt_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Generic PLA @Z-Bolt;Generic ABS @Z-Bolt;Generic PETG @Z-Bolt;Generic PA @Z-Bolt;Generic ABS HT @Z-Bolt" + "default_materials": "Generic PLA @Z-Bolt 0.4 nozzle;Generic PLA @Z-Bolt 0.6 nozzle;Generic PLA @Z-Bolt 0.8 nozzle;Generic ABS @Z-Bolt 0.4 nozzle;Generic ABS @Z-Bolt 0.6 nozzle;Generic ABS @Z-Bolt 0.8 nozzle;Generic PETG @Z-Bolt 0.4 nozzle;Generic PETG @Z-Bolt 0.6 nozzle;Generic PETG @Z-Bolt 0.8 nozzle;Generic PA @Z-Bolt 0.4 nozzle;Generic PA @Z-Bolt 0.6 nozzle;Generic PA @Z-Bolt 0.8 nozzle;Generic ABS HT @Z-Bolt 0.4 nozzle;Generic ABS HT @Z-Bolt 0.6 nozzle;Generic ABS HT @Z-Bolt 0.8 nozzle" } diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S400 0.4 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S400 0.4 nozzle.json index e56c8ea951..b1d528acda 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S400 0.4 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S400 0.4 nozzle.json @@ -22,7 +22,7 @@ "0x400" ], "default_filament_profile": [ - "Generic PLA @Z-Bolt" + "Generic PLA @Z-Bolt 0.4 nozzle" ], "default_print_profile": "0.20mm Standard @Z-Bolt S400", "extruder_colour": [ diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S400 0.6 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S400 0.6 nozzle.json index eb830a2f1b..271f90580d 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S400 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S400 0.6 nozzle.json @@ -11,6 +11,9 @@ ], "printer_model": "Z-Bolt S400", "printer_variant": "0.6", + "default_filament_profile": [ + "Generic PLA @Z-Bolt 0.6 nozzle" + ], "default_print_profile": "0.30mm Standard @Z-Bolt S400 0.6 nozzle", "max_layer_height": [ "0.42" diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S400 0.8 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S400 0.8 nozzle.json index 4632cbc3a2..b03c87eab4 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S400 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S400 0.8 nozzle.json @@ -11,6 +11,9 @@ ], "printer_model": "Z-Bolt S400", "printer_variant": "0.8", + "default_filament_profile": [ + "Generic PLA @Z-Bolt 0.8 nozzle" + ], "default_print_profile": "0.40mm Standard @Z-Bolt S400 0.8 nozzle", "max_layer_height": [ "0.48" diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual 0.6 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual 0.6 nozzle.json index e0ee4f6e12..aed97c1609 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual 0.6 nozzle.json @@ -12,6 +12,9 @@ ], "printer_model": "Z-Bolt S400 Dual", "printer_variant": "0.6", + "default_filament_profile": [ + "Generic PLA @Z-Bolt 0.6 nozzle" + ], "default_print_profile": "0.30mm Standard @Z-Bolt S400 0.6 nozzle", "max_layer_height": [ "0.42" diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual 0.8 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual 0.8 nozzle.json index a7e39d75d2..58b4f4efd4 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual 0.8 nozzle.json @@ -12,6 +12,9 @@ ], "printer_model": "Z-Bolt S400 Dual", "printer_variant": "0.8", + "default_filament_profile": [ + "Generic PLA @Z-Bolt 0.8 nozzle" + ], "default_print_profile": "0.40mm Standard @Z-Bolt S400 0.8 nozzle", "max_layer_height": [ "0.48" diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual.json index f5624b982c..b016b78fbe 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S400 Dual.json @@ -8,5 +8,5 @@ "bed_model": "Z-Bolt_S400_buildplate_model.stl", "bed_texture": "Z-Bolt_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Generic PLA @Z-Bolt;Generic ABS @Z-Bolt;Generic PETG @Z-Bolt;Generic PA @Z-Bolt;Generic ABS HT @Z-Bolt" + "default_materials": "Generic PLA @Z-Bolt 0.4 nozzle;Generic PLA @Z-Bolt 0.6 nozzle;Generic PLA @Z-Bolt 0.8 nozzle;Generic ABS @Z-Bolt 0.4 nozzle;Generic ABS @Z-Bolt 0.6 nozzle;Generic ABS @Z-Bolt 0.8 nozzle;Generic PETG @Z-Bolt 0.4 nozzle;Generic PETG @Z-Bolt 0.6 nozzle;Generic PETG @Z-Bolt 0.8 nozzle;Generic PA @Z-Bolt 0.4 nozzle;Generic PA @Z-Bolt 0.6 nozzle;Generic PA @Z-Bolt 0.8 nozzle;Generic ABS HT @Z-Bolt 0.4 nozzle;Generic ABS HT @Z-Bolt 0.6 nozzle;Generic ABS HT @Z-Bolt 0.8 nozzle" } diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S400.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S400.json index 682aed2e71..3e02fd5b55 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S400.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S400.json @@ -8,5 +8,5 @@ "bed_model": "Z-Bolt_S400_buildplate_model.stl", "bed_texture": "Z-Bolt_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Generic PLA @Z-Bolt;Generic ABS @Z-Bolt;Generic PETG @Z-Bolt;Generic PA @Z-Bolt;Generic ABS HT @Z-Bolt" + "default_materials": "Generic PLA @Z-Bolt 0.4 nozzle;Generic PLA @Z-Bolt 0.6 nozzle;Generic PLA @Z-Bolt 0.8 nozzle;Generic ABS @Z-Bolt 0.4 nozzle;Generic ABS @Z-Bolt 0.6 nozzle;Generic ABS @Z-Bolt 0.8 nozzle;Generic PETG @Z-Bolt 0.4 nozzle;Generic PETG @Z-Bolt 0.6 nozzle;Generic PETG @Z-Bolt 0.8 nozzle;Generic PA @Z-Bolt 0.4 nozzle;Generic PA @Z-Bolt 0.6 nozzle;Generic PA @Z-Bolt 0.8 nozzle;Generic ABS HT @Z-Bolt 0.4 nozzle;Generic ABS HT @Z-Bolt 0.6 nozzle;Generic ABS HT @Z-Bolt 0.8 nozzle" } diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S600 0.4 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S600 0.4 nozzle.json index 67e5f7291d..27e8010403 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S600 0.4 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S600 0.4 nozzle.json @@ -22,7 +22,7 @@ "0x600" ], "default_filament_profile": [ - "Generic PLA @Z-Bolt" + "Generic PLA @Z-Bolt 0.4 nozzle" ], "default_print_profile": "0.20mm Standard @Z-Bolt S600", "extruder_colour": [ diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S600 0.6 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S600 0.6 nozzle.json index d7ccf3de5f..632484744b 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S600 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S600 0.6 nozzle.json @@ -11,6 +11,9 @@ ], "printer_model": "Z-Bolt S600", "printer_variant": "0.6", + "default_filament_profile": [ + "Generic PLA @Z-Bolt 0.6 nozzle" + ], "default_print_profile": "0.30mm Standard @Z-Bolt S600 0.6 nozzle", "max_layer_height": [ "0.42" diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S600 0.8 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S600 0.8 nozzle.json index 22f59b2be7..d0f2e669cb 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S600 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S600 0.8 nozzle.json @@ -11,6 +11,9 @@ ], "printer_model": "Z-Bolt S600", "printer_variant": "0.8", + "default_filament_profile": [ + "Generic PLA @Z-Bolt 0.8 nozzle" + ], "default_print_profile": "0.40mm Standard @Z-Bolt S600 0.8 nozzle", "max_layer_height": [ "0.48" diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual 0.6 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual 0.6 nozzle.json index e5405acd51..38fee1f408 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual 0.6 nozzle.json @@ -12,6 +12,9 @@ ], "printer_model": "Z-Bolt S600 Dual", "printer_variant": "0.6", + "default_filament_profile": [ + "Generic PLA @Z-Bolt 0.6 nozzle" + ], "default_print_profile": "0.30mm Standard @Z-Bolt S600 0.6 nozzle", "max_layer_height": [ "0.42" diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual 0.8 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual 0.8 nozzle.json index 49f1ad7350..555f4be064 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual 0.8 nozzle.json @@ -12,6 +12,9 @@ ], "printer_model": "Z-Bolt S600 Dual", "printer_variant": "0.8", + "default_filament_profile": [ + "Generic PLA @Z-Bolt 0.8 nozzle" + ], "default_print_profile": "0.40mm Standard @Z-Bolt S600 0.8 nozzle", "max_layer_height": [ "0.48" diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual.json index 21681ee61f..706377d97e 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S600 Dual.json @@ -8,5 +8,5 @@ "bed_model": "Z-Bolt_S600_buildplate_model.stl", "bed_texture": "Z-Bolt_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Generic PLA @Z-Bolt;Generic ABS @Z-Bolt;Generic PETG @Z-Bolt;Generic PA @Z-Bolt;Generic ABS HT @Z-Bolt" + "default_materials": "Generic PLA @Z-Bolt 0.4 nozzle;Generic PLA @Z-Bolt 0.6 nozzle;Generic PLA @Z-Bolt 0.8 nozzle;Generic ABS @Z-Bolt 0.4 nozzle;Generic ABS @Z-Bolt 0.6 nozzle;Generic ABS @Z-Bolt 0.8 nozzle;Generic PETG @Z-Bolt 0.4 nozzle;Generic PETG @Z-Bolt 0.6 nozzle;Generic PETG @Z-Bolt 0.8 nozzle;Generic PA @Z-Bolt 0.4 nozzle;Generic PA @Z-Bolt 0.6 nozzle;Generic PA @Z-Bolt 0.8 nozzle;Generic ABS HT @Z-Bolt 0.4 nozzle;Generic ABS HT @Z-Bolt 0.6 nozzle;Generic ABS HT @Z-Bolt 0.8 nozzle" } diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S600.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S600.json index 1d533080ea..458c66860c 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S600.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S600.json @@ -8,5 +8,5 @@ "bed_model": "Z-Bolt_S600_buildplate_model.stl", "bed_texture": "Z-Bolt_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Generic PLA @Z-Bolt;Generic ABS @Z-Bolt;Generic PETG @Z-Bolt;Generic PA @Z-Bolt;Generic ABS HT @Z-Bolt" + "default_materials": "Generic PLA @Z-Bolt 0.4 nozzle;Generic PLA @Z-Bolt 0.6 nozzle;Generic PLA @Z-Bolt 0.8 nozzle;Generic ABS @Z-Bolt 0.4 nozzle;Generic ABS @Z-Bolt 0.6 nozzle;Generic ABS @Z-Bolt 0.8 nozzle;Generic PETG @Z-Bolt 0.4 nozzle;Generic PETG @Z-Bolt 0.6 nozzle;Generic PETG @Z-Bolt 0.8 nozzle;Generic PA @Z-Bolt 0.4 nozzle;Generic PA @Z-Bolt 0.6 nozzle;Generic PA @Z-Bolt 0.8 nozzle;Generic ABS HT @Z-Bolt 0.4 nozzle;Generic ABS HT @Z-Bolt 0.6 nozzle;Generic ABS HT @Z-Bolt 0.8 nozzle" } diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.4 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.4 nozzle.json index 4e22faa481..4738add826 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.4 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.4 nozzle.json @@ -23,7 +23,7 @@ "0x802" ], "default_filament_profile": [ - "Generic PLA @Z-Bolt" + "Generic PLA @Z-Bolt 0.4 nozzle" ], "default_print_profile": "0.20mm Standard @Z-Bolt S800", "extruder_colour": [ diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.6 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.6 nozzle.json index 70fadfc13c..43bde623c7 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.6 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.6 nozzle.json @@ -12,6 +12,9 @@ ], "printer_model": "Z-Bolt S800 Dual", "printer_variant": "0.6", + "default_filament_profile": [ + "Generic PLA @Z-Bolt 0.6 nozzle" + ], "default_print_profile": "0.30mm Standard @Z-Bolt S800 0.6 nozzle", "max_layer_height": [ "0.42" diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.8 nozzle.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.8 nozzle.json index 902c9f09f2..c910a92bb6 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.8 nozzle.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual 0.8 nozzle.json @@ -12,6 +12,9 @@ ], "printer_model": "Z-Bolt S800 Dual", "printer_variant": "0.8", + "default_filament_profile": [ + "Generic PLA @Z-Bolt 0.8 nozzle" + ], "default_print_profile": "0.40mm Standard @Z-Bolt S800 0.8 nozzle", "max_layer_height": [ "0.48" diff --git a/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual.json b/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual.json index 1e307832a5..4c97031bdd 100644 --- a/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual.json +++ b/resources/profiles/Z-Bolt/machine/Z-Bolt S800 Dual.json @@ -8,7 +8,7 @@ "bed_model": "Z-Bolt_S800_buildplate_model.stl", "bed_texture": "Z-Bolt_buildplate_texture.svg", "hotend_model": "", - "default_materials": "Generic PLA @Z-Bolt;Generic ABS @Z-Bolt;Generic PETG @Z-Bolt;Generic PA @Z-Bolt;Generic ABS HT @Z-Bolt", + "default_materials": "Generic PLA @Z-Bolt 0.4 nozzle;Generic PLA @Z-Bolt 0.6 nozzle;Generic PLA @Z-Bolt 0.8 nozzle;Generic ABS @Z-Bolt 0.4 nozzle;Generic ABS @Z-Bolt 0.6 nozzle;Generic ABS @Z-Bolt 0.8 nozzle;Generic PETG @Z-Bolt 0.4 nozzle;Generic PETG @Z-Bolt 0.6 nozzle;Generic PETG @Z-Bolt 0.8 nozzle;Generic PA @Z-Bolt 0.4 nozzle;Generic PA @Z-Bolt 0.6 nozzle;Generic PA @Z-Bolt 0.8 nozzle;Generic ABS HT @Z-Bolt 0.4 nozzle;Generic ABS HT @Z-Bolt 0.6 nozzle;Generic ABS HT @Z-Bolt 0.8 nozzle", "thumbnails": "144x144/PNG,900x900/PNG", "thumbnails_format": "PNG" } diff --git a/resources/profiles/Z-Bolt/machine/fdm_zbolt_common.json b/resources/profiles/Z-Bolt/machine/fdm_zbolt_common.json index 3d491f2994..0c9920b4a5 100644 --- a/resources/profiles/Z-Bolt/machine/fdm_zbolt_common.json +++ b/resources/profiles/Z-Bolt/machine/fdm_zbolt_common.json @@ -11,7 +11,7 @@ "printer_variant": "0.4", "auxiliary_fan": "0", "default_filament_profile": [ - "Generic PLA @Z-Bolt" + "Generic PLA @Z-Bolt 0.4 nozzle" ], "default_print_profile": "0.20mm Standard @Z-Bolt S300", "machine_max_acceleration_e": [ diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index 942be33eb9..ea9d5a57b1 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -790,7 +790,8 @@ bool is_compatible_with_printer(const PresetWithVendorProfile &preset, const Pre if (preset.vendor != nullptr && preset.preset.type == Preset::TYPE_FILAMENT) { const auto& excluded_printers = preset.preset.m_excluded_from; const auto excluded = preset.vendor->name == PresetBundle::ORCA_FILAMENT_LIBRARY && - excluded_printers.find(active_printer.preset.name) != excluded_printers.end(); + (excluded_printers.find(active_printer.preset.name) != excluded_printers.end() || + excluded_printers.find(active_printer.preset.inherits()) != excluded_printers.end()); if (excluded) return false; }