From 2ff4e70c17e6e5019be877a1b99e4f285cc8fbcc Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Thu, 18 Aug 2016 15:35:53 +0200
Subject: [PATCH] Merge changes from fdm_materials repo

---
 .../materials/generic_abs.xml.fdm_material    |  7 ++---
 .../materials/generic_cpe.xml.fdm_material    |  5 ++--
 .../materials/generic_pla.xml.fdm_material    | 27 +++++++++++++++++--
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/resources/materials/generic_abs.xml.fdm_material b/resources/materials/generic_abs.xml.fdm_material
index ceb6e8698e..f34c32b179 100644
--- a/resources/materials/generic_abs.xml.fdm_material
+++ b/resources/materials/generic_abs.xml.fdm_material
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Generic PLA profile. Serves as an example file, data in this file is not correct.
+Generic ABS profile. Serves as an example file, data in this file is not correct.
 -->
 <fdmmaterial xmlns="http://www.ultimaker.com/material">
     <metadata>
@@ -14,12 +14,13 @@ Generic PLA profile. Serves as an example file, data in this file is not correct
         <color_code>#8cb219</color_code>
     </metadata>
     <properties>
-        <density>1.07</density>
+        <density>1.10</density>
         <diameter>2.85</diameter>
     </properties>
     <settings>
-        <setting key="print temperature">250</setting>
+        <setting key="print temperature">240</setting>
         <setting key="heated bed temperature">80</setting>
+        <setting key="standby temperature">200</setting>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker" product="Ultimaker2+"/>
diff --git a/resources/materials/generic_cpe.xml.fdm_material b/resources/materials/generic_cpe.xml.fdm_material
index 19a0072de9..9c76170e90 100644
--- a/resources/materials/generic_cpe.xml.fdm_material
+++ b/resources/materials/generic_cpe.xml.fdm_material
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Generic PLA profile. Serves as an example file, data in this file is not correct.
+Generic CPE profile. Serves as an example file, data in this file is not correct.
 -->
 <fdmmaterial xmlns="http://www.ultimaker.com/material">
     <metadata>
@@ -14,12 +14,13 @@ Generic PLA profile. Serves as an example file, data in this file is not correct
         <color_code>#159499</color_code>
     </metadata>
     <properties>
-        <density>0.94</density>
+        <density>1.27</density>
         <diameter>2.85</diameter>
     </properties>
     <settings>
         <setting key="print temperature">250</setting>
         <setting key="heated bed temperature">70</setting>
+        <setting key="standby temperature">175</setting>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker" product="Ultimaker2+"/>
diff --git a/resources/materials/generic_pla.xml.fdm_material b/resources/materials/generic_pla.xml.fdm_material
index 9d60be93fe..1150d8f6a0 100644
--- a/resources/materials/generic_pla.xml.fdm_material
+++ b/resources/materials/generic_pla.xml.fdm_material
@@ -14,12 +14,13 @@ Generic PLA profile. Serves as an example file, data in this file is not correct
         <color_code>#ffc924</color_code>
     </metadata>
     <properties>
-        <density>1.3</density>
+        <density>1.24</density>
         <diameter>2.85</diameter>
     </properties>
     <settings>
-        <setting key="print temperature">210</setting>
+        <setting key="print temperature">200</setting>
         <setting key="heated bed temperature">60</setting>
+        <setting key="standby temperature">175</setting>
 
         <machine>
             <machine_identifier manufacturer="Ultimaker" product="Ultimaker2+"/>
@@ -30,5 +31,27 @@ Generic PLA profile. Serves as an example file, data in this file is not correct
             <hotend id="0.6 mm" />
             <hotend id="0.8 mm" />
         </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker" product="Ultimaker2"/>
+            <machine_identifier manufacturer="Ultimaker" product="Ultimaker2go"/>
+            <machine_identifier manufacturer="Ultimaker" product="Ultimaker2extended"/>
+            <setting key="standby temperature">150</setting>
+            <setting key="processing temperature graph">
+                <point flow="2" temperature="180"/>
+                <point flow="10" temperature="230"/>
+            </setting>
+        </machine>
+
+        <machine>
+            <machine_identifier manufacturer="Ultimaker" product="Ultimaker Original"/>
+            <setting key="standby temperature">150</setting>
+            <hotend id="0.8mm">
+                <setting key="standby temperature">80</setting>
+            </hotend>
+            <hotend id="0.6mm">
+                <setting key="standby temperature">100</setting>
+            </hotend>
+        </machine>
     </settings>
 </fdmmaterial>