ENH: add filament category

Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I0f31a376527bc540d27c49908712d08bdba3d719
This commit is contained in:
qing.zhang 2025-01-23 10:58:48 +08:00 committed by lane.wei
parent 22e3f08992
commit 3f2f704676
24 changed files with 69 additions and 3 deletions

View File

@ -1,7 +1,7 @@
{ {
"name": "Bambulab", "name": "Bambulab",
"url": "http://www.bambulab.com/Parameters/vendor/BBL.json", "url": "http://www.bambulab.com/Parameters/vendor/BBL.json",
"version": "02.00.00.23", "version": "02.00.00.24",
"force_update": "0", "force_update": "0",
"description": "the initial version of BBL configurations", "description": "the initial version of BBL configurations",
"machine_model_list": [ "machine_model_list": [

View File

@ -87,6 +87,9 @@
"textured_plate_temp_initial_layer": [ "textured_plate_temp_initial_layer": [
"100" "100"
], ],
"filament_category": [
"800"
],
"impact_strength_z":["4.5"], "impact_strength_z":["4.5"],
"filament_start_gcode": [ "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}" "; 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}"

View File

@ -32,5 +32,8 @@
], ],
"slow_down_layer_time": [ "slow_down_layer_time": [
"6" "6"
],
"filament_category": [
"703"
] ]
} }

View File

@ -30,6 +30,9 @@
"slow_down_layer_time": [ "slow_down_layer_time": [
"8" "8"
], ],
"filament_category": [
"702"
],
"filament_start_gcode": [ "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}" "; 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}"
] ]

View File

@ -56,5 +56,8 @@
], ],
"textured_plate_temp_initial_layer": [ "textured_plate_temp_initial_layer": [
"60" "60"
],
"filament_category": [
"705"
] ]
} }

View File

@ -35,5 +35,8 @@
], ],
"slow_down_layer_time": [ "slow_down_layer_time": [
"6" "6"
],
"filament_category": [
"701"
] ]
} }

View File

@ -30,6 +30,9 @@
"slow_down_layer_time": [ "slow_down_layer_time": [
"8" "8"
], ],
"filament_category": [
"700"
],
"filament_start_gcode": [ "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}" "; 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}"
] ]

View File

@ -38,5 +38,8 @@
], ],
"temperature_vitrification": [ "temperature_vitrification": [
"90" "90"
],
"filament_category": [
"706"
] ]
} }

View File

@ -83,6 +83,9 @@
"textured_plate_temp_initial_layer": [ "textured_plate_temp_initial_layer": [
"70" "70"
], ],
"filament_category": [
"800"
],
"filament_start_gcode": [ "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}" "; 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}"
] ]

View File

@ -4,5 +4,8 @@
"inherits": "fdm_filament_bvoh", "inherits": "fdm_filament_bvoh",
"from": "system", "from": "system",
"filament_id": "GFS97", "filament_id": "GFS97",
"instantiation": "false" "instantiation": "false",
"filament_category": [
"797"
]
} }

View File

@ -29,6 +29,9 @@
"temperature_vitrification": [ "temperature_vitrification": [
"70" "70"
], ],
"filament_category": [
"901"
],
"filament_start_gcode": [ "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}" "; 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}"
] ]

View File

@ -32,6 +32,9 @@
"temperature_vitrification": [ "temperature_vitrification": [
"70" "70"
], ],
"filament_category": [
"901"
],
"filament_start_gcode": [ "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}" "; 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}"
] ]

View File

@ -85,6 +85,9 @@
"textured_plate_temp_initial_layer": [ "textured_plate_temp_initial_layer": [
"90" "90"
], ],
"filament_category": [
"200"
],
"filament_end_gcode": [ "filament_end_gcode": [
"; filament end gcode \n\n" "; filament end gcode \n\n"
] ]

View File

@ -85,6 +85,9 @@
"textured_plate_temp_initial_layer": [ "textured_plate_temp_initial_layer": [
"90" "90"
], ],
"filament_category": [
"200"
],
"filament_end_gcode": [ "filament_end_gcode": [
"; filament end gcode \n\n" "; filament end gcode \n\n"
], ],

View File

@ -82,6 +82,9 @@
"textured_plate_temp_initial_layer": [ "textured_plate_temp_initial_layer": [
"90" "90"
], ],
"filament_category": [
"798"
],
"filament_end_gcode": [ "filament_end_gcode": [
"; filament end gcode \n\n" "; filament end gcode \n\n"
] ]

View File

@ -85,6 +85,9 @@
"textured_plate_temp_initial_layer": [ "textured_plate_temp_initial_layer": [
"100" "100"
], ],
"filament_category": [
"400"
],
"filament_end_gcode": [ "filament_end_gcode": [
"; filament end gcode \n\n" "; filament end gcode \n\n"
] ]

View File

@ -85,6 +85,9 @@
"textured_plate_temp_initial_layer": [ "textured_plate_temp_initial_layer": [
"110" "110"
], ],
"filament_category": [
"500"
],
"filament_end_gcode": [ "filament_end_gcode": [
"; filament end gcode \n\n" "; filament end gcode \n\n"
] ]

View File

@ -64,6 +64,9 @@
"textured_plate_temp_initial_layer": [ "textured_plate_temp_initial_layer": [
"80" "80"
], ],
"filament_category": [
"300"
],
"filament_start_gcode": [ "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}" "; 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}"
], ],

View File

@ -76,6 +76,9 @@
"textured_plate_temp_initial_layer": [ "textured_plate_temp_initial_layer": [
"55" "55"
], ],
"filament_category": [
"100"
],
"impact_strength_z":["10.0"], "impact_strength_z":["10.0"],
"filament_start_gcode": [ "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}" "; 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}"

View File

@ -85,6 +85,9 @@
"textured_plate_temp_initial_layer": [ "textured_plate_temp_initial_layer": [
"55" "55"
], ],
"filament_category": [
"902"
],
"filament_start_gcode": [ "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}" "; 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}"
], ],

View File

@ -82,6 +82,9 @@
"textured_plate_temp_initial_layer": [ "textured_plate_temp_initial_layer": [
"110" "110"
], ],
"filament_category": [
"801"
],
"filament_end_gcode": [ "filament_end_gcode": [
"; filament end gcode \n\n" "; filament end gcode \n\n"
] ]

View File

@ -85,6 +85,9 @@
"textured_plate_temp_initial_layer": [ "textured_plate_temp_initial_layer": [
"55" "55"
], ],
"filament_category": [
"704"
],
"filament_start_gcode": [ "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}" "; 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}"
], ],

View File

@ -79,6 +79,9 @@
"textured_plate_temp_initial_layer": [ "textured_plate_temp_initial_layer": [
"35" "35"
], ],
"filament_category": [
"600"
],
"filament_start_gcode": [ "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}" "; 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}"
], ],

View File

@ -1755,7 +1755,7 @@ void PrintConfigDef::init_fff_params()
def->label = L("Category"); def->label = L("Category");
def->tooltip = L("Filament category"); def->tooltip = L("Filament category");
def->min = 0; def->min = 0;
def->mode = comAdvanced; def->mode = comDevelop;
def->set_default_value(new ConfigOptionInts{0}); def->set_default_value(new ConfigOptionInts{0});
def = this->add("filament_density", coFloats); def = this->add("filament_density", coFloats);