nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure we replace the right temperature when swappable bed enabled

Browse source
This commit is contained in:
Lars Brubaker 2022-04-11 16:38:38 -07:00
parent 395b16315f
commit 1819b1ce51
3 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
MatterControl.Printing/Settings/PrinterSettings.cs
View file

@ -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;

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit ad52673251380ee8c1e8910c380118008abed881
Subproject commit e754c81428db89bb94fadac23f026de7579bff8f

6
Tests/MatterControl.Tests/MatterControl/GCodeProcessingTests.cs
View file

@ -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");
}
}
}