Merge branch 'master' into master

Ultimaker · Nov 20, 2023 · 5f2e031 · 5f2e031
2 parents 0939f0a + 4a21a32
commit 5f2e031
Show file tree

Hide file tree

Showing 136 changed files with 3,207 additions and 416 deletions.
diff --git a/conanfile.py b/conanfile.py
@@ -1,10 +1,11 @@
 import os
 
 from conan import ConanFile
-from conans import tools
+from conan.tools.files import copy
+from conan.tools.scm import Version
 from conan.errors import ConanInvalidConfiguration
 
-required_conan_version = ">=1.47.0"
+required_conan_version = ">=1.56.0"
 
 
 class FDM_MaterialsConan(ConanFile):
@@ -18,26 +19,26 @@ class FDM_MaterialsConan(ConanFile):
     exports = "LICENSE*"
     settings = "os", "compiler", "build_type", "arch"
     no_copy_source = True
-    scm = {
-        "type": "git",
-        "subfolder": ".",
-        "url": "auto",
-        "revision": "auto"
-    }
+
+    def set_version(self):
+        if not self.version:
+            self.version = "5.6.0-beta.1"
+
+    def export_sources(self):
+        copy(self, "*.fdm_material", self.recipe_folder, self.export_sources_folder)
+        copy(self, "*.sig", self.recipe_folder, self.export_sources_folder)
 
     def validate(self):
-        if tools.Version(self.version) <= tools.Version("4"):
+        if Version(self.version) <= Version("4"):
             raise ConanInvalidConfiguration("Only versions 5+ are support")
 
-    def layout(self):
-        self.cpp.package.resdirs = ["materials"]
-
     def package(self):
-        self.copy("*.fdm_material", src = ".", dst = self.cpp.package.resdirs[0])
-        self.copy("*.sig", src = ".", dst = self.cpp.package.resdirs[0])
+        copy(self, "*.fdm_material", self.source_folder, os.path.join(self.package_folder, "res", "resources", "materials"), keep_path = False)
+        copy(self, "*.sig", self.source_folder, os.path.join(self.package_folder, "res", "resources", "materials"), keep_path = False)
+
+    def package_info(self):
+        self.cpp_info.includedirs = []
+        self.cpp_info.resdirs = ["res"]
 
     def package_id(self):
-        del self.info.settings.os
-        del self.info.settings.compiler
-        del self.info.settings.build_type
-        del self.info.settings.arch
+        self.info.clear()
diff --git a/eSUN_PLA_PRO_Black.xml.fdm_material b/eSUN_PLA_PRO_Black.xml.fdm_material
@@ -3,13 +3,14 @@
     <metadata>
         <name>
             <brand>eSUN</brand>
-            <material>PLA+</material>
+            <material>PLA</material>
             <color>Black</color>
+            <label>PLA+ Black</label>
         </name>
         <color_code>#333333</color_code>
         <GUID>5c4e29a1-0722-4cfa-b147-338924afc075</GUID>
         <adhesion_info />
-        <version>1</version>
+        <version>2</version>
         <description />
     </metadata>
     <properties>

diff --git a/eSUN_PLA_PRO_Grey.xml.fdm_material b/eSUN_PLA_PRO_Grey.xml.fdm_material
@@ -3,13 +3,14 @@
     <metadata>
         <name>
             <brand>eSUN</brand>
-            <material>PLA+</material>
+            <material>PLA</material>
             <color>Grey</color>
+            <label>PLA+ Grey</label>
         </name>
         <color_code>#999999</color_code>
         <GUID>061cc7c6-77b1-4d76-996f-d049546b41d2</GUID>
         <adhesion_info />
-        <version>1</version>
+        <version>2</version>
         <description />
     </metadata>
     <properties>

diff --git a/eSUN_PLA_PRO_Purple.xml.fdm_material b/eSUN_PLA_PRO_Purple.xml.fdm_material
@@ -3,13 +3,14 @@
     <metadata>
         <name>
             <brand>eSUN</brand>
-            <material>PLA+</material>
+            <material>PLA</material>
             <color>Purple</color>
+            <label>PLA+ Purple</label>
         </name>
         <color_code>#9900CC</color_code>
         <GUID>ae0c8895-b4b3-4a12-a5a5-3ae754940ced</GUID>
         <adhesion_info />
-        <version>1</version>
+        <version>2</version>
         <description />
     </metadata>
     <properties>

diff --git a/eSUN_PLA_PRO_White.xml.fdm_material b/eSUN_PLA_PRO_White.xml.fdm_material
@@ -3,13 +3,14 @@
     <metadata>
         <name>
             <brand>eSUN</brand>
