From 3f2f704676f0a8a6cf1e43e8b32fd999bcc59d31 Mon Sep 17 00:00:00 2001 From: "qing.zhang" Date: Thu, 23 Jan 2025 10:58:48 +0800 Subject: [PATCH] ENH: add filament category Jira: none Signed-off-by: qing.zhang Change-Id: I0f31a376527bc540d27c49908712d08bdba3d719 --- resources/profiles/BBL.json | 2 +- resources/profiles/BBL/filament/Bambu PET-CF @base.json | 3 +++ .../BBL/filament/Bambu Support For PA PET @base.json | 3 +++ .../profiles/BBL/filament/Bambu Support For PLA @base.json | 3 +++ .../BBL/filament/Bambu Support For PLA-PETG @base.json | 3 +++ resources/profiles/BBL/filament/Bambu Support G @base.json | 3 +++ resources/profiles/BBL/filament/Bambu Support W @base.json | 3 +++ .../profiles/BBL/filament/Bambu Support for ABS @base.json | 3 +++ resources/profiles/BBL/filament/Fiberon PET-CF @base.json | 3 +++ resources/profiles/BBL/filament/Generic BVOH @base.json | 5 ++++- resources/profiles/BBL/filament/Generic PE @base.json | 3 +++ resources/profiles/BBL/filament/Generic PE-CF @base.json | 3 +++ resources/profiles/BBL/filament/fdm_filament_abs.json | 3 +++ resources/profiles/BBL/filament/fdm_filament_asa.json | 3 +++ resources/profiles/BBL/filament/fdm_filament_hips.json | 3 +++ resources/profiles/BBL/filament/fdm_filament_pa.json | 3 +++ resources/profiles/BBL/filament/fdm_filament_pc.json | 3 +++ resources/profiles/BBL/filament/fdm_filament_pet.json | 3 +++ resources/profiles/BBL/filament/fdm_filament_pla.json | 3 +++ resources/profiles/BBL/filament/fdm_filament_pp.json | 3 +++ resources/profiles/BBL/filament/fdm_filament_pps.json | 3 +++ resources/profiles/BBL/filament/fdm_filament_pva.json | 3 +++ resources/profiles/BBL/filament/fdm_filament_tpu.json | 3 +++ src/libslic3r/PrintConfig.cpp | 2 +- 24 files changed, 69 insertions(+), 3 deletions(-) diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json index 5ba22b54c..28fe42010 100644 --- a/resources/profiles/BBL.json +++ b/resources/profiles/BBL.json @@ -1,7 +1,7 @@ { "name": "Bambulab", "url": "http://www.bambulab.com/Parameters/vendor/BBL.json", - "version": "02.00.00.23", + "version": "02.00.00.24", "force_update": "0", "description": "the initial version of BBL configurations", "machine_model_list": [ diff --git a/resources/profiles/BBL/filament/Bambu PET-CF @base.json b/resources/profiles/BBL/filament/Bambu PET-CF @base.json index 16344d042..5dc7f5cc7 100644 --- a/resources/profiles/BBL/filament/Bambu PET-CF @base.json +++ b/resources/profiles/BBL/filament/Bambu PET-CF @base.json @@ -87,6 +87,9 @@ "textured_plate_temp_initial_layer": [ "100" ], + "filament_category": [ + "800" + ], "impact_strength_z":["4.5"], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" diff --git a/resources/profiles/BBL/filament/Bambu Support For PA PET @base.json b/resources/profiles/BBL/filament/Bambu Support For PA PET @base.json index 3166617d7..41763092d 100644 --- a/resources/profiles/BBL/filament/Bambu Support For PA PET @base.json +++ b/resources/profiles/BBL/filament/Bambu Support For PA PET @base.json @@ -32,5 +32,8 @@ ], "slow_down_layer_time": [ "6" + ], + "filament_category": [ + "703" ] } \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Bambu Support For PLA @base.json b/resources/profiles/BBL/filament/Bambu Support For PLA @base.json index 7868741da..e326a1738 100644 --- a/resources/profiles/BBL/filament/Bambu Support For PLA @base.json +++ b/resources/profiles/BBL/filament/Bambu Support For PLA @base.json @@ -30,6 +30,9 @@ "slow_down_layer_time": [ "8" ], + "filament_category": [ + "702" + ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] diff --git a/resources/profiles/BBL/filament/Bambu Support For PLA-PETG @base.json b/resources/profiles/BBL/filament/Bambu Support For PLA-PETG @base.json index 6eae3684b..9462afaa3 100644 --- a/resources/profiles/BBL/filament/Bambu Support For PLA-PETG @base.json +++ b/resources/profiles/BBL/filament/Bambu Support For PLA-PETG @base.json @@ -56,5 +56,8 @@ ], "textured_plate_temp_initial_layer": [ "60" + ], + "filament_category": [ + "705" ] } \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Bambu Support G @base.json b/resources/profiles/BBL/filament/Bambu Support G @base.json index 7a60603ca..c3973642a 100644 --- a/resources/profiles/BBL/filament/Bambu Support G @base.json +++ b/resources/profiles/BBL/filament/Bambu Support G @base.json @@ -35,5 +35,8 @@ ], "slow_down_layer_time": [ "6" + ], + "filament_category": [ + "701" ] } \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Bambu Support W @base.json b/resources/profiles/BBL/filament/Bambu Support W @base.json index 2b40b44e0..58775b59d 100644 --- a/resources/profiles/BBL/filament/Bambu Support W @base.json +++ b/resources/profiles/BBL/filament/Bambu Support W @base.json @@ -30,6 +30,9 @@ "slow_down_layer_time": [ "8" ], + "filament_category": [ + "700" + ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] diff --git a/resources/profiles/BBL/filament/Bambu Support for ABS @base.json b/resources/profiles/BBL/filament/Bambu Support for ABS @base.json index 67d9ac55e..58c5f39b8 100644 --- a/resources/profiles/BBL/filament/Bambu Support for ABS @base.json +++ b/resources/profiles/BBL/filament/Bambu Support for ABS @base.json @@ -38,5 +38,8 @@ ], "temperature_vitrification": [ "90" + ], + "filament_category": [ + "706" ] } \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Fiberon PET-CF @base.json b/resources/profiles/BBL/filament/Fiberon PET-CF @base.json index 7836f5cc1..dab61c501 100644 --- a/resources/profiles/BBL/filament/Fiberon PET-CF @base.json +++ b/resources/profiles/BBL/filament/Fiberon PET-CF @base.json @@ -83,6 +83,9 @@ "textured_plate_temp_initial_layer": [ "70" ], + "filament_category": [ + "800" + ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] diff --git a/resources/profiles/BBL/filament/Generic BVOH @base.json b/resources/profiles/BBL/filament/Generic BVOH @base.json index 34b3d72d1..ca35ccbcb 100644 --- a/resources/profiles/BBL/filament/Generic BVOH @base.json +++ b/resources/profiles/BBL/filament/Generic BVOH @base.json @@ -4,5 +4,8 @@ "inherits": "fdm_filament_bvoh", "from": "system", "filament_id": "GFS97", - "instantiation": "false" + "instantiation": "false", + "filament_category": [ + "797" + ] } \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Generic PE @base.json b/resources/profiles/BBL/filament/Generic PE @base.json index c93659062..8826da3d5 100644 --- a/resources/profiles/BBL/filament/Generic PE @base.json +++ b/resources/profiles/BBL/filament/Generic PE @base.json @@ -29,6 +29,9 @@ "temperature_vitrification": [ "70" ], + "filament_category": [ + "901" + ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] diff --git a/resources/profiles/BBL/filament/Generic PE-CF @base.json b/resources/profiles/BBL/filament/Generic PE-CF @base.json index 929d738ff..7ae0dc835 100644 --- a/resources/profiles/BBL/filament/Generic PE-CF @base.json +++ b/resources/profiles/BBL/filament/Generic PE-CF @base.json @@ -32,6 +32,9 @@ "temperature_vitrification": [ "70" ], + "filament_category": [ + "901" + ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ] diff --git a/resources/profiles/BBL/filament/fdm_filament_abs.json b/resources/profiles/BBL/filament/fdm_filament_abs.json index 3804df168..efe57c701 100644 --- a/resources/profiles/BBL/filament/fdm_filament_abs.json +++ b/resources/profiles/BBL/filament/fdm_filament_abs.json @@ -85,6 +85,9 @@ "textured_plate_temp_initial_layer": [ "90" ], + "filament_category": [ + "200" + ], "filament_end_gcode": [ "; filament end gcode \n\n" ] diff --git a/resources/profiles/BBL/filament/fdm_filament_asa.json b/resources/profiles/BBL/filament/fdm_filament_asa.json index 681051ba5..7ca66ba6d 100644 --- a/resources/profiles/BBL/filament/fdm_filament_asa.json +++ b/resources/profiles/BBL/filament/fdm_filament_asa.json @@ -85,6 +85,9 @@ "textured_plate_temp_initial_layer": [ "90" ], + "filament_category": [ + "200" + ], "filament_end_gcode": [ "; filament end gcode \n\n" ], diff --git a/resources/profiles/BBL/filament/fdm_filament_hips.json b/resources/profiles/BBL/filament/fdm_filament_hips.json index 39a4ceb9a..b2482996d 100644 --- a/resources/profiles/BBL/filament/fdm_filament_hips.json +++ b/resources/profiles/BBL/filament/fdm_filament_hips.json @@ -82,6 +82,9 @@ "textured_plate_temp_initial_layer": [ "90" ], + "filament_category": [ + "798" + ], "filament_end_gcode": [ "; filament end gcode \n\n" ] diff --git a/resources/profiles/BBL/filament/fdm_filament_pa.json b/resources/profiles/BBL/filament/fdm_filament_pa.json index 213987dc3..546ad0528 100644 --- a/resources/profiles/BBL/filament/fdm_filament_pa.json +++ b/resources/profiles/BBL/filament/fdm_filament_pa.json @@ -85,6 +85,9 @@ "textured_plate_temp_initial_layer": [ "100" ], + "filament_category": [ + "400" + ], "filament_end_gcode": [ "; filament end gcode \n\n" ] diff --git a/resources/profiles/BBL/filament/fdm_filament_pc.json b/resources/profiles/BBL/filament/fdm_filament_pc.json index 1190d25db..49f257fc4 100644 --- a/resources/profiles/BBL/filament/fdm_filament_pc.json +++ b/resources/profiles/BBL/filament/fdm_filament_pc.json @@ -85,6 +85,9 @@ "textured_plate_temp_initial_layer": [ "110" ], + "filament_category": [ + "500" + ], "filament_end_gcode": [ "; filament end gcode \n\n" ] diff --git a/resources/profiles/BBL/filament/fdm_filament_pet.json b/resources/profiles/BBL/filament/fdm_filament_pet.json index 690de5489..efcad4f15 100644 --- a/resources/profiles/BBL/filament/fdm_filament_pet.json +++ b/resources/profiles/BBL/filament/fdm_filament_pet.json @@ -64,6 +64,9 @@ "textured_plate_temp_initial_layer": [ "80" ], + "filament_category": [ + "300" + ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S180\n{elsif (bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S255\n{endif};Prevent PLA from jamming\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ], diff --git a/resources/profiles/BBL/filament/fdm_filament_pla.json b/resources/profiles/BBL/filament/fdm_filament_pla.json index 94fbdb08f..9ac244048 100644 --- a/resources/profiles/BBL/filament/fdm_filament_pla.json +++ b/resources/profiles/BBL/filament/fdm_filament_pla.json @@ -76,6 +76,9 @@ "textured_plate_temp_initial_layer": [ "55" ], + "filament_category": [ + "100" + ], "impact_strength_z":["10.0"], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" diff --git a/resources/profiles/BBL/filament/fdm_filament_pp.json b/resources/profiles/BBL/filament/fdm_filament_pp.json index cc6a6178b..9bda61f8d 100644 --- a/resources/profiles/BBL/filament/fdm_filament_pp.json +++ b/resources/profiles/BBL/filament/fdm_filament_pp.json @@ -85,6 +85,9 @@ "textured_plate_temp_initial_layer": [ "55" ], + "filament_category": [ + "902" + ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ], diff --git a/resources/profiles/BBL/filament/fdm_filament_pps.json b/resources/profiles/BBL/filament/fdm_filament_pps.json index 6f7a15a7a..4c9f5f05c 100644 --- a/resources/profiles/BBL/filament/fdm_filament_pps.json +++ b/resources/profiles/BBL/filament/fdm_filament_pps.json @@ -82,6 +82,9 @@ "textured_plate_temp_initial_layer": [ "110" ], + "filament_category": [ + "801" + ], "filament_end_gcode": [ "; filament end gcode \n\n" ] diff --git a/resources/profiles/BBL/filament/fdm_filament_pva.json b/resources/profiles/BBL/filament/fdm_filament_pva.json index 105a7dd86..2ef17b828 100644 --- a/resources/profiles/BBL/filament/fdm_filament_pva.json +++ b/resources/profiles/BBL/filament/fdm_filament_pva.json @@ -85,6 +85,9 @@ "textured_plate_temp_initial_layer": [ "55" ], + "filament_category": [ + "704" + ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ], diff --git a/resources/profiles/BBL/filament/fdm_filament_tpu.json b/resources/profiles/BBL/filament/fdm_filament_tpu.json index fd86b52e3..d80217ea6 100644 --- a/resources/profiles/BBL/filament/fdm_filament_tpu.json +++ b/resources/profiles/BBL/filament/fdm_filament_tpu.json @@ -79,6 +79,9 @@ "textured_plate_temp_initial_layer": [ "35" ], + "filament_category": [ + "600" + ], "filament_start_gcode": [ "; filament start gcode\n{if (bed_temperature[current_extruder] >35)||(bed_temperature_initial_layer[current_extruder] >35)}M106 P3 S255\n{elsif(bed_temperature[current_extruder] >30)||(bed_temperature_initial_layer[current_extruder] >30)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}" ], diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 3b0cfc3ef..ec5d491e6 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1755,7 +1755,7 @@ void PrintConfigDef::init_fff_params() def->label = L("Category"); def->tooltip = L("Filament category"); def->min = 0; - def->mode = comAdvanced; + def->mode = comDevelop; def->set_default_value(new ConfigOptionInts{0}); def = this->add("filament_density", coFloats);