From b60cfaab64f77b01580971c6f1b2523cb84b531a Mon Sep 17 00:00:00 2001 From: Wilmer Gaona Date: Tue, 19 Feb 2019 15:32:23 -0600 Subject: [PATCH 1/5] Update mendel90.def.json The main modification is to set absolute extrusion and machine center in the start gcode --- resources/definitions/mendel90.def.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/definitions/mendel90.def.json b/resources/definitions/mendel90.def.json index 104ca7f42f..2d08697e8f 100644 --- a/resources/definitions/mendel90.def.json +++ b/resources/definitions/mendel90.def.json @@ -5,7 +5,7 @@ "metadata": { "visible": true, - "author": "Bo Herrmannsen", + "author": "Wilmer Gaona", "manufacturer": "Nophead", "file_formats": "text/x-gcode", "platform": "mendel90_platform.stl", @@ -23,10 +23,10 @@ "overrides": { "machine_name": { "default_value": "Mendel90" }, "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\nM107 ;start with the fan off\nG1 X90 Y200 F6000 ;go to the middle of the front\nG1 Z0.05 ;close to the bed\nG1 Z0.3 ;lift Z\n" + "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;absolute extrusion\nM107 ;start with the fan off\nG28 ;home\nG92 E0 ;zero the extruded length\n;M109 S175; preheat the extruder temp & wait\n;G1 E120 F50; extrude filament for insert it\n;G92 E0 ;zero the extruded length\nM140 S{material_bed_temperature_layer_0} ; set the bed temperature and continue on\nG1 X-50 Y98 F9000 ;go to the left of the top\nG1 Z0.05 ; close to the bed\nM104 S{material_print_temperature_layer_0}; pre-heat the extruder continue on\nM190 S{material_bed_temperature_layer_0} ;set the bed temp & wait\nM109 S{material_print_temperature_layer_0};set the extruder temp for layer 0 & wait\nG92 E0 ;zero the extruded length\nG1 X50 E10 F300 ; make a thick line to prime extruder\nG92 E0 ; reset extruder\nG1 E-4 F1800\nG1 Z0.3 ;lift Z\n" }, "machine_end_gcode": { - "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nM107 ;carriage fan off\nG91 ;relative positioning\nG1 Z10 ;Move up Z 10mm\nG90 ;back to absolute mode\nG1 E-1 F1200 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG92 E0 ;zero the extruded length\nG1 Y200 F5000 ;Move Y to middle of bed cooling fan\nM42 P42 S255 ;Turn on Bed cooling fan on\nG4 S420 ;Wait 7 mins\nM42 P42 S0 ;Turn off bed cooling fan\nG1 Y10 F5000 ;Move Y to front\nM84 ;steppers off\n" + "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nM107 ;carriage fan off\nG91 ;relative positioning\nG1 Z10 ;Move up Z 10mm\nG90 ;back to absolute mode\nG1 E-1 F1200 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG92 E0 ;zero the extruded length\nG1 Z200 X-100 F9000 ; go to top\nG1 Y100 F5000 ;Move Y to back\nM42 P42 S255 ;Turn on Bed cooling fan on\nG4 S10 ;Wait 10 seconds\nM42 P42 S0 ;Turn off bed cooling fan\nM84 ;steppers off\n" }, "material_bed_temp_wait": { "default_value": true @@ -47,7 +47,7 @@ "default_value": true }, "machine_center_is_zero": { - "default_value": false + "default_value": true }, "machine_extruder_count": { "default_value": 1 From b4e4b7125d5decfa972d76153aaa0640b662210e Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 20 Feb 2019 13:27:05 +0100 Subject: [PATCH 2/5] Fix tab-bar of config.-menu always on idex 0 on reshow. [CURA-6232] --- .../qml/Menus/ConfigurationMenu/CustomConfiguration.qml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index 606dc142be..141e85a10b 100644 --- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml @@ -124,6 +124,15 @@ Item } } + // Can't use 'item: ...activeExtruderIndex' directly apparently, see also the comment on the previous block. + onVisibleChanged: + { + if (tabBar.visible) + { + tabBar.setCurrentIndex(Cura.ExtruderManager.activeExtruderIndex); + } + } + //When the model of the extruders is rebuilt, the list of extruders is briefly emptied and rebuilt. //This causes the currentIndex of the tab to be in an invalid position which resets it to 0. //Therefore we need to change it back to what it was: The active extruder index. From 57a4ac87bb4c672ae01d89a4d600c79a23dae693 Mon Sep 17 00:00:00 2001 From: Wilmer Gaona Date: Thu, 21 Feb 2019 11:09:51 -0600 Subject: [PATCH 3/5] Update mendel90.def.json Delete the unnecessary and commented lines --- resources/definitions/mendel90.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/mendel90.def.json b/resources/definitions/mendel90.def.json index 2d08697e8f..85d82ae176 100644 --- a/resources/definitions/mendel90.def.json +++ b/resources/definitions/mendel90.def.json @@ -23,7 +23,7 @@ "overrides": { "machine_name": { "default_value": "Mendel90" }, "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;absolute extrusion\nM107 ;start with the fan off\nG28 ;home\nG92 E0 ;zero the extruded length\n;M109 S175; preheat the extruder temp & wait\n;G1 E120 F50; extrude filament for insert it\n;G92 E0 ;zero the extruded length\nM140 S{material_bed_temperature_layer_0} ; set the bed temperature and continue on\nG1 X-50 Y98 F9000 ;go to the left of the top\nG1 Z0.05 ; close to the bed\nM104 S{material_print_temperature_layer_0}; pre-heat the extruder continue on\nM190 S{material_bed_temperature_layer_0} ;set the bed temp & wait\nM109 S{material_print_temperature_layer_0};set the extruder temp for layer 0 & wait\nG92 E0 ;zero the extruded length\nG1 X50 E10 F300 ; make a thick line to prime extruder\nG92 E0 ; reset extruder\nG1 E-4 F1800\nG1 Z0.3 ;lift Z\n" + "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;absolute extrusion\nM107 ;start with the fan off\nG28 ;home\nG92 E0 ;zero the extruded length\nM140 S{material_bed_temperature_layer_0} ; set the bed temperature and continue on\nG1 X-50 Y98 F9000 ;go to the left of the top\nG1 Z0.05 ; close to the bed\nM104 S{material_print_temperature_layer_0}; pre-heat the extruder continue on\nM190 S{material_bed_temperature_layer_0} ;set the bed temp & wait\nM109 S{material_print_temperature_layer_0};set the extruder temp for layer 0 & wait\nG92 E0 ;zero the extruded length\nG1 X50 E10 F300 ; make a thick line to prime extruder\nG92 E0 ; reset extruder\nG1 E-4 F1800\nG1 Z0.3 ;lift Z\n" }, "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nM107 ;carriage fan off\nG91 ;relative positioning\nG1 Z10 ;Move up Z 10mm\nG90 ;back to absolute mode\nG1 E-1 F1200 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG92 E0 ;zero the extruded length\nG1 Z200 X-100 F9000 ; go to top\nG1 Y100 F5000 ;Move Y to back\nM42 P42 S255 ;Turn on Bed cooling fan on\nG4 S10 ;Wait 10 seconds\nM42 P42 S0 ;Turn off bed cooling fan\nM84 ;steppers off\n" From 5d8eb3e6e535dfc36036ff6657df293edb1f5492 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Fri, 22 Feb 2019 13:18:20 +0100 Subject: [PATCH 4/5] Fix typo --- plugins/SliceInfoPlugin/MoreInfoWindow.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/SliceInfoPlugin/MoreInfoWindow.qml b/plugins/SliceInfoPlugin/MoreInfoWindow.qml index 985ebe94a2..d6a6190be2 100644 --- a/plugins/SliceInfoPlugin/MoreInfoWindow.qml +++ b/plugins/SliceInfoPlugin/MoreInfoWindow.qml @@ -108,7 +108,7 @@ UM.Dialog RadioButton { id: allowSendButton - text: catalog.i18nc("@text:window", "Allow sending these data to Ultimaker and help us improve Cura") + text: catalog.i18nc("@text:window", "Allow sending this data to Ultimaker and help us improve Cura") exclusiveGroup: group onClicked: { From 271573d0aee3faf7c4c72cfd994b31ff6d2dac0f Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Fri, 22 Feb 2019 13:19:04 +0100 Subject: [PATCH 5/5] Fix typo... again --- plugins/SliceInfoPlugin/MoreInfoWindow.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/SliceInfoPlugin/MoreInfoWindow.qml b/plugins/SliceInfoPlugin/MoreInfoWindow.qml index d6a6190be2..e00ad6730d 100644 --- a/plugins/SliceInfoPlugin/MoreInfoWindow.qml +++ b/plugins/SliceInfoPlugin/MoreInfoWindow.qml @@ -98,7 +98,7 @@ UM.Dialog RadioButton { id: dontSendButton - text: catalog.i18nc("@text:window", "I don't want to send these data") + text: catalog.i18nc("@text:window", "I don't want to send this data") exclusiveGroup: group onClicked: {