-            <material>PLA+</material>
+            <material>PLA</material>
             <color>White</color>
+            <label>PLA+ White</label>
         </name>
         <color_code>#EEEEEE</color_code>
         <GUID>832e163d-db99-4a58-80b9-f82073ae0a9b</GUID>
         <adhesion_info />
-        <version>1</version>
+        <version>2</version>
         <description />
     </metadata>
     <properties>

diff --git a/emotiontech_abs.xml.fdm_material b/emotiontech_abs.xml.fdm_material
@@ -25,7 +25,7 @@
         <setting key="retraction amount">1.4</setting>
         <setting key="build volume temperature">60</setting>
         <machine>
-            <machine_identifier manufacturer="eMotionTech" product="Strateo3D"/>
+            <machine_identifier manufacturer="eMotionTech" product="DUAL600"/>
             <hotend id="Standard 0.4" >
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">240</setting>
@@ -50,6 +50,31 @@
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">260</setting>
                 <setting key="retraction amount">1.7</setting>
+            </hotend>
+			<hotend id="High temp 0.4">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="print temperature">240</setting>
+                <setting key="retraction amount">1.3</setting>
+            </hotend>
+        </machine>
+		<machine>
+            <machine_identifier manufacturer="eMotionTech" product="IDEX420"/>
+            <machine_identifier manufacturer="eMotionTech" product="IDEX420 Duplicate"/>
+            <machine_identifier manufacturer="eMotionTech" product="IDEX420 Mirror"/>
+            <hotend id="IDEX420 Laiton 0.4" >
+                <setting key="hardware compatible">yes</setting>
+                <setting key="print temperature">245</setting>
+            </hotend>
+            <hotend id="IDEX420 Laiton 0.6" >
+                <setting key="hardware compatible">yes</setting>
+                <setting key="print temperature">245</setting>
+            </hotend>
+            <hotend id="IDEX420 Laiton 0.8">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="print temperature">245</setting>
+            </hotend>
+            <hotend id="IDEX420 Acier Durci 0.4">
+                <setting key="hardware compatible">no</setting>
             </hotend>
         </machine>
     </settings>

diff --git a/emotiontech_absx.xml.fdm_material b/emotiontech_absx.xml.fdm_material
@@ -25,7 +25,7 @@
         <setting key="retraction amount">1.4</setting>
         <setting key="build volume temperature">60</setting>
         <machine>
-            <machine_identifier manufacturer="eMotionTech" product="Strateo3D"/>
+            <machine_identifier manufacturer="eMotionTech" product="DUAL600"/>
             <hotend id="Standard 0.4" >
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">240</setting>
@@ -50,6 +50,31 @@
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">260</setting>
                 <setting key="retraction amount">1.7</setting>
+            </hotend>
+			<hotend id="High temp 0.4">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="print temperature">240</setting>
+                <setting key="retraction amount">1.3</setting>
+            </hotend>
+        </machine>
+        <machine>
+            <machine_identifier manufacturer="eMotionTech" product="IDEX420"/>
+            <machine_identifier manufacturer="eMotionTech" product="IDEX420 Duplicate"/>
+            <machine_identifier manufacturer="eMotionTech" product="IDEX420 Mirror"/>
+            <hotend id="IDEX420 Laiton 0.4" >
+                <setting key="hardware compatible">yes</setting>
+                <setting key="print temperature">245</setting>
+            </hotend>
+            <hotend id="IDEX420 Laiton 0.6" >
+                <setting key="hardware compatible">yes</setting>
+                <setting key="print temperature">245</setting>
+            </hotend>
+            <hotend id="IDEX420 Laiton 0.8">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="print temperature">245</setting>
+            </hotend>
+            <hotend id="IDEX420 Acier Durci 0.4">
+                <setting key="hardware compatible">no</setting>
             </hotend>
         </machine>
     </settings>

diff --git a/emotiontech_acetate.xml.fdm_material b/emotiontech_acetate.xml.fdm_material
@@ -24,7 +24,7 @@
         <setting key="retraction amount">2</setting>
         <setting key="build volume temperature">0</setting>
         <machine>
-            <machine_identifier manufacturer="eMotionTech" product="Strateo3D"/>
+            <machine_identifier manufacturer="eMotionTech" product="DUAL600"/>
             <hotend id="Standard 0.4" >
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">225</setting>
@@ -49,6 +49,30 @@
                 <setting key="hardware compatible">no</setting>
                 <setting key="print temperature">245</setting>
                 <setting key="retraction amount">2.7</setting>
