From 2d40511488911e758e527b0e8cf77f43233161c3 Mon Sep 17 00:00:00 2001 From: "xun.zhang" Date: Tue, 5 Sep 2023 00:03:07 +0800 Subject: [PATCH] ENH: add filament PPA-GF 1.Add filament Generic PPA-GF 2.Set Generic PPA-CF filament type to PPA-CF jira: STUDIO-3518 Change-Id: I1b81bca3774944aebdf15f88213fcb9b36b93e41 --- resources/profiles/BBL.json | 28 ++++++ .../BBL/filament/Generic PPA-CF @BBL X1C.json | 25 +++++ .../BBL/filament/Generic PPA-CF @BBL X1E.json | 19 ++++ .../BBL/filament/Generic PPA-CF @base.json | 17 ++++ .../BBL/filament/Generic PPA-GF @BBL X1C.json | 31 +++++++ .../BBL/filament/Generic PPA-GF @BBL X1E.json | 25 +++++ .../BBL/filament/Generic PPA-GF @base.json | 17 ++++ .../BBL/filament/fdm_filament_ppa.json | 91 +++++++++++++++++++ src/libslic3r/PrintConfig.cpp | 2 + 9 files changed, 255 insertions(+) create mode 100644 resources/profiles/BBL/filament/Generic PPA-CF @BBL X1C.json create mode 100644 resources/profiles/BBL/filament/Generic PPA-CF @BBL X1E.json create mode 100644 resources/profiles/BBL/filament/Generic PPA-CF @base.json create mode 100644 resources/profiles/BBL/filament/Generic PPA-GF @BBL X1C.json create mode 100644 resources/profiles/BBL/filament/Generic PPA-GF @BBL X1E.json create mode 100644 resources/profiles/BBL/filament/Generic PPA-GF @base.json create mode 100644 resources/profiles/BBL/filament/fdm_filament_ppa.json diff --git a/resources/profiles/BBL.json b/resources/profiles/BBL.json index 4cec3bd1e0..62a310ac86 100644 --- a/resources/profiles/BBL.json +++ b/resources/profiles/BBL.json @@ -401,6 +401,10 @@ "name": "fdm_filament_pps", "sub_path": "filament/fdm_filament_pps.json" }, + { + "name": "fdm_filament_ppa", + "sub_path": "filament/fdm_filament_ppa.json" + }, { "name": "Bambu PLA Matte @base", "sub_path": "filament/Bambu PLA Matte @base.json" @@ -605,6 +609,14 @@ "name": "Generic PPS @base", "sub_path": "filament/Generic PPS @base.json" }, + { + "name": "Generic PPA-CF @base", + "sub_path": "filament/Generic PPA-CF @base.json" + }, + { + "name": "Generic PPA-GF @base", + "sub_path": "filament/Generic PPA-GF @base.json" + }, { "name": "Bambu PLA Matte @BBL X1C", "sub_path": "filament/Bambu PLA Matte @BBL X1C.json" @@ -1357,6 +1369,22 @@ "name": "Generic PPS @BBL X1E", "sub_path": "filament/Generic PPS @BBL X1E.json" }, + { + "name": "Generic PPA-CF @BBL X1E", + "sub_path": "filament/Generic PPA-CF @BBL X1E.json" + }, + { + "name": "Generic PPA-CF @BBL X1C", + "sub_path": "filament/Generic PPA-CF @BBL X1C.json" + }, + { + "name": "Generic PPA-GF @BBL X1C", + "sub_path": "filament/Generic PPA-GF @BBL X1C.json" + }, + { + "name": "Generic PPA-GF @BBL X1E", + "sub_path": "filament/Generic PPA-GF @BBL X1E.json" + }, { "name": "PolyTerra PLA @BBL X1C 0.2 nozzle", "sub_path": "filament/PolyTerra PLA @BBL X1C 0.2 nozzle.json" diff --git a/resources/profiles/BBL/filament/Generic PPA-CF @BBL X1C.json b/resources/profiles/BBL/filament/Generic PPA-CF @BBL X1C.json new file mode 100644 index 0000000000..2df7f15255 --- /dev/null +++ b/resources/profiles/BBL/filament/Generic PPA-CF @BBL X1C.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Generic PPA-CF @BBL X1C", + "inherits": "Generic PPA-CF @base", + "from": "system", + "setting_id": "GFSN97_00", + "instantiation": "true", + "filament_type": [ + "PPA-CF" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 0.8 nozzle", + "Bambu Lab X1 0.6 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.8 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Generic PPA-CF @BBL X1E.json b/resources/profiles/BBL/filament/Generic PPA-CF @BBL X1E.json new file mode 100644 index 0000000000..b032627561 --- /dev/null +++ b/resources/profiles/BBL/filament/Generic PPA-CF @BBL X1E.json @@ -0,0 +1,19 @@ +{ + "type": "filament", + "name": "Generic PPA-CF @BBL X1E", + "inherits": "Generic PPA-CF @base", + "from": "system", + "setting_id": "GFSN97_01", + "instantiation": "true", + "chamber_temperatures": [ + "60" + ], + "filament_type": [ + "PPA-CF" + ], + "compatible_printers": [ + "Bambu Lab X1E 0.4 nozzle", + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Generic PPA-CF @base.json b/resources/profiles/BBL/filament/Generic PPA-CF @base.json new file mode 100644 index 0000000000..1e642929b2 --- /dev/null +++ b/resources/profiles/BBL/filament/Generic PPA-CF @base.json @@ -0,0 +1,17 @@ +{ + "type": "filament", + "name": "Generic PPA-CF @base", + "inherits": "fdm_filament_ppa", + "from": "system", + "filament_id": "GFN97", + "instantiation": "false", + "filament_max_volumetric_speed": [ + "6" + ], + "filament_type": [ + "PPA-CF" + ], + "filament_vendor": [ + "Generic" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Generic PPA-GF @BBL X1C.json b/resources/profiles/BBL/filament/Generic PPA-GF @BBL X1C.json new file mode 100644 index 0000000000..39cd2763d9 --- /dev/null +++ b/resources/profiles/BBL/filament/Generic PPA-GF @BBL X1C.json @@ -0,0 +1,31 @@ +{ + "type": "filament", + "name": "Generic PPA-GF @BBL X1C", + "inherits": "Generic PPA-GF @base", + "from": "system", + "setting_id": "GFSN96_00", + "instantiation": "true", + "filament_max_volumetric_speed": [ + "8" + ], + "filament_type": [ + "PPA-GF" + ], + "filament_vendor": [ + "Bambu Lab" + ], + "compatible_printers": [ + "Bambu Lab X1 Carbon 0.4 nozzle", + "Bambu Lab X1 0.4 nozzle", + "Bambu Lab X1 0.8 nozzle", + "Bambu Lab X1 0.6 nozzle", + "Bambu Lab X1 Carbon 0.6 nozzle", + "Bambu Lab X1 Carbon 0.8 nozzle", + "Bambu Lab P1P 0.4 nozzle", + "Bambu Lab P1P 0.6 nozzle", + "Bambu Lab P1P 0.8 nozzle", + "Bambu Lab P1S 0.6 nozzle", + "Bambu Lab P1S 0.4 nozzle", + "Bambu Lab P1S 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Generic PPA-GF @BBL X1E.json b/resources/profiles/BBL/filament/Generic PPA-GF @BBL X1E.json new file mode 100644 index 0000000000..fec89c9804 --- /dev/null +++ b/resources/profiles/BBL/filament/Generic PPA-GF @BBL X1E.json @@ -0,0 +1,25 @@ +{ + "type": "filament", + "name": "Generic PPA-GF @BBL X1E", + "inherits": "Generic PPA-GF @base", + "from": "system", + "setting_id": "GFSN96_01", + "instantiation": "true", + "chamber_temperatures": [ + "60" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_type": [ + "PPA-GF" + ], + "filament_vendor": [ + "Bambu Lab" + ], + "compatible_printers": [ + "Bambu Lab X1E 0.6 nozzle", + "Bambu Lab X1E 0.8 nozzle", + "Bambu Lab X1E 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/Generic PPA-GF @base.json b/resources/profiles/BBL/filament/Generic PPA-GF @base.json new file mode 100644 index 0000000000..2d95e3f5c0 --- /dev/null +++ b/resources/profiles/BBL/filament/Generic PPA-GF @base.json @@ -0,0 +1,17 @@ +{ + "type": "filament", + "name": "Generic PPA-GF @base", + "inherits": "fdm_filament_ppa", + "from": "system", + "filament_id": "GFN96", + "instantiation": "false", + "filament_max_volumetric_speed": [ + "6" + ], + "filament_type": [ + "PPA-GF" + ], + "filament_vendor": [ + "Generic" + ] +} \ No newline at end of file diff --git a/resources/profiles/BBL/filament/fdm_filament_ppa.json b/resources/profiles/BBL/filament/fdm_filament_ppa.json new file mode 100644 index 0000000000..23b082b05c --- /dev/null +++ b/resources/profiles/BBL/filament/fdm_filament_ppa.json @@ -0,0 +1,91 @@ +{ + "type": "filament", + "name": "fdm_filament_ppa", + "inherits": "fdm_filament_common", + "from": "system", + "instantiation": "false", + "activate_air_filtration": [ + "1" + ], + "cool_plate_temp": [ + "0" + ], + "cool_plate_temp_initial_layer": [ + "0" + ], + "eng_plate_temp": [ + "100" + ], + "eng_plate_temp_initial_layer": [ + "100" + ], + "fan_cooling_layer_time": [ + "5" + ], + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "10" + ], + "filament_cost": [ + "20" + ], + "filament_density": [ + "1.17" + ], + "filament_flow_ratio": [ + "0.96" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_type": [ + "PPA-CF" + ], + "filament_vendor": [ + "Bambu Lab" + ], + "hot_plate_temp": [ + "100" + ], + "hot_plate_temp_initial_layer": [ + "100" + ], + "nozzle_temperature": [ + "290" + ], + "nozzle_temperature_initial_layer": [ + "290" + ], + "nozzle_temperature_range_high": [ + "320" + ], + "nozzle_temperature_range_low": [ + "280" + ], + "overhang_fan_speed": [ + "40" + ], + "overhang_fan_threshold": [ + "0%" + ], + "required_nozzle_HRC": [ + "40" + ], + "slow_down_layer_time": [ + "2" + ], + "slow_down_min_speed": [ + "20" + ], + "temperature_vitrification": [ + "210" + ], + "textured_plate_temp": [ + "100" + ], + "textured_plate_temp_initial_layer": [ + "100" + ] +} \ No newline at end of file diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index dc51f5db16..02ba497343 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1359,6 +1359,8 @@ void PrintConfigDef::init_fff_params() def->enum_values.push_back("PLA-AERO"); def->enum_values.push_back("PPS"); def->enum_values.push_back("PPS-CF"); + def->enum_values.push_back("PPA-CF"); + def->enum_values.push_back("PPA-GF"); def->mode = comSimple; def->set_default_value(new ConfigOptionStrings { "PLA" });