From e1d206a05b1ee74688bfe8d4ec1dc78add4d7b97 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Fri, 29 Apr 2016 16:27:15 -0700 Subject: [PATCH 1/2] Use one based numbering for Material label --- SlicerConfiguration/SettingsControlBar.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SlicerConfiguration/SettingsControlBar.cs b/SlicerConfiguration/SettingsControlBar.cs index 79037d8a3..4bb25a174 100644 --- a/SlicerConfiguration/SettingsControlBar.cs +++ b/SlicerConfiguration/SettingsControlBar.cs @@ -58,7 +58,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration } int colorIndex = i % colorList.Count; RGBA_Bytes color = colorList[colorIndex]; - this.AddChild(new PresetSelectorWidget(string.Format("{0} {1}", "Material".Localize(), i), color, "material", i)); + this.AddChild(new PresetSelectorWidget(string.Format("{0} {1}", "Material".Localize(), i + 1), color, "material", i)); } } else From 69657be78640ffd09c05319a657a1ab306ca1ca8 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Fri, 29 Apr 2016 16:56:11 -0700 Subject: [PATCH 2/2] Use zero based index for ExtruderTemperature(i) --- PrinterCommunication/Io/ResumePrintingStream.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PrinterCommunication/Io/ResumePrintingStream.cs b/PrinterCommunication/Io/ResumePrintingStream.cs index 6184cc9a6..994ea45da 100644 --- a/PrinterCommunication/Io/ResumePrintingStream.cs +++ b/PrinterCommunication/Io/ResumePrintingStream.cs @@ -83,7 +83,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io queuedCommands.Add("G90; use absolute coordinates"); queuedCommands.Add("G92 E0; reset the expected extruder position"); queuedCommands.Add("M82; use absolute distance for extrusion"); - queuedCommands.Add("M109 S{0}".FormatWith(ActiveSliceSettings.Instance.ExtruderTemperature(1))); + queuedCommands.Add("M109 S{0}".FormatWith(ActiveSliceSettings.Instance.ExtruderTemperature(0))); resumeState = ResumeState.Raising; return "";