diff --git a/resources/profiles/Prusa.json b/resources/profiles/Prusa.json index 57884bea9b..4a6980c74a 100644 --- a/resources/profiles/Prusa.json +++ b/resources/profiles/Prusa.json @@ -1,6 +1,6 @@ { "name": "Prusa", - "version": "02.04.00.15", + "version": "02.04.00.16", "force_update": "0", "description": "Prusa configurations", "machine_model_list": [ @@ -1572,49 +1572,25 @@ } ], "filament_list": [ - { - "name": "Generic ASA @Prusa CORE One", - "sub_path": "filament/Generic ASA @Prusa CORE One.json" - }, - { - "name": "Generic PLA Silk @Prusa CORE One", - "sub_path": "filament/Generic PLA Silk @Prusa CORE One.json" - }, { "name": "fdm_filament_common", "sub_path": "filament/fdm_filament_common.json" }, { - "name": "Generic ASA @Prusa CORE One 0.6", - "sub_path": "filament/Generic ASA @Prusa CORE One 0.6.json" + "name": "fdm_filament_template_nextruder_pet", + "sub_path": "filament/fdm_filament_template_nextruder_pet.json" }, { - "name": "Generic ASA @Prusa CORE One 0.8", - "sub_path": "filament/Generic ASA @Prusa CORE One 0.8.json" + "name": "fdm_filament_template_nextruder_pet_hf", + "sub_path": "filament/fdm_filament_template_nextruder_pet_hf.json" }, { - "name": "Generic ASA @Prusa CORE One HF 0.4", - "sub_path": "filament/Generic ASA @Prusa CORE One HF 0.4.json" + "name": "fdm_filament_template_nextruder_pla", + "sub_path": "filament/fdm_filament_template_nextruder_pla.json" }, { - "name": "Generic ASA @Prusa CORE One HF 0.5", - "sub_path": "filament/Generic ASA @Prusa CORE One HF 0.5.json" - }, - { - "name": "Generic ASA @Prusa CORE One HF 0.6", - "sub_path": "filament/Generic ASA @Prusa CORE One HF 0.6.json" - }, - { - "name": "Generic ASA @Prusa CORE One HF 0.8", - "sub_path": "filament/Generic ASA @Prusa CORE One HF 0.8.json" - }, - { - "name": "Generic PLA Silk @Prusa CORE One 0.6", - "sub_path": "filament/Generic PLA Silk @Prusa CORE One 0.6.json" - }, - { - "name": "Generic PLA Silk @Prusa CORE One 0.8", - "sub_path": "filament/Generic PLA Silk @Prusa CORE One 0.8.json" + "name": "fdm_filament_template_nextruder_pla_hf", + "sub_path": "filament/fdm_filament_template_nextruder_pla_hf.json" }, { "name": "fdm_filament_abs", @@ -1664,6 +1640,14 @@ "name": "fdm_filament_tpu", "sub_path": "filament/fdm_filament_tpu.json" }, + { + "name": "Generic ASA @Prusa CORE One", + "sub_path": "filament/Generic ASA @Prusa CORE One.json" + }, + { + "name": "Generic PLA Silk @Prusa CORE One", + "sub_path": "filament/Generic PLA Silk @Prusa CORE One.json" + }, { "name": "Generic ABS @Prusa MK3.5", "sub_path": "filament/Generic ABS @Prusa MK3.5.json" @@ -2160,6 +2144,38 @@ "name": "Generic TPU HF @Prusa MK3.5", "sub_path": "filament/Generic TPU HF @Prusa MK3.5.json" }, + { + "name": "Generic ASA @Prusa CORE One 0.6", + "sub_path": "filament/Generic ASA @Prusa CORE One 0.6.json" + }, + { + "name": "Generic ASA @Prusa CORE One 0.8", + "sub_path": "filament/Generic ASA @Prusa CORE One 0.8.json" + }, + { + "name": "Generic ASA @Prusa CORE One HF 0.4", + "sub_path": "filament/Generic ASA @Prusa CORE One HF 0.4.json" + }, + { + "name": "Generic ASA @Prusa CORE One HF 0.5", + "sub_path": "filament/Generic ASA @Prusa CORE One HF 0.5.json" + }, + { + "name": "Generic ASA @Prusa CORE One HF 0.6", + "sub_path": "filament/Generic ASA @Prusa CORE One HF 0.6.json" + }, + { + "name": "Generic ASA @Prusa CORE One HF 0.8", + "sub_path": "filament/Generic ASA @Prusa CORE One HF 0.8.json" + }, + { + "name": "Generic PLA Silk @Prusa CORE One 0.6", + "sub_path": "filament/Generic PLA Silk @Prusa CORE One 0.6.json" + }, + { + "name": "Generic PLA Silk @Prusa CORE One 0.8", + "sub_path": "filament/Generic PLA Silk @Prusa CORE One 0.8.json" + }, { "name": "Generic ABS @Prusa MK4S HF0.4", "sub_path": "filament/Generic ABS @Prusa MK4S HF0.4.json" diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.4.json index caf36dc7d1..205704705f 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.4.json @@ -7,6 +7,9 @@ "setting_id": "ASYz8yASE82tQDII", "filament_id": "OFY9muEs", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.4 nozzle" ], diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.5.json index 4d0ae20a33..631940cee5 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.5.json @@ -7,6 +7,9 @@ "setting_id": "mzZCm8XDmAR23YR6", "filament_id": "OFY9muEs", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.5 nozzle" ], diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.6.json index 6419e2a9d4..4b0a714f62 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One HF 0.6.json @@ -7,6 +7,9 @@ "setting_id": "gJhX2KBpk4wfXIj0", "filament_id": "OFY9muEs", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.6 nozzle" ], diff --git a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One.json b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One.json index a3fcbdee47..5138e20528 100644 --- a/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One.json +++ b/resources/profiles/Prusa/filament/Generic ABS @Prusa CORE One.json @@ -6,6 +6,9 @@ "from": "system", "setting_id": "0k31oXq1pLQsHvrj", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet" + ], "chamber_temperature": [ "40" ], diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.4.json index 80c129fab9..c368fcae43 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.4.json @@ -7,6 +7,9 @@ "setting_id": "eKDfiVRE59itoppm", "filament_id": "OFLPAxz3", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.4 nozzle" ], diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.5.json index 4ea45b0f5b..07ee914c50 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.5.json @@ -7,6 +7,9 @@ "setting_id": "ZjHf5Vvtf4ESNnWb", "filament_id": "OFLPAxz3", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.5 nozzle" ], diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.6.json index d6b2fff248..d602b9e774 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One HF 0.6.json @@ -7,6 +7,9 @@ "setting_id": "aRDgUgQJWdNDJx5c", "filament_id": "OFLPAxz3", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.6 nozzle" ], diff --git a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One.json b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One.json index 09a8349005..d135ffcbad 100644 --- a/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One.json +++ b/resources/profiles/Prusa/filament/Generic ASA @Prusa CORE One.json @@ -6,6 +6,9 @@ "from": "system", "setting_id": "Q7fgojkHRZI0floy", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet" + ], "chamber_temperature": [ "40" ], diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.4.json index 510e1d2baf..38ab9dc4c2 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.4.json @@ -7,6 +7,9 @@ "setting_id": "7oUyjvRHLH4bJyX0", "filament_id": "OFYPdQJh", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.4 nozzle" ], diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.5.json index f28f5f10a3..f24f1f8f26 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.5.json @@ -7,6 +7,9 @@ "setting_id": "6HiIOGURZWwman1l", "filament_id": "OFYPdQJh", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.5 nozzle" ], diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.6.json index 53dd49907d..c78dbe3b1e 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One HF 0.6.json @@ -7,6 +7,9 @@ "setting_id": "KKiug7A9NOQPe1m7", "filament_id": "OFYPdQJh", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.6 nozzle" ], diff --git a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One.json b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One.json index b605f77a89..4f3e7f400c 100644 --- a/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One.json +++ b/resources/profiles/Prusa/filament/Generic PETG @Prusa CORE One.json @@ -6,6 +6,9 @@ "from": "system", "setting_id": "W71PW5bpf7CV16D4", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet" + ], "chamber_temperature": [ "35" ], diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One 0.6.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One 0.6.json index 009a827c7f..4718313292 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One 0.6.json @@ -8,12 +8,16 @@ "filament_id": "OFDSrzZ8", "instantiation": "true", "compatible_printers": [ - "Prusa CORE One 0.6 nozzle" + "Prusa CORE One 0.6 nozzle", + "Prusa CORE One MMU3 0.6 nozzle" ], "nozzle_temperature": [ "210" ], "slow_down_layer_time": [ "15" + ], + "filament_cooling_final_speed": [ + "1.5" ] } diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.4.json index e821c4d97d..cfaa133cb9 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.4.json @@ -7,6 +7,9 @@ "setting_id": "vniEPaoyABoAfLFa", "filament_id": "OFDSrzZ8", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pla_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.4 nozzle", "Prusa CORE One L HF 0.4 nozzle" diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.5.json index af02d26924..8ddcd915a8 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.5.json @@ -7,6 +7,9 @@ "setting_id": "NPEs4gtBlKWupYZX", "filament_id": "OFDSrzZ8", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pla_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.5 nozzle" ], diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.6.json index dd830e04cd..912bd0d131 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One HF 0.6.json @@ -7,6 +7,9 @@ "setting_id": "SnfULjrWGCiA7ljq", "filament_id": "OFDSrzZ8", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pla_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.6 nozzle" ], @@ -24,5 +27,8 @@ ], "slow_down_min_speed": [ "15" + ], + "filament_cooling_final_speed": [ + "1.5" ] } diff --git a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One.json b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One.json index 247ebd2763..6f19c61dc6 100644 --- a/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One.json +++ b/resources/profiles/Prusa/filament/Generic PLA @Prusa CORE One.json @@ -6,6 +6,9 @@ "from": "system", "setting_id": "r2i4c7DsYXYIMVCX", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pla" + ], "chamber_temperature": [ "20" ], @@ -17,8 +20,7 @@ "Prusa CORE One L 0.4 nozzle", "Prusa CORE One MMU3 0.4 nozzle", "Prusa CORE One MMU3 0.25 nozzle", - "Prusa CORE One MMU3 0.3 nozzle", - "Prusa CORE One MMU3 0.6 nozzle" + "Prusa CORE One MMU3 0.3 nozzle" ], "fan_cooling_layer_time": [ "40" diff --git a/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One 0.6.json b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One 0.6.json index 55f3698ba3..31000de70a 100644 --- a/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One 0.6.json @@ -29,5 +29,8 @@ ], "slow_down_layer_time": [ "15" + ], + "filament_cooling_final_speed": [ + "1.5" ] } diff --git a/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One.json b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One.json index 71aa3d915d..d22f3c6c6c 100644 --- a/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One.json +++ b/resources/profiles/Prusa/filament/Generic PLA Silk @Prusa CORE One.json @@ -6,6 +6,9 @@ "from": "system", "setting_id": "F9lNHyhZwZi7aD74", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pla" + ], "chamber_temperature": [ "20" ], diff --git a/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.4.json index e7977e0c94..19287185da 100644 --- a/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.4.json @@ -6,6 +6,9 @@ "setting_id": "tXktQXr79am1s5UL", "filament_id": "OFmFwUWM", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.4 nozzle" ], diff --git a/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.5.json index 26e053cd79..64c8a59399 100644 --- a/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.5.json @@ -6,6 +6,9 @@ "setting_id": "YbyojtjXvEtI4Tt3", "filament_id": "OFmFwUWM", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.5 nozzle" ], diff --git a/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.6.json index 5bde9d8869..9962f5cc76 100644 --- a/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Prusament ASA @CORE One HF 0.6.json @@ -6,6 +6,9 @@ "setting_id": "35H9TLr1p2Jy767g", "filament_id": "OFmFwUWM", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.6 nozzle" ], diff --git a/resources/profiles/Prusa/filament/Prusament ASA @CORE One.json b/resources/profiles/Prusa/filament/Prusament ASA @CORE One.json index fef0f31669..739b511db9 100644 --- a/resources/profiles/Prusa/filament/Prusament ASA @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusament ASA @CORE One.json @@ -7,6 +7,9 @@ "setting_id": "UUTjJ4Y8St3c87jD", "filament_id": "OFmFwUWM", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet" + ], "chamber_temperature": [ "40" ], diff --git a/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @CORE One.json b/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @CORE One.json index 0913f1ea9a..d32a445e21 100644 --- a/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusament PA11 Carbon Fiber @CORE One.json @@ -7,6 +7,9 @@ "setting_id": "sNGgucQjiFXwuFkq", "filament_id": "OF4MZtnE", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet" + ], "chamber_temperature": [ "40" ], diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.4.json index 4e5b5643bd..bdcf80c13c 100644 --- a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.4.json @@ -6,6 +6,9 @@ "setting_id": "pEsP537TBR5kozQB", "filament_id": "OFvDbkFq", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.4 nozzle" ], diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.5.json index ab9a127df8..0e82457803 100644 --- a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.5.json @@ -6,6 +6,9 @@ "setting_id": "3IfLi1ZVCKKbEBUW", "filament_id": "OFvDbkFq", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.5 nozzle" ], diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.6.json index 642f421819..9d72d40e58 100644 --- a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One HF 0.6.json @@ -6,6 +6,9 @@ "setting_id": "Q8qWw2G7l2UvxGut", "filament_id": "OFvDbkFq", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.6 nozzle" ], diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One.json b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One.json index 1ef6ad5868..00b62e3e37 100644 --- a/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @CORE One.json @@ -7,6 +7,9 @@ "setting_id": "x1SkWhSSkVVIPwCF", "filament_id": "OFvDbkFq", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet" + ], "chamber_temperature": [ "40" ], diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @CORE One.json b/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @CORE One.json index d691595bf5..edaad073df 100644 --- a/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusament PC Blend Carbon Fiber @CORE One.json @@ -7,6 +7,9 @@ "setting_id": "B8Cm9l8i9osp5J2q", "filament_id": "OFdO6vpt", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet" + ], "chamber_temperature": [ "40" ], diff --git a/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.4.json index f34dcd29a7..5fc23cd3dc 100644 --- a/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.4.json @@ -6,6 +6,9 @@ "setting_id": "lwT1VxW5OkY36kUX", "filament_id": "OFkR8E2c", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.4 nozzle" ], diff --git a/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.5.json b/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.5.json index 71001294fa..527974207b 100644 --- a/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.5.json +++ b/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.5.json @@ -6,6 +6,9 @@ "setting_id": "XAgW7fElXxhaKaBT", "filament_id": "OFkR8E2c", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.5 nozzle" ], diff --git a/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.6.json b/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.6.json index cea5ef7809..271b04399f 100644 --- a/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.6.json +++ b/resources/profiles/Prusa/filament/Prusament PETG @CORE One HF 0.6.json @@ -6,6 +6,9 @@ "setting_id": "6aTGEZj2EmpTR1mu", "filament_id": "OFkR8E2c", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.6 nozzle" ], diff --git a/resources/profiles/Prusa/filament/Prusament PETG @CORE One.json b/resources/profiles/Prusa/filament/Prusament PETG @CORE One.json index 39090d8977..51aaba3419 100644 --- a/resources/profiles/Prusa/filament/Prusament PETG @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusament PETG @CORE One.json @@ -7,6 +7,9 @@ "setting_id": "LSvba9ds3XTwDMCG", "filament_id": "OFkR8E2c", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pet" + ], "chamber_temperature": [ "35" ], diff --git a/resources/profiles/Prusa/filament/Prusament PLA @CORE One HF 0.4.json b/resources/profiles/Prusa/filament/Prusament PLA @CORE One HF 0.4.json index 8c1d806d98..a4e85823dd 100644 --- a/resources/profiles/Prusa/filament/Prusament PLA @CORE One HF 0.4.json +++ b/resources/profiles/Prusa/filament/Prusament PLA @CORE One HF 0.4.json @@ -6,6 +6,9 @@ "setting_id": "mf4Muog4IcsgkYoA", "filament_id": "OFnO4wnf", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pla_hf" + ], "compatible_printers": [ "Prusa CORE One HF 0.4 nozzle", "Prusa CORE One L HF 0.4 nozzle" diff --git a/resources/profiles/Prusa/filament/Prusament PLA @CORE One.json b/resources/profiles/Prusa/filament/Prusament PLA @CORE One.json index e90e22ad51..a28ea07ed4 100644 --- a/resources/profiles/Prusa/filament/Prusament PLA @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusament PLA @CORE One.json @@ -7,6 +7,9 @@ "setting_id": "PuujUMjNKLZvZNAH", "filament_id": "OFnO4wnf", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pla" + ], "chamber_temperature": [ "20" ], @@ -104,5 +107,11 @@ ], "slow_down_min_speed": [ "20" + ], + "filament_unloading_speed": [ + "100" + ], + "filament_unloading_speed_start": [ + "100" ] } diff --git a/resources/profiles/Prusa/filament/Prusament PVB @CORE One.json b/resources/profiles/Prusa/filament/Prusament PVB @CORE One.json index 56987a8093..9f6786bd38 100644 --- a/resources/profiles/Prusa/filament/Prusament PVB @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusament PVB @CORE One.json @@ -7,6 +7,9 @@ "setting_id": "085dGkrnPhatF07x", "filament_id": "OFh7mvPO", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pla" + ], "chamber_temperature": [ "20" ], @@ -105,5 +108,11 @@ ], "slow_down_min_speed": [ "20" + ], + "filament_unloading_speed": [ + "60" + ], + "filament_unloading_speed_start": [ + "60" ] } diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @CORE One 0.6.json b/resources/profiles/Prusa/filament/Prusament rPLA @CORE One 0.6.json index adbf76e56d..0af7c24c5e 100644 --- a/resources/profiles/Prusa/filament/Prusament rPLA @CORE One 0.6.json +++ b/resources/profiles/Prusa/filament/Prusament rPLA @CORE One 0.6.json @@ -8,12 +8,16 @@ "instantiation": "true", "compatible_printers": [ "Prusa CORE One 0.6 nozzle", - "Prusa CORE One HF 0.6 nozzle" + "Prusa CORE One HF 0.6 nozzle", + "Prusa CORE One MMU3 0.6 nozzle" ], "filament_max_volumetric_speed": [ "14" ], "slow_down_layer_time": [ "15" + ], + "filament_cooling_final_speed": [ + "1.5" ] } diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @CORE One.json b/resources/profiles/Prusa/filament/Prusament rPLA @CORE One.json index 7f41ae32e4..73633d6044 100644 --- a/resources/profiles/Prusa/filament/Prusament rPLA @CORE One.json +++ b/resources/profiles/Prusa/filament/Prusament rPLA @CORE One.json @@ -7,6 +7,9 @@ "setting_id": "Bw6H4vFnq7YExyLd", "filament_id": "OFWRITFw", "instantiation": "true", + "include": [ + "fdm_filament_template_nextruder_pla" + ], "chamber_temperature": [ "20" ], @@ -22,8 +25,7 @@ "Prusa CORE One HF 0.5 nozzle", "Prusa CORE One MMU3 0.4 nozzle", "Prusa CORE One MMU3 0.25 nozzle", - "Prusa CORE One MMU3 0.3 nozzle", - "Prusa CORE One MMU3 0.6 nozzle" + "Prusa CORE One MMU3 0.3 nozzle" ], "fan_cooling_layer_time": [ "40" diff --git a/resources/profiles/Prusa/filament/fdm_filament_template_nextruder_pet.json b/resources/profiles/Prusa/filament/fdm_filament_template_nextruder_pet.json new file mode 100644 index 0000000000..ba12bb2e62 --- /dev/null +++ b/resources/profiles/Prusa/filament/fdm_filament_template_nextruder_pet.json @@ -0,0 +1,36 @@ +{ + "type": "filament", + "name": "fdm_filament_template_nextruder_pet", + "from": "system", + "instantiation": "false", + "filament_ramming_parameters": [ + "250 100 42.4194 42.4194 42.4194 42.4194 42.4194| 0.05 42.4387 0.45 42.4387 0.95 42.4387 1.45 42.4387 1.95 42.4387 2.45 42.4387 2.95 42.4387 3.45 42.4387 3.95 42.4387 4.45 42.4387 4.95 42.4387" + ], + "filament_loading_speed": [ + "10" + ], + "filament_loading_speed_start": [ + "50" + ], + "filament_unloading_speed": [ + "60" + ], + "filament_unloading_speed_start": [ + "60" + ], + "filament_cooling_moves": [ + "3" + ], + "filament_cooling_initial_speed": [ + "5" + ], + "filament_cooling_final_speed": [ + "2.5" + ], + "filament_stamping_distance": [ + "45" + ], + "filament_stamping_loading_speed": [ + "26.5" + ] +} diff --git a/resources/profiles/Prusa/filament/fdm_filament_template_nextruder_pet_hf.json b/resources/profiles/Prusa/filament/fdm_filament_template_nextruder_pet_hf.json new file mode 100644 index 0000000000..ba16fadbad --- /dev/null +++ b/resources/profiles/Prusa/filament/fdm_filament_template_nextruder_pet_hf.json @@ -0,0 +1,9 @@ +{ + "type": "filament", + "name": "fdm_filament_template_nextruder_pet_hf", + "from": "system", + "instantiation": "false", + "filament_ramming_parameters": [ + "250 100 42.4194 42.4194| 0.05 42.4387 0.45 42.4387 0.95 42.4387 1.45 42.4387 1.95 42.4387 2.45 42.4387 2.95 42.4387 3.45 42.4387 3.95 42.4387 4.45 42.4387 4.95 42.4387" + ] +} diff --git a/resources/profiles/Prusa/filament/fdm_filament_template_nextruder_pla.json b/resources/profiles/Prusa/filament/fdm_filament_template_nextruder_pla.json new file mode 100644 index 0000000000..d7b2a4b381 --- /dev/null +++ b/resources/profiles/Prusa/filament/fdm_filament_template_nextruder_pla.json @@ -0,0 +1,36 @@ +{ + "type": "filament", + "name": "fdm_filament_template_nextruder_pla", + "from": "system", + "instantiation": "false", + "filament_ramming_parameters": [ + "250 100 40.1613 40.3548 40.4516 40.3548 40.2581| 0.05 40.1483 0.45 40.3419 0.95 40.3419 1.45 40.3419 1.95 40.3419 2.45 40.3419 2.95 40.3419 3.45 40.3419 3.95 40.3419 4.45 40.3419 4.95 40.3419" + ], + "filament_loading_speed": [ + "10" + ], + "filament_loading_speed_start": [ + "50" + ], + "filament_unloading_speed": [ + "40" + ], + "filament_unloading_speed_start": [ + "30" + ], + "filament_cooling_moves": [ + "2" + ], + "filament_cooling_initial_speed": [ + "10" + ], + "filament_cooling_final_speed": [ + "3.5" + ], + "filament_stamping_distance": [ + "45" + ], + "filament_stamping_loading_speed": [ + "29" + ] +} diff --git a/resources/profiles/Prusa/filament/fdm_filament_template_nextruder_pla_hf.json b/resources/profiles/Prusa/filament/fdm_filament_template_nextruder_pla_hf.json new file mode 100644 index 0000000000..675668725c --- /dev/null +++ b/resources/profiles/Prusa/filament/fdm_filament_template_nextruder_pla_hf.json @@ -0,0 +1,9 @@ +{ + "type": "filament", + "name": "fdm_filament_template_nextruder_pla_hf", + "from": "system", + "instantiation": "false", + "filament_ramming_parameters": [ + "250 100 39.871 39.871| 0.05 39.9547 0.45 39.9547 0.95 39.9547 1.45 39.9547 1.95 39.9547 2.45 39.9547 2.95 39.9547 3.45 39.9547 3.95 39.9547 4.45 39.9547 4.95 39.9547" + ] +} diff --git a/resources/profiles/Prusa/machine/Prusa CORE One MMU3.json b/resources/profiles/Prusa/machine/Prusa CORE One MMU3.json index a9af70344e..fdbe0969df 100644 --- a/resources/profiles/Prusa/machine/Prusa CORE One MMU3.json +++ b/resources/profiles/Prusa/machine/Prusa CORE One MMU3.json @@ -3,7 +3,7 @@ "name": "Prusa CORE One MMU3", "bed_model": "coreone_bed.stl", "bed_texture": "coreone.svg", - "default_materials": "Generic ABS @Prusa CORE One;Generic ASA @Prusa CORE One;Generic PETG @Prusa CORE One;Generic PLA @Prusa CORE One;Generic PLA Silk @Prusa CORE One;Generic TPU @Prusa CORE One", + "default_materials": "Generic ABS @Prusa CORE One;Generic ASA @Prusa CORE One;Generic PETG @Prusa CORE One;Generic PLA @Prusa CORE One;Generic PLA Silk @Prusa CORE One;Generic TPU @Prusa CORE One;Generic PLA @Prusa CORE One 0.6", "family": "Prusa", "hotend_model": "", "machine_tech": "FFF",