From 13c8091fbca16594d40dd368f6f17a39acdec832 Mon Sep 17 00:00:00 2001 From: Gregory Diaz Date: Fri, 24 Apr 2015 10:25:03 -0700 Subject: [PATCH 1/3] added 'Extruder Wipe Temperature' and "Bed Remove Part Temperature" to Slice Settings --- .../SlicerMapping/EngineMappingMatterSlice.cs | 2 ++ StaticData/PrinterSettings/config.ini | 2 ++ StaticData/SliceSettings/Layouts.txt | 4 ++++ StaticData/SliceSettings/Properties.json | 14 ++++++++++++++ StaticData/Translations/Master.txt | 18 ++++++++++++++++++ 5 files changed, 40 insertions(+) diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs index da33fa4cb..33c3e72c9 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs @@ -209,6 +209,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration new VisibleButNotMappedToEngine("", "has_sd_card_reader"), new VisibleButNotMappedToEngine("", "z_can_be_negative"), new VisibleButNotMappedToEngine("", "show_reset_connection"), + new VisibleButNotMappedToEngine("", "extruder_wipe_temperature"), + new VisibleButNotMappedToEngine("", "bed_remove_part_temperature"), //retractionOnExtruderSwitch=14.5 new MapItem("retractionOnExtruderSwitch", "retract_length_tool_change"), diff --git a/StaticData/PrinterSettings/config.ini b/StaticData/PrinterSettings/config.ini index ee6e0b50a..5c98d9c0a 100644 --- a/StaticData/PrinterSettings/config.ini +++ b/StaticData/PrinterSettings/config.ini @@ -26,6 +26,7 @@ extruder_clearance_height = 20 extruder_clearance_radius = 20 extruder_count = 1 extruder_offset = 0x0,0x0,0x0,0x0 +extruder_wipe_temperature = 0 extruders_share_temperature = 0 extrusion_axis = E extrusion_multiplier = 1 @@ -90,6 +91,7 @@ raft_extra_distance_around_part = 5 raft_fan_speed_percent = 100 raft_layers = 0 raft_print_speed = 100% +bed_remove_part_temperature = 0 randomize_start = 0 repair_outlines_extensive_stitching = 0 repair_outlines_keep_open = 0 diff --git a/StaticData/SliceSettings/Layouts.txt b/StaticData/SliceSettings/Layouts.txt index d6ce70e02..762915e99 100644 --- a/StaticData/SliceSettings/Layouts.txt +++ b/StaticData/SliceSettings/Layouts.txt @@ -37,6 +37,8 @@ Intermediate temperature first_layer_bed_temperature bed_temperature + extruder_wipe_temperature + bed_remove_part_temperature Cooling Enable cooling @@ -199,6 +201,8 @@ Advanced temperature first_layer_bed_temperature bed_temperature + extruder_wipe_temperature + bed_remove_part_temperature Retraction retract_length retract_length_tool_change diff --git a/StaticData/SliceSettings/Properties.json b/StaticData/SliceSettings/Properties.json index c425175a8..8ac791b94 100644 --- a/StaticData/SliceSettings/Properties.json +++ b/StaticData/SliceSettings/Properties.json @@ -983,6 +983,20 @@ "DataEditType": "POSITIVE_DOUBLE", "ExtraSettings": "degrees" }, + { + "SlicerConfigName": "extruder_wipe_temperature", + "PresentationName": "Extruder Wipe Temperature", + "HelpText": "The temperature the extruder will be when extruder wipes.", + "DataEditType": "POSITIVE_DOUBLE", + "ExtraSettings": "degrees" + }, + { + "SlicerConfigName": "bed_remove_part_temperature", + "PresentationName": "Bed Remove Part Temperature", + "HelpText": "The temperature the bed temperature will be set to when part is to be removed.", + "DataEditType": "POSITIVE_DOUBLE", + "ExtraSettings": "degrees" + }, { "SlicerConfigName": "thin_walls", "PresentationName": "Thin Walls", diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index f9d5d5aa9..cf04be674 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -3173,3 +3173,21 @@ Translated:On English:Off Translated:Off +English:The temperature the extruder will be when extruder wipes. +Translated:The temperature the extruder will be when extruder wipes. + +English:Wipe Extruder Temperature +Translated:Wipe Extruder Temperature + +English:The temperature the bed temperature will be set to when part is to be removed. +Translated:The temperature the bed temperature will be set to when part is to be removed. + +English:Remove Part Temperature +Translated:Remove Part Temperature + +English:Extruder Wipe Temperature +Translated:Extruder Wipe Temperature + +English:Bed Remove Part Temperature +Translated:Bed Remove Part Temperature + From f59840d3909fb313473396973a36127886309f81 Mon Sep 17 00:00:00 2001 From: Gregory Diaz Date: Fri, 24 Apr 2015 13:32:49 -0700 Subject: [PATCH 2/3] commit with correct versions of agg-sharp and matterslice --- StaticData/Translations/Master.txt | 12 ++++++++++++ Submodules/MatterSlice | 2 +- Submodules/agg-sharp | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index f97b56e04..28d310ca0 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -3185,3 +3185,15 @@ Translated:The number of layers, or the distance, to skip between the support an English:How many layers, or the distance, that will be solid filled on the top surfaces of the object. Add mm to the end of the number to specify distance. Translated:How many layers, or the distance, that will be solid filled on the top surfaces of the object. Add mm to the end of the number to specify distance. +English:The temperature the extruder will be when extruder wipes. +Translated:The temperature the extruder will be when extruder wipes. + +English:The temperature the bed temperature will be set to when part is to be removed. +Translated:The temperature the bed temperature will be set to when part is to be removed. + +English:Extruder Wipe Temperature +Translated:Extruder Wipe Temperature + +English:Bed Remove Part Temperature +Translated:Bed Remove Part Temperature + diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index 79b23e380..3ddee1130 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit 79b23e380ea3c2b178713bd32d6d309f84e0506a +Subproject commit 3ddee1130a79b20633e08c9c598f97620654aa15 diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 1956e1296..64ccce5a1 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 1956e129608bb7dd5c0c942ca35791c2f50f411e +Subproject commit 64ccce5a1542c4521f3dc015d679d71c4b06966e From 141344ca7ec4450661402b8ecd14db33b2383ad1 Mon Sep 17 00:00:00 2001 From: Gregory Diaz Date: Thu, 30 Apr 2015 09:39:17 -0700 Subject: [PATCH 3/3] commit to merge --- Submodules/agg-sharp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 621a87d39..c8f5362de 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 621a87d39994cbe6a13cb2df4843ff02f77f9b31 +Subproject commit c8f5362defc8e80f2eaa3c0f9a720ffbcbb40ac0