From 1819b1ce5196f192351fcf809bb56119ea8cdee3 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Mon, 11 Apr 2022 16:38:38 -0700 Subject: [PATCH] Make sure we replace the right temperature when swappable bed enabled --- MatterControl.Printing/Settings/PrinterSettings.cs | 5 +++++ Submodules/MatterSlice | 2 +- .../MatterControl/GCodeProcessingTests.cs | 6 ++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/MatterControl.Printing/Settings/PrinterSettings.cs b/MatterControl.Printing/Settings/PrinterSettings.cs index c7a1df8af..cd994f0f9 100644 --- a/MatterControl.Printing/Settings/PrinterSettings.cs +++ b/MatterControl.Printing/Settings/PrinterSettings.cs @@ -1002,6 +1002,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { var value = this.ResolveValue(setting); + if (setting == SettingsKey.bed_temperature) + { + value = this.Helpers.ActiveBedTemperature.ToString(); + } + if(string.IsNullOrEmpty(value)) { return inputString; diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index ad5267325..e754c8142 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit ad52673251380ee8c1e8910c380118008abed881 +Subproject commit e754c81428db89bb94fadac23f026de7579bff8f diff --git a/Tests/MatterControl.Tests/MatterControl/GCodeProcessingTests.cs b/Tests/MatterControl.Tests/MatterControl/GCodeProcessingTests.cs index 1b483023e..c7bdf1b8f 100644 --- a/Tests/MatterControl.Tests/MatterControl/GCodeProcessingTests.cs +++ b/Tests/MatterControl.Tests/MatterControl/GCodeProcessingTests.cs @@ -111,6 +111,12 @@ namespace MatterControl.Tests.MatterControl TestMacroReplacement("{infill_speed}", "3600"); TestMacroReplacement("{min_print_speed}", "600"); TestMacroReplacement("{travel_speed}", "7800"); + + // make sure we pick up the right temp when there is a bed surface change + settings.SetValue(SettingsKey.has_swappable_bed, "1"); + settings.SetValue(SettingsKey.bed_temperature_blue_tape, "84.2"); + settings.SetValue(SettingsKey.bed_surface, "Blue Tape"); + TestMacroReplacement("[bed_temperature]", "84.2"); } } }