From ad57d0845b9721291e3a4cfec2ba2bcdddd83f8a Mon Sep 17 00:00:00 2001
From: XunZhangBambu <xun.zhang@bambulab.com>
Date: Thu, 29 Feb 2024 17:22:20 +0800
Subject: [PATCH] NEW: add more filament types

jira:[NEW]

Signed-off-by: XunZhangBambu <xun.zhang@bambulab.com>
Change-Id: Icbc27cf423ed7ab373107aa711430d6321105def
---
 resources/info/filament_info.json | 14 +++++++++++---
 src/libslic3r/Print.cpp           |  4 ++--
 src/libslic3r/PrintConfig.cpp     |  9 +++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/resources/info/filament_info.json b/resources/info/filament_info.json
index 1179a2f41..086080645 100644
--- a/resources/info/filament_info.json
+++ b/resources/info/filament_info.json
@@ -1,5 +1,5 @@
 {
-    "version": "1.0.0.1",
+    "version": "1.0.0.2",
     "high_temp_filament": [
         "ABS",
         "ASA",
@@ -19,10 +19,18 @@
         "TPU",
         "PLA-CF",
         "PLA-AERO",
-        "PVA"
+        "PVA",
+        "BVOH"
     ],
     "high_low_compatible_filament":[
         "HIPS",
-        "PETG"
+        "PETG",
+        "PE",
+        "PP",
+        "EVA",
+        "PE-CF",
+        "PP-CF",
+        "PP-GF",
+        "PHA"
     ]
 }
\ No newline at end of file
diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp
index b02c4882d..42a5b916a 100644
--- a/src/libslic3r/Print.cpp
+++ b/src/libslic3r/Print.cpp
@@ -2195,8 +2195,8 @@ FilamentTempType Print::get_filament_temp_type(const std::string& filament_type)
             in.close();
             BOOST_LOG_TRIVIAL(error) << __FUNCTION__ << ": parse " << file_path.string() << " got a nlohmann::detail::parse_error, reason = " << err.what();
             filament_temp_type_map[HighTempFilamentStr] = {"ABS","ASA","PC","PA","PA-CF","PA-GF","PA6-CF","PET-CF","PPS","PPS-CF","PPA-GF","PPA-CF"};
-            filament_temp_type_map[LowTempFilamentStr] = {"PLA","TPU","PLA-CF","PLA-AERO","PVA"};
-            filament_temp_type_map[HighLowCompatibleFilamentStr] = { "HIPS","PETG" };
+            filament_temp_type_map[LowTempFilamentStr] = {"PLA","TPU","PLA-CF","PLA-AERO","PVA","BVOH"};
+            filament_temp_type_map[HighLowCompatibleFilamentStr] = { "HIPS","PETG","PE","PP","EVA","PE-CF","PP-CF","PP-GF","PHA"};
         }
     }
 
diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index c3981c74d..600ab4277 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -1467,6 +1467,15 @@ void PrintConfigDef::init_fff_params()
     def->enum_values.push_back("PPS-CF");
     def->enum_values.push_back("PPA-CF");
     def->enum_values.push_back("PPA-GF");
+    def->enum_values.push_back("PE");
+    def->enum_values.push_back("PP");
+    def->enum_values.push_back("EVA");
+    def->enum_values.push_back("PHA");
+    def->enum_values.push_back("BVOH");
+    def->enum_values.push_back("PE-CF");
+    def->enum_values.push_back("PP-CF");
+    def->enum_values.push_back("PP-GF");
+
     def->mode = comSimple;
     def->set_default_value(new ConfigOptionStrings { "PLA" });