From 4388e57bb5bddd78560897f4f4ac17ad3dff86fa Mon Sep 17 00:00:00 2001 From: daid Date: Mon, 9 May 2016 16:50:39 +0200 Subject: [PATCH 01/21] Initial commit --- generic_abs.xml.fdm_material | 86 +++++++++++++++++++++ generic_cpe.xml.fdm_material | 85 +++++++++++++++++++++ generic_pla.xml.fdm_material | 143 +++++++++++++++++++++++++++++++++++ 3 files changed, 314 insertions(+) create mode 100644 generic_abs.xml.fdm_material create mode 100644 generic_cpe.xml.fdm_material create mode 100644 generic_pla.xml.fdm_material diff --git a/generic_abs.xml.fdm_material b/generic_abs.xml.fdm_material new file mode 100644 index 0000000000..8e09b7200e --- /dev/null +++ b/generic_abs.xml.fdm_material @@ -0,0 +1,86 @@ + + + + + + Ultimaker + ABS + Generic + + 8520c33e-da56-441b-8d6f-16034a9d19d5 + 0 + #612978 + http://ultimaker.com/we/have/no/instruction/link/yet + + Ultimaker B.V. + Ultimaker Support + support@ultimaker.com + +31 345 712001 +
+ Watermolenweg 2 + Geldermalsen + Gelderland + 4191 PN + The Netherlands +
+ + + Ultimaker B.V. + Support + support@ultimaker.com + +31 345 712001 +
+ Watermolenweg 2 + Geldermalsen + Gelderland + 4191 PN + The Netherlands +
+ + 87 10400 31116 0 + 87 10400 31117 0 + http://... + http://... + + + + + 250 + 130 + 260 + 90 + 100 + + + + + + 150 + + + + + + + + + 150 + + 80 + + + 100 + + + + + + diff --git a/generic_cpe.xml.fdm_material b/generic_cpe.xml.fdm_material new file mode 100644 index 0000000000..22fdc406d3 --- /dev/null +++ b/generic_cpe.xml.fdm_material @@ -0,0 +1,85 @@ + + + + + + Ultimaker + CPE + Generic + + 27c708e9-4148-4457-b01e-2051487a4095 + 0 + #612978 + http://ultimaker.com/we/have/no/instruction/link/yet + + Ultimaker B.V. + Ultimaker Support + support@ultimaker.com + +31 345 712001 +
+ Watermolenweg 2 + Geldermalsen + Gelderland + 4191 PN + The Netherlands +
+ + + Ultimaker B.V. + Support + support@ultimaker.com + +31 345 712001 +
+ Watermolenweg 2 + Geldermalsen + Gelderland + 4191 PN + The Netherlands +
+ + 87 10400 31120 0 + 87 10400 31121 0 + http://... + http://... + + + + + 250 + 175 + 260 + 75 + + + + + + 150 + + + + + + + + + 150 + + 80 + + + 100 + + + + + + diff --git a/generic_pla.xml.fdm_material b/generic_pla.xml.fdm_material new file mode 100644 index 0000000000..5875dba631 --- /dev/null +++ b/generic_pla.xml.fdm_material @@ -0,0 +1,143 @@ + + + + + + Ultimaker + PLA + Generic + + 6976d020-18d1-4d46-9f3e-411189a1e230 + 0 + #612978 + http://ultimaker.com/we/have/no/instruction/link/yet + + Ultimaker B.V. + Ultimaker Support + support@ultimaker.com + +31 345 712001 +
+ Watermolenweg 2 + Geldermalsen + Gelderland + 4191 PN + The Netherlands +
+ + + Ultimaker B.V. + Support + support@ultimaker.com + +31 345 712001 +
+ Watermolenweg 2 + Geldermalsen + Gelderland + 4191 PN + The Netherlands +
+ + 87 10400 31114 0 + 87 10400 31115 0 + http://... + http://... + + + + + + + + + + + + + + + + + + + + 210 + 175 + 350 + 60 + 55 + 90 + 45 + 10 + 20 + 100 + 4.5 + + + + + + + + + + 150 + + + + + + 80 + + + 100 + + + 140 + + + + + 210 + 60 + 100 + + + + + 150 + + + + + + + + + 150 + + 80 + + + 100 + + + + + + From ad5f5dbc257607901838079f847540e0e2015c00 Mon Sep 17 00:00:00 2001 From: daid Date: Tue, 17 May 2016 09:52:03 +0200 Subject: [PATCH 02/21] Change files to actually match spec. --- generic_abs.xml.fdm_material | 85 +++------------------ generic_cpe.xml.fdm_material | 84 +++------------------ generic_pla.xml.fdm_material | 138 +++++------------------------------ 3 files changed, 42 insertions(+), 265 deletions(-) diff --git a/generic_abs.xml.fdm_material b/generic_abs.xml.fdm_material index 8e09b7200e..1a820cec74 100644 --- a/generic_abs.xml.fdm_material +++ b/generic_abs.xml.fdm_material @@ -1,86 +1,23 @@ - + - Ultimaker + Generic ABS Generic - 8520c33e-da56-441b-8d6f-16034a9d19d5 + 60636bb4-518f-42e7-8237-fe77b194ebe0 0 - #612978 - http://ultimaker.com/we/have/no/instruction/link/yet - - Ultimaker B.V. - Ultimaker Support - support@ultimaker.com - +31 345 712001 -
- Watermolenweg 2 - Geldermalsen - Gelderland - 4191 PN - The Netherlands -
- - - Ultimaker B.V. - Support - support@ultimaker.com - +31 345 712001 -
- Watermolenweg 2 - Geldermalsen - Gelderland - 4191 PN - The Netherlands -
- - 87 10400 31116 0 - 87 10400 31117 0 - http://... - http://... + #FFFFFF - - - - 250 - 130 - 260 - 90 - 100 - - - - - - 150 - - - - - - - - - 150 - - 80 - - - 100 - - - - + + 250 + 100 + 200 + + diff --git a/generic_cpe.xml.fdm_material b/generic_cpe.xml.fdm_material index 22fdc406d3..9dd6bc61f8 100644 --- a/generic_cpe.xml.fdm_material +++ b/generic_cpe.xml.fdm_material @@ -1,85 +1,23 @@ - + - Ultimaker + Generic CPE Generic - 27c708e9-4148-4457-b01e-2051487a4095 + 12f41353-1a33-415e-8b4f-a775a6c70cc6 0 - #612978 - http://ultimaker.com/we/have/no/instruction/link/yet - - Ultimaker B.V. - Ultimaker Support - support@ultimaker.com - +31 345 712001 -
- Watermolenweg 2 - Geldermalsen - Gelderland - 4191 PN - The Netherlands -
- - - Ultimaker B.V. - Support - support@ultimaker.com - +31 345 712001 -
- Watermolenweg 2 - Geldermalsen - Gelderland - 4191 PN - The Netherlands -
- - 87 10400 31120 0 - 87 10400 31121 0 - http://... - http://... + #FFFFFF - - - - 250 - 175 - 260 - 75 - - - - - - 150 - - - - - - - - - 150 - - 80 - - - 100 - - - - + + 250 + 60 + 175 + + diff --git a/generic_pla.xml.fdm_material b/generic_pla.xml.fdm_material index 5875dba631..c27adff43c 100644 --- a/generic_pla.xml.fdm_material +++ b/generic_pla.xml.fdm_material @@ -1,143 +1,45 @@ - + - Ultimaker + Generic PLA Generic - 6976d020-18d1-4d46-9f3e-411189a1e230 + 506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9 0 - #612978 - http://ultimaker.com/we/have/no/instruction/link/yet - - Ultimaker B.V. - Ultimaker Support - support@ultimaker.com - +31 345 712001 -
- Watermolenweg 2 - Geldermalsen - Gelderland - 4191 PN - The Netherlands -
- - - Ultimaker B.V. - Support - support@ultimaker.com - +31 345 712001 -
- Watermolenweg 2 - Geldermalsen - Gelderland - 4191 PN - The Netherlands -
- - 87 10400 31114 0 - 87 10400 31115 0 - http://... - http://... + #FFFFFF + + - - - - - - - - - - - - - - - - - - 210 - 175 - 350 - 60 - 55 - 90 - 45 - 10 - 20 - 100 - 4.5 - - - - + 210 + 60 + 175 - - - - 150 - - - - - - 80 - - - 100 - - - 140 - - - - - 210 - 60 - 100 - - - - - 150 - + + + + 150 + - - 150 + + 150 - 80 + 80 - 100 + 100 - - - + From da726dd3e70f3bf0172a926a88ee3c413752934e Mon Sep 17 00:00:00 2001 From: daid Date: Thu, 30 Jun 2016 13:05:23 +0200 Subject: [PATCH 03/21] Update generic_abs.xml.fdm_material EM-601 --- generic_abs.xml.fdm_material | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generic_abs.xml.fdm_material b/generic_abs.xml.fdm_material index 1a820cec74..2c62c725fe 100644 --- a/generic_abs.xml.fdm_material +++ b/generic_abs.xml.fdm_material @@ -16,8 +16,8 @@ Generic ABS profile. Serves as an example file, data in this file is not correct - 250 - 100 + 240 + 80 200 From 53d71e302eb559b25bf1b5b6cca917b9ddb02588 Mon Sep 17 00:00:00 2001 From: daid Date: Thu, 30 Jun 2016 13:05:47 +0200 Subject: [PATCH 04/21] Update generic_cpe.xml.fdm_material EM-601 --- generic_cpe.xml.fdm_material | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generic_cpe.xml.fdm_material b/generic_cpe.xml.fdm_material index 9dd6bc61f8..a1ae81cfd7 100644 --- a/generic_cpe.xml.fdm_material +++ b/generic_cpe.xml.fdm_material @@ -17,7 +17,7 @@ Generic CPE profile. Serves as an example file, data in this file is not correct 250 - 60 + 70 175 From f08b25b7eaf79bd1bbc2d0faed3b68d771bce5fe Mon Sep 17 00:00:00 2001 From: daid Date: Thu, 30 Jun 2016 13:06:28 +0200 Subject: [PATCH 05/21] Update generic_pla.xml.fdm_material EM-601 --- generic_pla.xml.fdm_material | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generic_pla.xml.fdm_material b/generic_pla.xml.fdm_material index c27adff43c..d30a855018 100644 --- a/generic_pla.xml.fdm_material +++ b/generic_pla.xml.fdm_material @@ -16,7 +16,7 @@ Generic PLA profile. Serves as an example file, data in this file is not correct - 210 + 200 60 175 From 387c7369b4e0edd5e98480974224c9ce869601a8 Mon Sep 17 00:00:00 2001 From: Marco Teunissen van Manen Date: Thu, 18 Aug 2016 13:07:17 +0200 Subject: [PATCH 06/21] Update generic_abs.xml.fdm_material Adding properties (density/diameter) --- generic_abs.xml.fdm_material | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generic_abs.xml.fdm_material b/generic_abs.xml.fdm_material index 2c62c725fe..95e9dadf5b 100644 --- a/generic_abs.xml.fdm_material +++ b/generic_abs.xml.fdm_material @@ -14,6 +14,8 @@ Generic ABS profile. Serves as an example file, data in this file is not correct #FFFFFF + 1.3 + 2.85 240 From d9d6d1849a8db6db8e8c2fc76e470188e7eacd70 Mon Sep 17 00:00:00 2001 From: Marco Teunissen van Manen Date: Thu, 18 Aug 2016 13:07:52 +0200 Subject: [PATCH 07/21] Update generic_cpe.xml.fdm_material Added properties (density, diameter) --- generic_cpe.xml.fdm_material | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generic_cpe.xml.fdm_material b/generic_cpe.xml.fdm_material index a1ae81cfd7..4af8f1276a 100644 --- a/generic_cpe.xml.fdm_material +++ b/generic_cpe.xml.fdm_material @@ -14,6 +14,8 @@ Generic CPE profile. Serves as an example file, data in this file is not correct #FFFFFF + 1.3 + 2.85 250 From eb8cedb1c62b9ca19646a98c11c4a70ea60bc9e1 Mon Sep 17 00:00:00 2001 From: Marco Teunissen van Manen Date: Thu, 18 Aug 2016 13:08:21 +0200 Subject: [PATCH 08/21] Update generic_pla.xml.fdm_material Added properties (density, diameter) --- generic_pla.xml.fdm_material | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generic_pla.xml.fdm_material b/generic_pla.xml.fdm_material index d30a855018..7f70fc7170 100644 --- a/generic_pla.xml.fdm_material +++ b/generic_pla.xml.fdm_material @@ -14,6 +14,8 @@ Generic PLA profile. Serves as an example file, data in this file is not correct #FFFFFF + 1.3 + 2.85 200 From 55942af9f735c5ee300fa5d3c25f80552692d79d Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 18 Aug 2016 13:09:15 +0200 Subject: [PATCH 09/21] Remove non-existing blackmagic/dual setting from defaults --- cura/CuraApplication.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 25a6d590e3..6a89c86e85 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -248,7 +248,6 @@ class CuraApplication(QtApplication): blackmagic print_sequence infill_mesh - dual experimental """.replace("\n", ";").replace(" ", "")) From 6e422e611c903770fd15659d64063bdc754e3444 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 18 Aug 2016 13:11:14 +0200 Subject: [PATCH 10/21] Change Simple Mode "print brim" to print a brim or raft CURA-2135 --- resources/qml/SidebarSimple.qml | 36 ++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml index ab00a33cac..b60a593629 100644 --- a/resources/qml/SidebarSimple.qml +++ b/resources/qml/SidebarSimple.qml @@ -213,7 +213,7 @@ Item id: adhesionHelperLabel anchors.left: parent.left anchors.leftMargin: UM.Theme.getSize("default_margin").width - anchors.verticalCenter: brimCheckBox.verticalCenter + anchors.verticalCenter: adhesionCheckBox.verticalCenter width: parent.width / 100 * 35 - 3 * UM.Theme.getSize("default_margin").width //: Bed adhesion label text: catalog.i18nc("@label", "Helper Parts:"); @@ -222,33 +222,45 @@ Item } CheckBox{ - id: brimCheckBox - property alias _hovered: brimMouseArea.containsMouse + id: adhesionCheckBox + property alias _hovered: adhesionMouseArea.containsMouse anchors.top: parent.top anchors.left: adhesionHelperLabel.right anchors.leftMargin: UM.Theme.getSize("default_margin").width - //: Setting enable skirt adhesion checkbox - text: catalog.i18nc("@option:check", "Print Brim"); + //: Setting enable printing build-plate adhesion helper checkbox + text: catalog.i18nc("@option:check", "Print Build Plate Adhesion"); style: UM.Theme.styles.checkbox; enabled: base.settingsEnabled - checked: platformAdhesionType.properties.value == "brim" + checked: platformAdhesionType.properties.value != "skirt" MouseArea { - id: brimMouseArea + id: adhesionMouseArea anchors.fill: parent hoverEnabled: true enabled: base.settingsEnabled onClicked: { - platformAdhesionType.setPropertyValue("value", !parent.checked ? "brim" : "skirt") + var adhesionType = "skirt"; + if(!parent.checked) + { + // Remove the "user" setting to see if the rest of the stack prescribes a brim or a raft + platformAdhesionType.removeFromContainer(0); + adhesionType = platformAdhesionType.properties.value; + if(adhesionType == "skirt") + { + // If the rest of the stack doesn't prescribe an adhesion-type, default to a brim + adhesionType = "brim"; + } + } + platformAdhesionType.setPropertyValue("value", adhesionType); } onEntered: { - base.showTooltip(brimCheckBox, Qt.point(-brimCheckBox.x, 0), - catalog.i18nc("@label", "Enable printing a brim. This will add a single-layer-thick flat area around your object which is easy to cut off afterwards.")); + base.showTooltip(adhesionCheckBox, Qt.point(-adhesionCheckBox.x, 0), + catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards.")); } onExited: { @@ -274,7 +286,7 @@ Item visible: machineExtruderCount.properties.value <= 1 property alias _hovered: supportMouseArea.containsMouse - anchors.top: brimCheckBox.bottom + anchors.top: adhesionCheckBox.bottom anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.left: supportHelperLabel.right anchors.leftMargin: UM.Theme.getSize("default_margin").width @@ -311,7 +323,7 @@ Item visible: machineExtruderCount.properties.value > 1 model: extruderModel - anchors.top: brimCheckBox.bottom + anchors.top: adhesionCheckBox.bottom anchors.topMargin: UM.Theme.getSize("default_margin").height anchors.left: supportHelperLabel.right anchors.leftMargin: UM.Theme.getSize("default_margin").width From d36780ba54f0e208e6c7ff1b4b91c4ebdc0a7dc4 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 18 Aug 2016 13:20:55 +0200 Subject: [PATCH 11/21] Removed superfluous M140 command --- resources/definitions/innovo_inventor.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json index 7eb03437d7..e5269bd6ed 100644 --- a/resources/definitions/innovo_inventor.def.json +++ b/resources/definitions/innovo_inventor.def.json @@ -56,7 +56,7 @@ "default_value": "G28 ; Home extruder\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\n{IF_BED}M190 S{BED}\n{IF_EXT0}M104 T0 S{TEMP0}\n{IF_EXT0}M109 T0 S{TEMP0}\n{IF_EXT1}M104 T1 S{TEMP1}\n{IF_EXT1}M109 T1 S{TEMP1}\nG32 S3 ; auto level\nG92 E0 ; Reset extruder position" }, "machine_end_gcode": { - "default_value": "M104 S0\nM140 S0 ; heated bed heater off\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors" + "default_value": "M140 S0 ; heated bed heater off\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors" }, "layer_height": { "default_value": 0.15 From 37e9382ce878168591cda1cbcaca7d869983878f Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 18 Aug 2016 13:27:45 +0200 Subject: [PATCH 12/21] Remove unused "machine_preferences" section --- resources/definitions/innovo_inventor.def.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json index e5269bd6ed..a6053e4668 100644 --- a/resources/definitions/innovo_inventor.def.json +++ b/resources/definitions/innovo_inventor.def.json @@ -95,9 +95,5 @@ "infill_overlap": { "default_value": 10.0 } - }, - "machine_preferences": { - "prefered_profile": "Normal Quality", - "prefered_material": "PLA" - } + } } From 727f53b3d18e257849c88ac4f6f12706cceb8c7e Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 18 Aug 2016 13:36:39 +0200 Subject: [PATCH 13/21] Update densities with data from materials team --- generic_abs.xml.fdm_material | 2 +- generic_cpe.xml.fdm_material | 2 +- generic_pla.xml.fdm_material | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/generic_abs.xml.fdm_material b/generic_abs.xml.fdm_material index 95e9dadf5b..91f0841453 100644 --- a/generic_abs.xml.fdm_material +++ b/generic_abs.xml.fdm_material @@ -14,7 +14,7 @@ Generic ABS profile. Serves as an example file, data in this file is not correct #FFFFFF - 1.3 + 1.10 2.85 diff --git a/generic_cpe.xml.fdm_material b/generic_cpe.xml.fdm_material index 4af8f1276a..c55e3e881c 100644 --- a/generic_cpe.xml.fdm_material +++ b/generic_cpe.xml.fdm_material @@ -14,7 +14,7 @@ Generic CPE profile. Serves as an example file, data in this file is not correct #FFFFFF - 1.3 + 1.27 2.85 diff --git a/generic_pla.xml.fdm_material b/generic_pla.xml.fdm_material index 7f70fc7170..0febcc395f 100644 --- a/generic_pla.xml.fdm_material +++ b/generic_pla.xml.fdm_material @@ -14,8 +14,8 @@ Generic PLA profile. Serves as an example file, data in this file is not correct #FFFFFF - 1.3 - 2.85 + 1.24 + 2.85 200 From 74fec5c3ec7887f7e4db6da9c747ad089acca566 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 18 Aug 2016 13:50:46 +0200 Subject: [PATCH 14/21] Merge data with Cura repo --- generic_abs.xml.fdm_material | 12 +++++++++++- generic_cpe.xml.fdm_material | 12 +++++++++++- generic_pla.xml.fdm_material | 12 +++++++++++- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/generic_abs.xml.fdm_material b/generic_abs.xml.fdm_material index 91f0841453..f34c32b179 100644 --- a/generic_abs.xml.fdm_material +++ b/generic_abs.xml.fdm_material @@ -11,7 +11,7 @@ Generic ABS profile. Serves as an example file, data in this file is not correct 60636bb4-518f-42e7-8237-fe77b194ebe0 0 - #FFFFFF + #8cb219 1.10 @@ -21,5 +21,15 @@ Generic ABS profile. Serves as an example file, data in this file is not correct 240 80 200 + + + + + + + + + + diff --git a/generic_cpe.xml.fdm_material b/generic_cpe.xml.fdm_material index c55e3e881c..9c76170e90 100644 --- a/generic_cpe.xml.fdm_material +++ b/generic_cpe.xml.fdm_material @@ -11,7 +11,7 @@ Generic CPE profile. Serves as an example file, data in this file is not correct 12f41353-1a33-415e-8b4f-a775a6c70cc6 0 - #FFFFFF + #159499 1.27 @@ -21,5 +21,15 @@ Generic CPE profile. Serves as an example file, data in this file is not correct 250 70 175 + + + + + + + + + + diff --git a/generic_pla.xml.fdm_material b/generic_pla.xml.fdm_material index 0febcc395f..1150d8f6a0 100644 --- a/generic_pla.xml.fdm_material +++ b/generic_pla.xml.fdm_material @@ -11,7 +11,7 @@ Generic PLA profile. Serves as an example file, data in this file is not correct 506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9 0 - #FFFFFF + #ffc924 1.24 @@ -22,6 +22,16 @@ Generic PLA profile. Serves as an example file, data in this file is not correct 60 175 + + + + + + + + + + From 2ff4e70c17e6e5019be877a1b99e4f285cc8fbcc Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 18 Aug 2016 15:35:53 +0200 Subject: [PATCH 15/21] 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 @@ @@ -14,12 +14,13 @@ Generic PLA profile. Serves as an example file, data in this file is not correct #8cb219 - 1.07 + 1.10 2.85 - 250 + 240 80 + 200 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 @@ @@ -14,12 +14,13 @@ Generic PLA profile. Serves as an example file, data in this file is not correct #159499 - 0.94 + 1.27 2.85 250 70 + 175 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 #ffc924 - 1.3 + 1.24 2.85 - 210 + 200 60 + 175 @@ -30,5 +31,27 @@ Generic PLA profile. Serves as an example file, data in this file is not correct + + + + + + 150 + + + + + + + + + 150 + + 80 + + + 100 + + From 8d00e28fb0c9198874c4d66ba5e75028c4f6c207 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 18 Aug 2016 16:40:36 +0200 Subject: [PATCH 16/21] Update versions, per the specification --- generic_abs.xml.fdm_material | 2 +- generic_cpe.xml.fdm_material | 2 +- generic_pla.xml.fdm_material | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/generic_abs.xml.fdm_material b/generic_abs.xml.fdm_material index f34c32b179..b2c81d1a0a 100644 --- a/generic_abs.xml.fdm_material +++ b/generic_abs.xml.fdm_material @@ -10,7 +10,7 @@ Generic ABS profile. Serves as an example file, data in this file is not correct Generic 60636bb4-518f-42e7-8237-fe77b194ebe0 - 0 + 1 #8cb219 diff --git a/generic_cpe.xml.fdm_material b/generic_cpe.xml.fdm_material index 9c76170e90..7cf7e6f836 100644 --- a/generic_cpe.xml.fdm_material +++ b/generic_cpe.xml.fdm_material @@ -10,7 +10,7 @@ Generic CPE profile. Serves as an example file, data in this file is not correct Generic 12f41353-1a33-415e-8b4f-a775a6c70cc6 - 0 + 1 #159499 diff --git a/generic_pla.xml.fdm_material b/generic_pla.xml.fdm_material index 1150d8f6a0..8c212e6aab 100644 --- a/generic_pla.xml.fdm_material +++ b/generic_pla.xml.fdm_material @@ -10,7 +10,7 @@ Generic PLA profile. Serves as an example file, data in this file is not correct Generic 506c9f0d-e3aa-4bd4-b2d2-23e2425b1aa9 - 0 + 1 #ffc924 From 49c885923a674f805e20b343b03c6e3825bebde1 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 18 Aug 2016 17:10:45 +0200 Subject: [PATCH 17/21] Update machine_identifiers --- resources/materials/generic_abs.xml.fdm_material | 4 ++-- resources/materials/generic_cpe.xml.fdm_material | 4 ++-- resources/materials/generic_pla.xml.fdm_material | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/materials/generic_abs.xml.fdm_material b/resources/materials/generic_abs.xml.fdm_material index b2c81d1a0a..ef2db0b7fd 100644 --- a/resources/materials/generic_abs.xml.fdm_material +++ b/resources/materials/generic_abs.xml.fdm_material @@ -23,8 +23,8 @@ Generic ABS profile. Serves as an example file, data in this file is not correct 200 - - + + diff --git a/resources/materials/generic_cpe.xml.fdm_material b/resources/materials/generic_cpe.xml.fdm_material index 7cf7e6f836..1fa878e466 100644 --- a/resources/materials/generic_cpe.xml.fdm_material +++ b/resources/materials/generic_cpe.xml.fdm_material @@ -23,8 +23,8 @@ Generic CPE profile. Serves as an example file, data in this file is not correct 175 - - + + diff --git a/resources/materials/generic_pla.xml.fdm_material b/resources/materials/generic_pla.xml.fdm_material index 8c212e6aab..5a1992e714 100644 --- a/resources/materials/generic_pla.xml.fdm_material +++ b/resources/materials/generic_pla.xml.fdm_material @@ -23,8 +23,8 @@ Generic PLA profile. Serves as an example file, data in this file is not correct 175 - - + + @@ -33,9 +33,9 @@ Generic PLA profile. Serves as an example file, data in this file is not correct - - - + + + 150 From 86ead221436813afd22e0ae537dcbe133d06d309 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 18 Aug 2016 17:18:03 +0200 Subject: [PATCH 18/21] Make machine identifiers consistent CURA-2136 --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 84b78c1d6a..b909a0e375 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -293,7 +293,7 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer): for identifier in identifiers: machine_id = self.__product_id_map.get(identifier.get("product"), None) if machine_id is None: - Logger.log("w", "Cannot create material for unknown machine %s", machine_id) + Logger.log("w", "Cannot create material for unknown machine %s", identifier.get("product")) continue definitions = UM.Settings.ContainerRegistry.getInstance().findDefinitionContainers(id = machine_id) @@ -374,6 +374,7 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer): "print temperature": "material_print_temperature", "heated bed temperature": "material_bed_temperature", "standby temperature": "material_standby_temperature", + "processing temperature graph": "material_flow_temp_graph", "print cooling": "cool_fan_speed", "retraction amount": "retraction_amount", "retraction speed": "retraction_speed", @@ -382,11 +383,11 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer): # Map XML file product names to internal ids # TODO: Move this to definition's metadata __product_id_map = { - "Ultimaker2": "ultimaker2", - "Ultimaker2+": "ultimaker2_plus", - "Ultimaker2go": "ultimaker2_go", - "Ultimaker2extended": "ultimaker2_extended", - "Ultimaker2extended+": "ultimaker2_extended_plus", + "Ultimaker 2": "ultimaker2", + "Ultimaker 2+": "ultimaker2_plus", + "Ultimaker 2 Go": "ultimaker2_go", + "Ultimaker 2 Extended": "ultimaker2_extended", + "Ultimaker 2 Extended+": "ultimaker2_extended_plus", "Ultimaker Original": "ultimaker_original", "Ultimaker Original+": "ultimaker_original_plus" } From 7911254edc48a55bb9ea46fa0b5237f3a1392731 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 18 Aug 2016 17:28:03 +0200 Subject: [PATCH 19/21] Update machine identifiers --- generic_abs.xml.fdm_material | 4 ++-- generic_cpe.xml.fdm_material | 4 ++-- generic_pla.xml.fdm_material | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/generic_abs.xml.fdm_material b/generic_abs.xml.fdm_material index b2c81d1a0a..ef2db0b7fd 100644 --- a/generic_abs.xml.fdm_material +++ b/generic_abs.xml.fdm_material @@ -23,8 +23,8 @@ Generic ABS profile. Serves as an example file, data in this file is not correct 200 - - + + diff --git a/generic_cpe.xml.fdm_material b/generic_cpe.xml.fdm_material index 7cf7e6f836..1fa878e466 100644 --- a/generic_cpe.xml.fdm_material +++ b/generic_cpe.xml.fdm_material @@ -23,8 +23,8 @@ Generic CPE profile. Serves as an example file, data in this file is not correct 175 - - + + diff --git a/generic_pla.xml.fdm_material b/generic_pla.xml.fdm_material index 8c212e6aab..5a1992e714 100644 --- a/generic_pla.xml.fdm_material +++ b/generic_pla.xml.fdm_material @@ -23,8 +23,8 @@ Generic PLA profile. Serves as an example file, data in this file is not correct 175 - - + + @@ -33,9 +33,9 @@ Generic PLA profile. Serves as an example file, data in this file is not correct - - - + + + 150 From f9d00f57ce0059b0b68b08d371ef19d2ceeb061e Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 18 Aug 2016 17:39:22 +0200 Subject: [PATCH 20/21] Revert "Removed superfluous M140 command" This reverts commit d36780ba54f0e208e6c7ff1b4b91c4ebdc0a7dc4. One was M104, the other was M140. I am not dyslecitc, my mother had me tested. --- resources/definitions/innovo_inventor.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json index a6053e4668..511617c3e6 100644 --- a/resources/definitions/innovo_inventor.def.json +++ b/resources/definitions/innovo_inventor.def.json @@ -56,7 +56,7 @@ "default_value": "G28 ; Home extruder\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\n{IF_BED}M190 S{BED}\n{IF_EXT0}M104 T0 S{TEMP0}\n{IF_EXT0}M109 T0 S{TEMP0}\n{IF_EXT1}M104 T1 S{TEMP1}\n{IF_EXT1}M109 T1 S{TEMP1}\nG32 S3 ; auto level\nG92 E0 ; Reset extruder position" }, "machine_end_gcode": { - "default_value": "M140 S0 ; heated bed heater off\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors" + "default_value": "M104 S0\nM140 S0 ; heated bed heater off\nG91 ; relative positioning\nG1 E-2 F5000; retract 2mm\nG28 Z; move bed down\nG90 ; absolute positioning\nM84 ; disable motors" }, "layer_height": { "default_value": 0.15 From ec04b414ecdc78e31f8de120c197fb48dcc3cb77 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 18 Aug 2016 17:47:53 +0200 Subject: [PATCH 21/21] Remove 0.6mm and 0.8mm hotends for UMO because we don't support them in Cura --- generic_pla.xml.fdm_material | 6 ------ 1 file changed, 6 deletions(-) diff --git a/generic_pla.xml.fdm_material b/generic_pla.xml.fdm_material index 5a1992e714..a98e0e469c 100644 --- a/generic_pla.xml.fdm_material +++ b/generic_pla.xml.fdm_material @@ -46,12 +46,6 @@ Generic PLA profile. Serves as an example file, data in this file is not correct 150 - - 80 - - - 100 -