From 9e73bab7d2ae47a5633aff5c629ea8ca806af4a9 Mon Sep 17 00:00:00 2001
From: Lars Brubaker <larsbrubaker@gmail.com>
Date: Thu, 18 Feb 2021 17:20:14 -0800
Subject: [PATCH] Make wipe tower be able to be hollow

issue: MatterHackers/MCCentral#5498
Make wipe tower hollow
---
 MatterControl.Printing/Settings/SettingsKey.cs         |  1 +
 MatterControl.Printing/Settings/SliceSettingsFields.cs | 10 ++++++++++
 .../Settings/SliceSettingsLayouts.cs                   |  1 +
 .../SlicerConfiguration/EngineMappingsMatterSlice.cs   |  1 +
 Submodules/MatterSlice                                 |  2 +-
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/MatterControl.Printing/Settings/SettingsKey.cs b/MatterControl.Printing/Settings/SettingsKey.cs
index 9c38b7592..f312b0a5b 100644
--- a/MatterControl.Printing/Settings/SettingsKey.cs
+++ b/MatterControl.Printing/Settings/SettingsKey.cs
@@ -292,6 +292,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 		public const string validate_leveling = nameof(validate_leveling);
 		public const string validation_threshold = nameof(validation_threshold);
 		public const string wipe_shield_distance = nameof(wipe_shield_distance);
+		public const string wipe_tower_perimeters_per_extruder = nameof(wipe_tower_perimeters_per_extruder);
 		public const string wipe_tower_size = nameof(wipe_tower_size);
 		public const string write_regex = nameof(write_regex);
 		public const string xy_offsets_have_been_calibrated = nameof(xy_offsets_have_been_calibrated);
diff --git a/MatterControl.Printing/Settings/SliceSettingsFields.cs b/MatterControl.Printing/Settings/SliceSettingsFields.cs
index 73d10e723..af2ac4134 100644
--- a/MatterControl.Printing/Settings/SliceSettingsFields.cs
+++ b/MatterControl.Printing/Settings/SliceSettingsFields.cs
@@ -2538,6 +2538,16 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 					Converter = new ValueConverter(),
 				},
 				new SliceSettingData()
+				{
+					SlicerConfigName = SettingsKey.wipe_tower_perimeters_per_extruder,
+					PresentationName = "Perimeters Per Extruder".Localize(),
+					HelpText = "The number of perimeters will be this number times the number of active extruders. Make this a smaller number to make the wipe more hollow or bigger to fill it.".Localize(),
+					DataEditType = DataEditTypes.INT,
+					ShowIfSet = "extruder_count>1",
+					DefaultValue = "20",
+					Converter = new ValueConverter(),
+				},
+				new SliceSettingData()
 				{
 					SlicerConfigName = SettingsKey.wipe_tower_size,
 					PresentationName = "Wipe Tower Size".Localize(),
diff --git a/MatterControl.Printing/Settings/SliceSettingsLayouts.cs b/MatterControl.Printing/Settings/SliceSettingsLayouts.cs
index 42e302ed7..23798a48f 100644
--- a/MatterControl.Printing/Settings/SliceSettingsLayouts.cs
+++ b/MatterControl.Printing/Settings/SliceSettingsLayouts.cs
@@ -87,6 +87,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 					{
 						SettingsKey.wipe_shield_distance,
 						SettingsKey.wipe_tower_size,
+						SettingsKey.wipe_tower_perimeters_per_extruder,
 					}),
 					("Advanced", new[]
 					{
diff --git a/MatterControlLib/SlicerConfiguration/EngineMappingsMatterSlice.cs b/MatterControlLib/SlicerConfiguration/EngineMappingsMatterSlice.cs
index a79fd5dfe..48a18211e 100644
--- a/MatterControlLib/SlicerConfiguration/EngineMappingsMatterSlice.cs
+++ b/MatterControlLib/SlicerConfiguration/EngineMappingsMatterSlice.cs
@@ -136,6 +136,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 				[SettingsKey.travel_speed] = new ExportField("travelSpeed"),
 				[SettingsKey.wipe_shield_distance] = new ExportField("wipeShieldDistanceFromObject"),
 				[SettingsKey.wipe_tower_size] = new ExportField("wipeTowerSize"),
+				[SettingsKey.wipe_tower_perimeters_per_extruder] = new ExportField("wipeTowerPerimetersPerExtruder"),
 				[SettingsKey.filament_diameter] = new ExportField("filamentDiameter"),
 				[SettingsKey.layer_height] = new ExportField("layerThickness"),
 				[SettingsKey.nozzle_diameter] = new ExportField("extrusionWidth"),
diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice
index 18f8d4db0..40eb12fbd 160000
--- a/Submodules/MatterSlice
+++ b/Submodules/MatterSlice
@@ -1 +1 @@
-Subproject commit 18f8d4db0a361138d68845ef24fd22f5804f9347
+Subproject commit 40eb12fbd77455b185d5d433f65819ec4c81a045