Merge changes from fdm_materials repo

This commit is contained in:
fieldOfView 2016-08-18 15:35:53 +02:00
parent 37e9382ce8
commit 2ff4e70c17
3 changed files with 32 additions and 7 deletions

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <fdmmaterial xmlns="http://www.ultimaker.com/material">
<metadata> <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> <color_code>#8cb219</color_code>
</metadata> </metadata>
<properties> <properties>
<density>1.07</density> <density>1.10</density>
<diameter>2.85</diameter> <diameter>2.85</diameter>
</properties> </properties>
<settings> <settings>
<setting key="print temperature">250</setting> <setting key="print temperature">240</setting>
<setting key="heated bed temperature">80</setting> <setting key="heated bed temperature">80</setting>
<setting key="standby temperature">200</setting>
<machine> <machine>
<machine_identifier manufacturer="Ultimaker" product="Ultimaker2+"/> <machine_identifier manufacturer="Ultimaker" product="Ultimaker2+"/>

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <fdmmaterial xmlns="http://www.ultimaker.com/material">
<metadata> <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> <color_code>#159499</color_code>
</metadata> </metadata>
<properties> <properties>
<density>0.94</density> <density>1.27</density>
<diameter>2.85</diameter> <diameter>2.85</diameter>
</properties> </properties>
<settings> <settings>
<setting key="print temperature">250</setting> <setting key="print temperature">250</setting>
<setting key="heated bed temperature">70</setting> <setting key="heated bed temperature">70</setting>
<setting key="standby temperature">175</setting>
<machine> <machine>
<machine_identifier manufacturer="Ultimaker" product="Ultimaker2+"/> <machine_identifier manufacturer="Ultimaker" product="Ultimaker2+"/>

View File

@ -14,12 +14,13 @@ Generic PLA profile. Serves as an example file, data in this file is not correct
<color_code>#ffc924</color_code> <color_code>#ffc924</color_code>
</metadata> </metadata>
<properties> <properties>
<density>1.3</density> <density>1.24</density>
<diameter>2.85</diameter> <diameter>2.85</diameter>
</properties> </properties>
<settings> <settings>
<setting key="print temperature">210</setting> <setting key="print temperature">200</setting>
<setting key="heated bed temperature">60</setting> <setting key="heated bed temperature">60</setting>
<setting key="standby temperature">175</setting>
<machine> <machine>
<machine_identifier manufacturer="Ultimaker" product="Ultimaker2+"/> <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.6 mm" />
<hotend id="0.8 mm" /> <hotend id="0.8 mm" />
</machine> </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> </settings>
</fdmmaterial> </fdmmaterial>