Skip to content

Commit

Permalink
Merge branch 'master' into PP-475-PLA-method
Browse files Browse the repository at this point in the history
  • Loading branch information
@HellAholic
HellAholic authored Jul 2, 2024
2 parents ba78f1c + eb40e01 commit 6a7d01a
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 54 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
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

0 comments on commit 6a7d01a

Please sign in to comment.