From 22ec3afbc46cdcb3db3dc70ca56a58913302bc2f Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 17 May 2019 18:09:55 -0700 Subject: [PATCH] Make sure we finish heating the bed before the start gcode issue: MatterHackers/MCCentral#5538 Doesn't wait for bed to reach temp before printing --- .../MappingClasses/MapStartGCode.cs | 14 +++++++------- Submodules/agg-sharp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MatterControlLib/SlicerConfiguration/MappingClasses/MapStartGCode.cs b/MatterControlLib/SlicerConfiguration/MappingClasses/MapStartGCode.cs index 6c96f9e07..b8fa7e5ba 100644 --- a/MatterControlLib/SlicerConfiguration/MappingClasses/MapStartGCode.cs +++ b/MatterControlLib/SlicerConfiguration/MappingClasses/MapStartGCode.cs @@ -125,6 +125,13 @@ namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses SwitchToFirstActiveExtruder(extrudersUsed, preStartGCodeLines, preStartGCode); preStartGCode.Add("; settings from start_gcode"); + // preserver the legacy behavior of finishing heating the bed before we continue with the start gcode + if (bed_temperature > 0) + { + string setBedTempString = string.Format("M190 S{0}", bed_temperature); + AddDefaultIfNotPresent(preStartGCode, setBedTempString, preStartGCodeLines, "wait for bed temperature to be reached"); + } + return preStartGCode; } @@ -136,13 +143,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses List postStartGCode = new List(); postStartGCode.Add("; automatic settings after start_gcode"); - double bed_temperature = printer.Settings.GetValue(SettingsKey.bed_temperature); - if (bed_temperature > 0) - { - string setBedTempString = string.Format("M190 S{0}", bed_temperature); - AddDefaultIfNotPresent(postStartGCode, setBedTempString, postStartGCodeLines, "wait for bed temperature to be reached"); - } - int numberOfHeatedExtruders = printer.Settings.GetValue(SettingsKey.extruder_count); // wait for them to finish for (int extruderIndex0Based = 0; extruderIndex0Based < numberOfHeatedExtruders; extruderIndex0Based++) diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index bd9fd12e9..fc3b1bc09 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit bd9fd12e92058eaa83ea8ebdc728559414e9f33e +Subproject commit fc3b1bc09afa50d87b41001e2c78f249e3b33592