From 7a81c260ee02434e317ffdf6d2b16fbf8984978c Mon Sep 17 00:00:00 2001
From: LarsBrubaker <larsbrubaker@gmail.com>
Date: Tue, 31 Jul 2018 20:44:59 -0700
Subject: [PATCH] Changing from first top layer speed to match bridging

---
 .../SlicerMapping/EngineMappingMatterSlice.cs    |  2 +-
 StaticData/SliceSettings/Layouts.txt             |  2 +-
 StaticData/SliceSettings/Properties.json         | 16 +++++++---------
 Submodules/MatterSlice                           |  2 +-
 Submodules/agg-sharp                             |  2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs
index cfda3046f..6e60ed880 100644
--- a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs
+++ b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs
@@ -156,7 +156,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
 				new MapFirstValue("retract_speed", "retractionSpeed"),
 				new OverrideSpeedOnSlaPrinters("bridge_speed", "bridgeSpeed", "infill_speed"),
 				new OverrideSpeedOnSlaPrinters("bottom_infill_speed", "bottomInfillSpeed", "infill_speed"),
-				new OverrideSpeedOnSlaPrinters("first_top_layer_speed", "firstTopLayerSpeed", "infill_speed"),
+				new MappedToBoolString("bridge_over_infill", "bridgeOverInfill"),
 				new MappedSetting("extrusion_multiplier", "extrusionMultiplier"),
 				new MappedSetting("fill_angle", "infillStartingAngle"),
 				new AsPercentOfReferenceOrDirect(SettingsKey.infill_overlap_perimeter, "infillExtendIntoPerimeter", SettingsKey.nozzle_diameter, change0ToReference: false),
diff --git a/StaticData/SliceSettings/Layouts.txt b/StaticData/SliceSettings/Layouts.txt
index f7ed81926..e1924e505 100644
--- a/StaticData/SliceSettings/Layouts.txt
+++ b/StaticData/SliceSettings/Layouts.txt
@@ -33,7 +33,6 @@ Advanced
       Speed for Infill
         first_layer_speed
         infill_speed
-        first_top_layer_speed
         top_solid_infill_speed
         raft_print_speed
       Speed for Perimeters
@@ -44,6 +43,7 @@ Advanced
         bridge_speed
         travel_speed
         number_of_first_layers
+        bridge_over_infill
     Fan
       Fan
         min_fan_speed_layer_time
diff --git a/StaticData/SliceSettings/Properties.json b/StaticData/SliceSettings/Properties.json
index ab92e39fa..92fb35f81 100644
--- a/StaticData/SliceSettings/Properties.json
+++ b/StaticData/SliceSettings/Properties.json
@@ -1678,15 +1678,6 @@
     "Units": "mm or %",
     "DefaultValue": "0"
   },
-  {
-    "SlicerConfigName": "first_top_layer_speed",
-    "PresentationName": "First On Sparse Infill",
-    "HelpText": "The speed at which the first layer on sparse infill will print. Can be set explicitly or as a percentage of the Infill speed. Use 0 to match the Infill Speed",
-    "DataEditType": "DOUBLE_OR_PERCENT",
-    "Units": "mm/s or %",
-    "ShowIfSet": "!sla_printer",
-    "DefaultValue": "0"
-  },
   {
     "SlicerConfigName": "top_solid_infill_speed",
     "PresentationName": "Top Solid Infill",
@@ -1719,6 +1710,13 @@
     "DataEditType": "CHECK_BOX",
     "DefaultValue": "0"
   },
+  {
+    "SlicerConfigName": "bridge_over_infill",
+    "PresentationName": "Bridge Over Infull",
+    "HelpText": "Make the first layer on top of partial infill use the speed and fan for bridging.",
+    "DataEditType": "CHECK_BOX",
+    "DefaultValue": "0"
+  },
   {
     "SlicerConfigName": "use_relative_e_distances",
     "PresentationName": "Use Relative E Distances",
diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice
index 1e1dd7108..3e38d5924 160000
--- a/Submodules/MatterSlice
+++ b/Submodules/MatterSlice
@@ -1 +1 @@
-Subproject commit 1e1dd710840d9b82af6da1bbaebea916d83904d9
+Subproject commit 3e38d59242944d461c21c296f67e596528c93ea1
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index 06016fe71..9ea14f16a 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit 06016fe71097c8748e0e09ab0f0a40149c5817a1
+Subproject commit 9ea14f16af839df28644ad4d04f847c064764bf5