diff --git a/resources/profiles/Prusa.json b/resources/profiles/Prusa.json index 017630afc7..e019ada90b 100644 --- a/resources/profiles/Prusa.json +++ b/resources/profiles/Prusa.json @@ -893,6 +893,10 @@ "name": "fdm_filament_pa11cf", "sub_path": "filament/fdm_filament_pa11cf.json" }, + { + "name": "fdm_filament_flex", + "sub_path": "filament/fdm_filament_flex.json" + }, { "name": "Prusa Generic PLA", "sub_path": "filament/Prusa Generic PLA.json" @@ -997,6 +1001,14 @@ "name": "Prusa Generic TPU @MINIIS", "sub_path": "filament/Prusa Generic TPU @MINIIS.json" }, + { + "name": "Prusa Generic FLEX @XL", + "sub_path": "filament/Prusa Generic FLEX @XL.json" + }, + { + "name": "Prusa Generic FLEX @XL 5T", + "sub_path": "filament/Prusa Generic FLEX @XL 5T.json" + }, { "name": "Prusa Generic ASA", "sub_path": "filament/Prusa Generic ASA.json" diff --git a/resources/profiles/Prusa/Prusa XL.svg b/resources/profiles/Prusa/Prusa XL.svg index 4ebe0c97ed..eed839c6a9 100644 --- a/resources/profiles/Prusa/Prusa XL.svg +++ b/resources/profiles/Prusa/Prusa XL.svg @@ -1,17 +1 @@ - - - - - + \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic FLEX @XL 5T.json b/resources/profiles/Prusa/filament/Prusa Generic FLEX @XL 5T.json new file mode 100644 index 0000000000..0365f748f3 --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic FLEX @XL 5T.json @@ -0,0 +1,35 @@ +{ + "type": "filament", + "setting_id": "GFSA04", + "name": "Prusa Generic FLEX @XL 5T", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_flex", + "filament_loading_speed_start": "3", + "filament_loading_speed": "28", + "filament_unloading_speed_start": "100", + "filament_unloading_speed": "90", + "filament_load_time": "0", + "filament_unload_time": "0", + "filament_cooling_moves": "4", + "filament_cooling_initial_speed": "2.2", + "filament_cooling_final_speed": "3.4", + "filament_retract_lift_below": "0.6", + "filament_multitool_ramming": [ + "0" + ], + "filament_multitool_ramming_volume": [ + "40" + ], + "filament_multitool_ramming_flow": [ + "2.5" + ], + "compatible_printers": [ + "Prusa XL 5T 0.25 nozzle", + "Prusa XL 5T 0.3 nozzle", + "Prusa XL 5T 0.4 nozzle", + "Prusa XL 5T 0.5 nozzle", + "Prusa XL 5T 0.6 nozzle", + "Prusa XL 5T 0.8 nozzle" + ] +} diff --git a/resources/profiles/Prusa/filament/Prusa Generic FLEX @XL.json b/resources/profiles/Prusa/filament/Prusa Generic FLEX @XL.json new file mode 100644 index 0000000000..c3883b61bb --- /dev/null +++ b/resources/profiles/Prusa/filament/Prusa Generic FLEX @XL.json @@ -0,0 +1,35 @@ +{ + "type": "filament", + "setting_id": "GFSA04", + "name": "Prusa Generic FLEX @XL", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_flex", + "filament_loading_speed_start": "3", + "filament_loading_speed": "28", + "filament_unloading_speed_start": "100", + "filament_unloading_speed": "90", + "filament_load_time": "0", + "filament_unload_time": "0", + "filament_cooling_moves": "4", + "filament_cooling_initial_speed": "2.2", + "filament_cooling_final_speed": "3.4", + "filament_retract_lift_below": "0.6", + "filament_multitool_ramming": [ + "0" + ], + "filament_multitool_ramming_volume": [ + "40" + ], + "filament_multitool_ramming_flow": [ + "2.5" + ], + "compatible_printers": [ + "Prusa XL 0.25 nozzle", + "Prusa XL 0.3 nozzle", + "Prusa XL 0.4 nozzle", + "Prusa XL 0.5 nozzle", + "Prusa XL 0.6 nozzle", + "Prusa XL 0.8 nozzle" + ] +} diff --git a/resources/profiles/Prusa/filament/fdm_filament_flex.json b/resources/profiles/Prusa/filament/fdm_filament_flex.json new file mode 100644 index 0000000000..c69f9206ef --- /dev/null +++ b/resources/profiles/Prusa/filament/fdm_filament_flex.json @@ -0,0 +1,76 @@ +{ + "type": "filament", + "name": "fdm_filament_flex", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "filament_id": "GFU99", + "hot_plate_temp_initial_layer" : [ + "50" + ], + "hot_plate_temp" : [ + "50" + ], + "fan_cooling_layer_time": [ + "100" + ], + "filament_max_volumetric_speed": [ + "2.5" + ], + "filament_type": [ + "FLEX" + ], + "filament_density": [ + "1.22" + ], + "filament_cost": [ + "20" + ], + "filament_retraction_length": [ + "2.5" + ], + "filament_retraction_speed": [ + "60" + ], + "filament_deretraction_speed": [ + "20" + ], + "filament_retraction_minimum_travel": [ + "2" + ], + "filament_wipe": "0", + "idle_temperature": "70", + "nozzle_temperature_initial_layer": [ + "230" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "30" + ], + "overhang_fan_speed": [ + "80" + ], + "additional_cooling_fan_speed": [ + "70" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "nozzle_temperature": [ + "230" + ], + "filament_start_gcode": [ + "M900 K0 ; Filament gcode\n\nM142 S36 ; set heatbreak target temp" + ], + "filament_end_gcode": [ + "; Filament-specific end gcode" + ] +} diff --git a/resources/profiles/Prusa/machine/Prusa XL 0.3 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 0.3 nozzle.json index b678114c03..d0c7bccead 100644 --- a/resources/profiles/Prusa/machine/Prusa XL 0.3 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 0.3 nozzle.json @@ -4,7 +4,7 @@ "name": "Prusa XL 0.3 nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_machine_common", + "inherits": "fdm_machine_common_xl", "gcode_flavor": "marlin2", "printer_model": "Prusa XL", "default_filament_profile": "Prusa Generic PLA @XL", diff --git a/resources/profiles/Prusa/machine/Prusa XL 5T 0.25 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 5T 0.25 nozzle.json index 2fc6b341b5..a61555bf9f 100644 --- a/resources/profiles/Prusa/machine/Prusa XL 5T 0.25 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 5T 0.25 nozzle.json @@ -10,6 +10,8 @@ "default_filament_profile": "Prusa Generic PLA @XL 5T", "default_print_profile": "0.15mm Speed @Prusa XL 5T 0.25", "printer_variant": "0.25", + "max_layer_height": "0.15", + "min_layer_height": "0.05", "nozzle_diameter": [ "0.25", "0.25", diff --git a/resources/profiles/Prusa/machine/Prusa XL 5T 0.3 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 5T 0.3 nozzle.json index a495d26349..99e42ae4e3 100644 --- a/resources/profiles/Prusa/machine/Prusa XL 5T 0.3 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 5T 0.3 nozzle.json @@ -10,6 +10,8 @@ "default_filament_profile": "Prusa Generic PLA @XL 5T", "default_print_profile": "0.20mm Speed @Prusa XL 5T 0.3", "printer_variant": "0.3", + "max_layer_height": "0.22", + "min_layer_height": "0.05", "nozzle_diameter": [ "0.3", "0.3", diff --git a/resources/profiles/Prusa/machine/Prusa XL 5T 0.5 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 5T 0.5 nozzle.json index 69e355ea2f..f7e51b0848 100644 --- a/resources/profiles/Prusa/machine/Prusa XL 5T 0.5 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 5T 0.5 nozzle.json @@ -10,6 +10,7 @@ "default_filament_profile": "Prusa Generic PLA @XL 5T", "default_print_profile": "0.25mm Speed @Prusa XL 5T 0.5", "printer_variant": "0.5", + "max_layer_height": "0.32", "nozzle_diameter": [ "0.5", "0.5", diff --git a/resources/profiles/Prusa/machine/Prusa XL 5T 0.6 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 5T 0.6 nozzle.json index 03ef5d97ff..7961d12142 100644 --- a/resources/profiles/Prusa/machine/Prusa XL 5T 0.6 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 5T 0.6 nozzle.json @@ -10,6 +10,8 @@ "default_filament_profile": "Prusa Generic PLA @XL 5T", "default_print_profile": "0.32mm Speed @Prusa XL 5T 0.6", "printer_variant": "0.6", + "max_layer_height": "0.4", + "min_layer_height": "0.15", "nozzle_diameter": [ "0.6", "0.6", diff --git a/resources/profiles/Prusa/machine/Prusa XL 5T 0.8 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 5T 0.8 nozzle.json index 27656c4072..6249fac5aa 100644 --- a/resources/profiles/Prusa/machine/Prusa XL 5T 0.8 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 5T 0.8 nozzle.json @@ -10,6 +10,8 @@ "default_filament_profile": "Prusa Generic PLA @XL 5T", "default_print_profile": "0.40mm Quality @Prusa XL 5T 0.8", "printer_variant": "0.8", + "max_layer_height": "0.6", + "min_layer_height": "0.2", "nozzle_diameter": [ "0.8", "0.8", diff --git a/resources/profiles/Prusa/machine/Prusa XL 5T.json b/resources/profiles/Prusa/machine/Prusa XL 5T.json index 81486d711a..cc5ece5183 100644 --- a/resources/profiles/Prusa/machine/Prusa XL 5T.json +++ b/resources/profiles/Prusa/machine/Prusa XL 5T.json @@ -8,5 +8,5 @@ "bed_model": "Prusa XL_bed.stl", "bed_texture": "Prusa XL.svg", "hotend_model": "", - "default_materials": "Prusa Generic PLA @XL 5T;Prusament PLA @XL 5T;Prusament rPLA @XL 5T;Prusa Generic PETG @XL 5T;Prusament PETG @XL 5T;Prusa Generic ABS @XL 5T;Prusament ASA @XL 5T;Prusament PC Blend @XL 5T;Prusament PC-CF @XL 5T;Prusament PVB @XL 5T;Prusament PA-CF @XL 5T" + "default_materials": "Prusa Generic PLA @XL 5T;Prusament PLA @XL 5T;Prusament rPLA @XL 5T;Prusa Generic PETG @XL 5T;Prusament PETG @XL 5T;Prusa Generic ABS @XL 5T;Prusament ASA @XL 5T;Prusament PC Blend @XL 5T;Prusament PC-CF @XL 5T;Prusament PVB @XL 5T;Prusament PA-CF @XL 5T;Prusa Generic FLEX @XL 5T" } diff --git a/resources/profiles/Prusa/machine/Prusa XL.json b/resources/profiles/Prusa/machine/Prusa XL.json index eb8487609c..4525a02841 100644 --- a/resources/profiles/Prusa/machine/Prusa XL.json +++ b/resources/profiles/Prusa/machine/Prusa XL.json @@ -8,5 +8,5 @@ "bed_model": "Prusa XL_bed.stl", "bed_texture": "Prusa XL.svg", "hotend_model": "", - "default_materials": "Prusa Generic PLA @XL;Prusament PLA @XL;Prusament rPLA @XL;Prusa Generic PETG @XL;Prusament PETG @XL;Prusa Generic ABS @XL;Prusament ASA @XL;Prusament PC Blend @XL;Prusament PC-CF @XL;Prusament PVB @XL;Prusament PA-CF @XL" + "default_materials": "Prusa Generic PLA @XL;Prusament PLA @XL;Prusament rPLA @XL;Prusa Generic PETG @XL;Prusament PETG @XL;Prusa Generic ABS @XL;Prusament ASA @XL;Prusament PC Blend @XL;Prusament PC-CF @XL;Prusament PVB @XL;Prusament PA-CF @XL;Prusa Generic FLEX @XL" } diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index cbc4560a27..3e07459566 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -2223,6 +2223,7 @@ void PrintConfigDef::init_fff_params() def->enum_values.push_back("BVOH"); def->enum_values.push_back("PCTG"); def->enum_values.push_back("EVA"); + def->enum_values.push_back("FLEX"); def->enum_values.push_back("HIPS"); def->enum_values.push_back("PA"); def->enum_values.push_back("PA-CF");