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

Fixing start gcode to have correct intelligence for legacy profiles

Browse source 
and still have the correct behavior of pre-heating
start gcode
post heating
This commit is contained in:
LarsBrubaker 2019-05-18 07:25:00 -07:00
parent 6278622f46
commit cb81681e4d
3 changed files with 60 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

15
MatterControlLib/SlicerConfiguration/EngineMappingMatterSlice.cs → MatterControlLib/SlicerConfiguration/EngineMappingsMatterSlice.cs
View file

@ -27,13 +27,11 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using MatterHackers.Agg;
using MatterHackers.MatterControl.SlicerConfiguration.MappingClasses;
using MatterHackers.VectorMath;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using MatterHackers.Agg;
using MatterHackers.MatterControl.SlicerConfiguration.MappingClasses;
namespace MatterHackers.MatterControl.SlicerConfiguration
{
@ -42,9 +40,9 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
/// <summary>
/// Application level settings control MatterControl behaviors but aren't used or passed through to the slice engine. Putting settings
/// in this list ensures they show up for all slice engines and the lack of a MappedSetting for the engine guarantees that it won't pass
/// through into the slicer config file
/// through into the slicer config file.
/// </summary>
protected HashSet<string> applicationLevelSettings = new HashSet<string>()
private readonly HashSet<string> applicationLevelSettings = new HashSet<string>()
{
SettingsKey.enable_fan,
SettingsKey.extruder_wipe_temperature,
@ -149,7 +147,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
};
public List<MappedSetting> MappedSettings { get; private set; }
private HashSet<string> matterSliceSettingNames;
private readonly HashSet<string> matterSliceSettingNames;
// Singleton use only - prevent external construction
public EngineMappingsMatterSlice(PrinterConfig printer)
@ -262,7 +261,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
}
foreach(var line in rawLines)
foreach (var line in rawLines)
{
sliceSettingsFile.WriteLine(line);
}

42
MatterControlLib/SlicerConfiguration/MappingClasses/MapStartGCode.cs
View file

@ -27,16 +27,16 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using MatterHackers.Agg;
using System;
using System.Collections.Generic;
using System.Text;
using MatterHackers.Agg;
namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
{
public class MapStartGCode : InjectGCodeCommands
{
private bool escapeNewlineCharacters;
private readonly bool escapeNewlineCharacters;
public MapStartGCode(PrinterConfig printer, string canonicalSettingsName, string exportedName, bool escapeNewlineCharacters)
: base(printer, canonicalSettingsName, exportedName)
@ -48,7 +48,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
{
get
{
StringBuilder newStartGCode = new StringBuilder();
var newStartGCode = new StringBuilder();
foreach (string line in PreStartGCode(Slicer.ExtrudersUsed))
{
newStartGCode.Append(line + "\n");
@ -76,8 +76,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
string startGCode = printer.Settings.GetValue(SettingsKey.start_gcode);
string[] preStartGCodeLines = startGCode.Split(new string[] { "\\n" }, StringSplitOptions.RemoveEmptyEntries);
List<string> preStartGCode = new List<string>();
preStartGCode.Add("; automatic settings before start_gcode");
var preStartGCode = new List<string>
{
"; automatic settings before start_gcode"
};
AddDefaultIfNotPresent(preStartGCode, "G21", preStartGCodeLines, "set units to millimeters");
AddDefaultIfNotPresent(preStartGCode, "M107", preStartGCodeLines, "fan off");
double bed_temperature = printer.Settings.GetValue<double>(SettingsKey.bed_temperature);
@ -122,16 +124,18 @@ 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)
// If we have bed temp and the start gcode specifies to finish heating the extruders,
// make sure we also finish heating the bed. This preserves legacy expectation.
if (bed_temperature > 0
&& startGCode.Contains("M109"))
{
string setBedTempString = string.Format("M190 S{0}", bed_temperature);
AddDefaultIfNotPresent(preStartGCode, setBedTempString, preStartGCodeLines, "wait for bed temperature to be reached");
}
SwitchToFirstActiveExtruder(extrudersUsed, preStartGCode);
preStartGCode.Add("; settings from start_gcode");
return preStartGCode;
}
@ -140,8 +144,18 @@ namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
string startGCode = printer.Settings.GetValue(SettingsKey.start_gcode);
string[] postStartGCodeLines = startGCode.Split(new string[] { "\\n" }, StringSplitOptions.RemoveEmptyEntries);
List<string> postStartGCode = new List<string>();
postStartGCode.Add("; automatic settings after start_gcode");
var postStartGCode = new List<string>
{
"; automatic settings after start_gcode"
};
double bed_temperature = printer.Settings.GetValue<double>(SettingsKey.bed_temperature);
if (bed_temperature > 0
&& !startGCode.Contains("M109"))
{
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<int>(SettingsKey.extruder_count);
// wait for them to finish
@ -159,7 +173,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
}
}
SwitchToFirstActiveExtruder(extrudersUsed, postStartGCodeLines, postStartGCode);
SwitchToFirstActiveExtruder(extrudersUsed, postStartGCode);
AddDefaultIfNotPresent(postStartGCode, "G90", postStartGCodeLines, "use absolute coordinates");
postStartGCode.Add(string.Format("{0} ; {1}", "G92 E0", "reset the expected extruder position"));
AddDefaultIfNotPresent(postStartGCode, "M82", postStartGCodeLines, "use absolute distance for extrusion");
@ -167,7 +181,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
return postStartGCode;
}
private void SwitchToFirstActiveExtruder(List<bool> extrudersUsed, string[] preStartGCodeLines, List<string> preStartGCode)
private void SwitchToFirstActiveExtruder(List<bool> extrudersUsed, List<string> preStartGCode)
{
// make sure we are on the first active extruder
for (int extruderIndex = 0; extruderIndex < extrudersUsed.Count; extruderIndex++)