Skip to content

Commit

Permalink
Merge branch 'master' into PP-467-Fix-flow-sensor-margin-F4
Browse files Browse the repository at this point in the history
  • Loading branch information
@wawanbreton
wawanbreton authored Jul 2, 2024
2 parents 6ecb6f8 + eb40e01 commit 12ad8b5
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 52 deletions.
3 changes: 1 addition & 2 deletions generic_bam.xml.fdm_material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,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 @@ -68,6 +68,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 @@ -77,16 +83,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 @@ -96,12 +102,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 @@ -117,6 +117,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 @@ -126,12 +132,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 @@ -146,12 +146,17 @@ 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>

<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 @@ -161,12 +166,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
3 changes: 1 addition & 2 deletions ultimaker_bam.xml.fdm_material
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,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 @@ -94,6 +94,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 @@ -103,16 +109,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 @@ -122,12 +128,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 @@ -143,6 +143,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 @@ -152,12 +158,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 @@ -172,12 +172,17 @@
<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>

<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 @@ -187,12 +192,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 12ad8b5

Please sign in to comment.