Skip to content

Commit

Permalink
Merge branch 'master' into PP-480-Fix-generic-profiles-factor-4
Browse files Browse the repository at this point in the history
  • Loading branch information
@HellAholic
HellAholic authored Jul 3, 2024
2 parents a75a596 + 56811ea commit 9d3eb89
Show file tree
Hide file tree
Showing 8 changed files with 280 additions and 55 deletions.
5 changes: 2 additions & 3 deletions generic_bam.xml.fdm_material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Generic break away support material profile. The data in this file may not be co
<color>Generic</color>
</name>
<GUID>7e6207c4-22ff-441a-b261-ff89f166d6a0</GUID>
<version>34</version>
<version>35</version>
<color_code>#F1ECE1</color_code>
<description>Breakaway Material. Breakaway is a matching support material for PLA, ABS, CPE, CPE+, and Nylon</description>
<adhesion_info>Use the same temperatures and adhesion method as your build material(s).</adhesion_info>
Expand Down Expand Up @@ -88,9 +88,8 @@ Generic break away support material profile. The data in this file may not be co

<machine>
<machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Factor 4" />
<setting key="build volume temperature">40</setting>
<setting key="build volume temperature">35</setting>
<setting key="print cooling">100</setting>
<setting key="heated bed temperature">40</setting>
<setting key="anti ooze retract position">-10</setting>
<setting key="break preparation position">-10</setting>
<setting key="no load move factor">1</setting>
Expand Down
47 changes: 23 additions & 24 deletions generic_pva.xml.fdm_material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@ Generic PVA profile. The data in this file may not be correct for your specific
<machine>
<machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3" />
<machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended" />
<hotend id="BB 0.4">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="BB 0.8">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="AA 0.25">
<setting key="hardware compatible">no</setting>
</hotend>
Expand All @@ -78,16 +84,16 @@ Generic PVA profile. The data in this file may not be correct for your specific
<hotend id="AA 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
</machine>

<machine>
<machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3" />
<hotend id="BB 0.4">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="BB 0.8">
<setting key="hardware compatible">yes</setting>
</hotend>
</machine>

<machine>
<machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3" />
<hotend id="AA 0.25">
<setting key="hardware compatible">no</setting>
</hotend>
Expand All @@ -97,12 +103,6 @@ Generic PVA profile. The data in this file may not be correct for your specific
<hotend id="AA 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.4">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="BB 0.8">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="CC 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
Expand All @@ -118,6 +118,12 @@ Generic PVA profile. The data in this file may not be correct for your specific
<machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5" />
<machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7" />

<hotend id="BB 0.4">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="BB 0.8">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="AA 0.25">
<setting key="hardware compatible">no</setting>
</hotend>
Expand All @@ -127,12 +133,6 @@ Generic PVA profile. The data in this file may not be correct for your specific
<hotend id="AA 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.4">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="BB 0.8">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="CC 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
Expand All @@ -147,13 +147,18 @@ Generic PVA profile. The data in this file may not be correct for your specific
<machine>
<machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Factor 4" />
<setting key="print temperature">220</setting>
<setting key="build volume temperature">40</setting>
<setting key="build volume temperature">35</setting>
<setting key="print cooling">50</setting>
<setting key="heated bed temperature">40</setting>
<setting key="no load move factor">1</setting>
<setting key="retraction amount">5</setting>
<setting key="flow sensor detection margin">0.5</setting>

<hotend id="BB 0.4">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="BB 0.8">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="AA 0.25">
<setting key="hardware compatible">no</setting>
</hotend>
Expand All @@ -163,12 +168,6 @@ Generic PVA profile. The data in this file may not be correct for your specific
<hotend id="AA 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.4">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="BB 0.8">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="CC 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
Expand Down
5 changes: 2 additions & 3 deletions ultimaker_bam.xml.fdm_material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<color>White</color>
</name>
<GUID>7e6207c4-22ff-441a-b261-ff89f166d5f9</GUID>
<version>39</version>
<version>40</version>
<color_code>#F1ECE1</color_code>
<description>Breakaway Material. Breakaway is a matching support material for PLA, ABS, CPE, CPE+, and Nylon</description>
<adhesion_info>Use the same temperatures and adhesion method as your build material(s).</adhesion_info>
Expand Down Expand Up @@ -87,9 +87,8 @@

<machine>
<machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Factor 4" />
<setting key="build volume temperature">40</setting>
<setting key="build volume temperature">35</setting>
<setting key="print cooling">100</setting>
<setting key="heated bed temperature">40</setting>
<setting key="anti ooze retract position">-10</setting>
<setting key="break preparation position">-10</setting>
<setting key="no load move factor">1</setting>
Expand Down
25 changes: 24 additions & 1 deletion ultimaker_nylon12-cf_175.xml.fdm_material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</name>
<GUID>3c6f2877-71cc-4760-84e6-4b89ab243e3b</GUID>
<reference_material_id>nylon12-cf</reference_material_id>
<version>5</version>
<version>6</version>
<color_code>#0e0e10</color_code>
<description>Nylon is strong, abrasion-resistant, durable and engineered for low moisture sensitivity.</description>
<adhesion_info>Use glue.</adhesion_info>
Expand All @@ -29,6 +29,29 @@
<cura:setting key="material_shrinkage_percentage">100.44</cura:setting>
<cura:setting key="material_shrinkage_percentage_z">100.6</cura:setting>