+            </hotend>
+			<hotend id="High temp 0.4" >
+                <setting key="hardware compatible">yes</setting>
+                <setting key="print temperature">225</setting>
+                <setting key="retraction amount">2</setting>
+            </hotend>
+        </machine>
+        <machine>
+            <machine_identifier manufacturer="eMotionTech" product="IDEX420"/>
+            <machine_identifier manufacturer="eMotionTech" product="IDEX420 Duplicate"/>
+            <machine_identifier manufacturer="eMotionTech" product="IDEX420 Mirror"/>
+            <hotend id="IDEX420 Laiton 0.4" >
+                <setting key="hardware compatible">yes</setting>
+                <setting key="print temperature">235</setting>
+            </hotend>
+            <hotend id="IDEX420 Laiton 0.6" >
+                <setting key="hardware compatible">yes</setting>
+                <setting key="print temperature">235</setting>
+            </hotend>
+            <hotend id="IDEX420 Laiton 0.8">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+            <hotend id="IDEX420 Acier Durci 0.4">
+                <setting key="hardware compatible">no</setting>
             </hotend>
         </machine>
     </settings>

diff --git a/emotiontech_asax.xml.fdm_material b/emotiontech_asax.xml.fdm_material
@@ -24,7 +24,7 @@
         <setting key="retraction amount">1.3</setting>
         <setting key="build volume temperature">60</setting>
         <machine>
-            <machine_identifier manufacturer="eMotionTech" product="Strateo3D"/>
+            <machine_identifier manufacturer="eMotionTech" product="DUAL600"/>
             <hotend id="Standard 0.4" >
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">235</setting>
@@ -49,6 +49,31 @@
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">255</setting>
                 <setting key="retraction amount">1.7</setting>
+            </hotend>
+			<hotend id="High temp 0.4" >
+                <setting key="hardware compatible">yes</setting>
+                <setting key="print temperature">235</setting>
+                <setting key="retraction amount">1.3</setting>
+            </hotend>
+        </machine>
+        <machine>
+            <machine_identifier manufacturer="eMotionTech" product="IDEX420"/>
+            <machine_identifier manufacturer="eMotionTech" product="IDEX420 Duplicate"/>
+            <machine_identifier manufacturer="eMotionTech" product="IDEX420 Mirror"/>
+            <hotend id="IDEX420 Laiton 0.4" >
+                <setting key="hardware compatible">yes</setting>
+                <setting key="print temperature">245</setting>
+            </hotend>
+            <hotend id="IDEX420 Laiton 0.6" >
+                <setting key="hardware compatible">yes</setting>
+                <setting key="print temperature">245</setting>
+            </hotend>
+            <hotend id="IDEX420 Laiton 0.8">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="print temperature">245</setting>
+            </hotend>
+            <hotend id="IDEX420 Acier Durci 0.4">
+                <setting key="hardware compatible">no</setting>
             </hotend>
         </machine>
     </settings>

diff --git a/emotiontech_bvoh.xml.fdm_material b/emotiontech_bvoh.xml.fdm_material
@@ -23,7 +23,7 @@
         <setting key="standby temperature">75</setting>
         <setting key="retraction amount">1.3</setting>
         <machine>
-            <machine_identifier manufacturer="eMotionTech" product="Strateo3D"/>
+            <machine_identifier manufacturer="eMotionTech" product="DUAL600"/>
             <hotend id="Standard 0.4" >
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">195</setting>
@@ -48,7 +48,32 @@
                 <setting key="hardware compatible">yes</setting>
                 <setting key="print temperature">213</setting>
                 <setting key="retraction amount">1.5</setting>
+            </hotend>
+			<hotend id="High temp 0.4" >
+                <setting key="hardware compatible">yes</setting>
+                <setting key="print temperature">195</setting>
+                <setting key="retraction amount">1.3</setting>
             </hotend>
         </machine>
+        <machine>
+            <machine_identifier manufacturer="eMotionTech" product="IDEX420"/>
+            <machine_identifier manufacturer="eMotionTech" product="IDEX420 Duplicate"/>
+            <machine_identifier manufacturer="eMotionTech" product="IDEX420 Mirror"/>
+            <hotend id="IDEX420 Laiton 0.4" >
+                <setting key="hardware compatible">yes</setting>
+                <setting key="print temperature">210</setting>
+            </hotend>
+            <hotend id="IDEX420 Laiton 0.6" >
+                <setting key="hardware compatible">yes</setting>
+                <setting key="print temperature">210</setting>
+            </hotend>
+            <hotend id="IDEX420 Laiton 0.8">
+                <setting key="hardware compatible">yes</setting>
+                <setting key="print temperature">210</setting>
+            </hotend>
+            <hotend id="IDEX420 Acier Durci 0.4">
+                <setting key="hardware compatible">no</setting>
+            </hotend>
+        </machine>        
     </settings>
 </fdmmaterial>