<machine>
<machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method" />
<setting key="build volume temperature">60</setting>
<hotend id="1A">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="1XA">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="2A">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="2XA">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="1C">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="LABS">
<setting key="hardware compatible">yes</setting>
</hotend>
</machine>

<machine>
<machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method X" />
<setting key="build volume temperature">93</setting>
Expand Down
88 changes: 88 additions & 0 deletions ultimaker_pla_175.xml.fdm_material
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
<?xml version="1.0" encoding="UTF-8"?>
<fdmmaterial xmlns="http://www.ultimaker.com/material" xmlns:cura="http://www.ultimaker.com/cura" version="1.3">
<metadata>
<name>
<brand>Ultimaker</brand>
<material>PLA</material>
<color>Generic</color>
</name>
<GUID>abb9c58e-1f56-48d1-bd8f-055fde3a5b56</GUID>
<reference_material_id>pla</reference_material_id>
<version>26</version>
<color_code>#f1ece1</color_code>
<description>Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality.</description>
<adhesion_info>Print directly on a clean build surface, a raft will help with adhesion and dimensional accuracy.</adhesion_info>
<instruction_link>https://support.ultimaker.com/s/article/How-to-print-with-Method-PLA</instruction_link>
</metadata>
<properties>
<density>1.24</density>
<diameter>1.75</diameter>
<weight>750</weight>
</properties>
<settings>
<setting key="print temperature">200</setting>
<setting key="standby temperature">175</setting>
<setting key="heated bed temperature">60</setting>
<setting key="build volume temperature">28</setting>
<setting key="print cooling">100</setting>
<setting key="adhesion tendency">0</setting>
<setting key="surface energy">100</setting>

<machine>
<machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method" />
<machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method X" />
<setting key="print temperature">210</setting>
<setting key="standby temperature">160</setting>
<setting key="build volume temperature">40</setting>
<setting key="print cooling">100</setting>
<cura:setting key="material_shrinkage_percentage">100.2</cura:setting>
<cura:setting key="material_shrinkage_percentage_z">100.1</cura:setting>

<hotend id="1A">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="1XA">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="2A">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="2XA">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="1C">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="LABS">
<setting key="hardware compatible">yes</setting>
</hotend>
</machine>

<machine>
<machine_identifier manufacturer="Ultimaker B.V." product="UltiMaker Method XL" />
<setting key="print temperature">210</setting>
<setting key="standby temperature">160</setting>
<setting key="build volume temperature">40</setting>
<setting key="print cooling">100</setting>

<hotend id="1A">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="1XA">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="2A">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="2XA">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="1C">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="LABS">
<setting key="hardware compatible">yes</setting>
</hotend>
</machine>
</settings>
</fdmmaterial>
47 changes: 23 additions & 24 deletions ultimaker_pva.xml.fdm_material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,12 @@
<machine>
<machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3" />
<machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker 3 Extended" />
<hotend id="BB 0.4">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="BB 0.8">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="AA 0.25">
<setting key="hardware compatible">no</setting>
</hotend>
Expand All @@ -104,16 +110,16 @@
<hotend id="AA 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
</machine>

<machine>
<machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3" />
<hotend id="BB 0.4">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="BB 0.8">
<setting key="hardware compatible">yes</setting>
</hotend>
</machine>

<machine>
<machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S3" />
<hotend id="AA 0.25">
<setting key="hardware compatible">no</setting>
</hotend>
Expand All @@ -123,12 +129,6 @@
<hotend id="AA 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.4">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="BB 0.8">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="CC 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
Expand All @@ -144,6 +144,12 @@
<machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S5" />
<machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker S7" />

<hotend id="BB 0.4">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="BB 0.8">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="AA 0.25">
<setting key="hardware compatible">no</setting>
</hotend>
Expand All @@ -153,12 +159,6 @@
<hotend id="AA 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.4">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="BB 0.8">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="CC 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
Expand All @@ -173,13 +173,18 @@
<machine>
<machine_identifier manufacturer="Ultimaker B.V." product="Ultimaker Factor 4" />
<setting key="print temperature">220</setting>
<setting key="build volume temperature">40</setting>
<setting key="build volume temperature">35</setting>
<setting key="print cooling">50</setting>
<setting key="heated bed temperature">40</setting>
<setting key="no load move factor">1</setting>
<setting key="retraction amount">5</setting>
<setting key="flow sensor detection margin">0.5</setting>

<hotend id="BB 0.4">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="BB 0.8">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="AA 0.25">
<setting key="hardware compatible">no</setting>
</hotend>
Expand All @@ -189,12 +194,6 @@
<hotend id="AA 0.8">
<setting key="hardware compatible">no</setting>
</hotend>
<hotend id="BB 0.4">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="BB 0.8">
<setting key="hardware compatible">yes</setting>
</hotend>
<hotend id="CC 0.4">
<setting key="hardware compatible">no</setting>
</hotend>
Expand Down
Loading

0 comments on commit 9d3eb89

Please sign in to comment.