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

Consolidate types, finish up settings conversion

Browse source
This commit is contained in:
jlewin 2019-06-26 15:02:56 -07:00
parent d97be92d21
commit fff0cc8bd7
12 changed files with 258 additions and 450 deletions
Download patch file Download diff file Expand all files Collapse all files

13
MatterControl.Printing/MappingClasses/ScaledSingleNumber.cs → MatterControl.Printing/MappingClasses/AsPercentOrDirectFirst.cs
View file

@ -29,19 +29,14 @@ either expressed or implied, of the FreeBSD Project.
namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
{
public class ScaledSingleNumber : MapFirstValue
public class AsPercentOrDirectFirst : MapFirstValue
{
private double scale;
public ScaledSingleNumber(double scale = 1)
{
this.scale = scale;
}
public override string Resolve(string value, PrinterSettings settings)
{
double ratio = 0;
value = base.Resolve(value, settings);
if (value.Contains("%"))
{
string withoutPercent = value.Replace("%", "");
@ -52,7 +47,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
ratio = ParseDouble(value);
}
return (ratio * scale).ToString();
return ratio.ToString();
}
}
}

12
MatterControl.Printing/MappingClasses/GCodeForSlicer.cs → MatterControl.Printing/MappingClasses/GCodeMapping.cs
View file

@ -29,18 +29,14 @@ either expressed or implied, of the FreeBSD Project.
namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
{
public class GCodeForSlicer : InjectGCodeCommands
public class GCodeMapping : MappedSetting
{
public GCodeForSlicer()
{
// TODO: GCodeForSlicer?
System.Diagnostics.Debugger.Break();
}
public override string Resolve(string value, PrinterSettings settings)
{
value = base.Resolve(value, settings);
// Unescape newlines
value = value.Replace("\\n", "\n");
// Macro replace and restore escaped newlines
return settings.ReplaceMacroValues(value.Replace("\n", "\\n"));
}
}

59
MatterControl.Printing/MappingClasses/InjectGCodeCommands.cs
View file

@ -1,59 +0,0 @@
/*
Copyright (c) 2016, Lars Brubaker
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The views and conclusions contained in the software and documentation are those
of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System.Collections.Generic;
namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
{
public class InjectGCodeCommands : UnescapeNewlineCharacters
{
protected void AddDefaultIfNotPresent(List<string> linesAdded, string commandToAdd, string[] lines, string comment)
{
string command = commandToAdd.Split(' ')[0].Trim();
if (!LineStartsWith(lines, command))
{
linesAdded.Add(string.Format("{0} ; {1}", commandToAdd, comment));
}
}
protected static bool LineStartsWith(string[] lines, string command)
{
foreach (string line in lines)
{
if (line.StartsWith(command))
{
return true;
}
}
return false;
}
}
}

21
MatterControl.Printing/MappingClasses/MapLayerChangeGCode.cs
View file

@ -29,20 +29,25 @@ either expressed or implied, of the FreeBSD Project.
namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
{
public class MapLayerChangeGCode : InjectGCodeCommands
public class MapLayerChangeGCode : MappedSetting
{
public override string Resolve(string value, PrinterSettings settings)
{
string macroReplaced = base.Resolve(value, settings);
if (!macroReplaced.Contains("; LAYER:")
&& !macroReplaced.Contains(";LAYER:"))
// Unescape newlines
value = value.Replace("\\n", "\n");
if (!value.Contains("; LAYER:")
&& !value.Contains(";LAYER:"))
{
macroReplaced += "; LAYER:[layer_num]\n";
if(value.Length > 0)
{
value += "\n";
}
value += "; LAYER:[layer_num]\n";
}
macroReplaced = settings.ReplaceMacroValues(macroReplaced.Replace("\n", "\\n"));
return macroReplaced;
return settings.ReplaceMacroValues(value.Replace("\n", "\\n"));
}
}
}

204
MatterControl.Printing/MappingClasses/MapStartGCode.cs
View file

@ -1,204 +0,0 @@
/*
Copyright (c) 2016, Lars Brubaker
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The views and conclusions contained in the software and documentation are those
of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System;
using System.Collections.Generic;
using System.Text;
using MatterHackers.Agg;
namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
{
public class MapStartGCode : InjectGCodeCommands
{
private readonly bool escapeNewlineCharacters;
public MapStartGCode(bool escapeNewlineCharacters)
{
this.escapeNewlineCharacters = escapeNewlineCharacters;
}
public override string Resolve(string value, PrinterSettings settings)
{
System.Diagnostics.Debugger.Break();
var newStartGCode = new StringBuilder();
//foreach (string line in PreStartGCode(Slicer.ExtrudersUsed))
//{
// newStartGCode.Append(line + "\n");
//}
value = base.Resolve(value, settings);
newStartGCode.Append(settings.ReplaceMacroValues(value));
//foreach (string line in PostStartGCode(Slicer.ExtrudersUsed))
//{
// newStartGCode.Append("\n");
// newStartGCode.Append(line);
//}
if (escapeNewlineCharacters)
{
return newStartGCode.ToString().Replace("\n", "\\n");
}
return newStartGCode.ToString();
}
public List<string> PreStartGCode(PrinterSettings settings, List<bool> extrudersUsed)
{
string startGCode = settings.GetValue(SettingsKey.start_gcode);
string[] startGCodeLines = startGCode.Split(new string[] { "\\n" }, StringSplitOptions.RemoveEmptyEntries);
var preStartGCode = new List<string>
{
"; automatic settings before start_gcode"
};
AddDefaultIfNotPresent(preStartGCode, "G21", startGCodeLines, "set units to millimeters");
AddDefaultIfNotPresent(preStartGCode, "M107", startGCodeLines, "fan off");
double bed_temperature = settings.GetValue<double>(SettingsKey.bed_temperature);
if (bed_temperature > 0)
{
string setBedTempString = string.Format("M140 S{0}", bed_temperature);
AddDefaultIfNotPresent(preStartGCode, setBedTempString, startGCodeLines, "start heating the bed");
}
int numberOfHeatedExtruders = settings.Helpers.HotendCount();
// Start heating all the extruder that we are going to use.
for (int hotendIndex = 0; hotendIndex < numberOfHeatedExtruders; hotendIndex++)
{
if (extrudersUsed.Count > hotendIndex
&& extrudersUsed[hotendIndex])
{
double materialTemperature = settings.Helpers.ExtruderTargetTemperature(hotendIndex);
if (materialTemperature != 0)
{
string setTempString = "M104 T{0} S{1}".FormatWith(hotendIndex, materialTemperature);
AddDefaultIfNotPresent(preStartGCode, setTempString, startGCodeLines, $"start heating T{hotendIndex}");
}
}
}
// If we need to wait for the heaters to heat up before homing then set them to M109 (heat and wait).
if (settings.GetValue<bool>(SettingsKey.heat_extruder_before_homing))
{
for (int hotendIndex = 0; hotendIndex < numberOfHeatedExtruders; hotendIndex++)
{
if (extrudersUsed.Count > hotendIndex
&& extrudersUsed[hotendIndex])
{
double materialTemperature = settings.Helpers.ExtruderTargetTemperature(hotendIndex);
if (materialTemperature != 0)
{
string setTempString = "M109 T{0} S{1}".FormatWith(hotendIndex, materialTemperature);
AddDefaultIfNotPresent(preStartGCode, setTempString, startGCodeLines, $"wait for T{hotendIndex }");
}
}
}
}
// 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, startGCodeLines, "wait for bed temperature to be reached");
}
SwitchToFirstActiveExtruder(extrudersUsed, preStartGCode);
preStartGCode.Add("; settings from start_gcode");
return preStartGCode;
}
public List<string> PostStartGCode(PrinterSettings settings, List<bool> extrudersUsed)
{
string startGCode = settings.GetValue(SettingsKey.start_gcode);
string[] startGCodeLines = startGCode.Split(new string[] { "\\n" }, StringSplitOptions.RemoveEmptyEntries);
var postStartGCode = new List<string>
{
"; automatic settings after start_gcode"
};
double bed_temperature = 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, startGCodeLines, "wait for bed temperature to be reached");
}
int numberOfHeatedExtruders = settings.GetValue<int>(SettingsKey.extruder_count);
// wait for them to finish
for (int hotendIndex = 0; hotendIndex < numberOfHeatedExtruders; hotendIndex++)
{
if (hotendIndex < extrudersUsed.Count
&& extrudersUsed[hotendIndex])
{
double materialTemperature = settings.Helpers.ExtruderTargetTemperature(hotendIndex);
if (materialTemperature != 0)
{
if (!(hotendIndex == 0 && LineStartsWith(startGCodeLines, "M109 S"))
&& !LineStartsWith(startGCodeLines, $"M109 T{hotendIndex} S"))
{
// always heat the extruders that are used beyond extruder 0
postStartGCode.Add($"M109 T{hotendIndex} S{materialTemperature} ; Finish heating T{hotendIndex}");
}
}
}
}
SwitchToFirstActiveExtruder(extrudersUsed, postStartGCode);
AddDefaultIfNotPresent(postStartGCode, "G90", startGCodeLines, "use absolute coordinates");
postStartGCode.Add(string.Format("{0} ; {1}", "G92 E0", "reset the expected extruder position"));
AddDefaultIfNotPresent(postStartGCode, "M82", startGCodeLines, "use absolute distance for extrusion");
return postStartGCode;
}
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++)
{
if (extrudersUsed[extruderIndex])
{
// set the active extruder to the first one that will be printing
preStartGCode.Add("T{0} ; {1}".FormatWith(extruderIndex, "set the active extruder to {0}".FormatWith(extruderIndex)));
// we have set the active extruder so don't set it to any other extruder
break;
}
}
}
}
}

1
MatterControl.Printing/MappingClasses/MappedSetting.cs
View file

@ -35,6 +35,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
{
return value;
}
public double ParseDouble(string textValue, double valueOnError = 0)
{
if (!double.TryParse(textValue, out double value))

48
MatterControl.Printing/MappingClasses/ReplaceWithSetting.cs
View file

@ -1,48 +0,0 @@
/*
Copyright (c) 2016, Lars Brubaker
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The views and conclusions contained in the software and documentation are those
of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
{
public class ReplaceWithSetting : MappedSetting
{
private string replaceSettingsName;
public ReplaceWithSetting(string replaceSettingsName)
{
// TODO: What role does this type have?
System.Diagnostics.Debugger.Break();
this.replaceSettingsName = replaceSettingsName;
}
public override string Resolve(string value, PrinterSettings settings)
{
return settings.GetValue(replaceSettingsName);
}
}
}

52
MatterControl.Printing/MappingClasses/RetractionLength.cs
View file

@ -1,52 +0,0 @@
/*
Copyright (c) 2016, Lars Brubaker
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The views and conclusions contained in the software and documentation are those
of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
{
public class RetractionLength : MappedSetting
{
public RetractionLength()
{
// TODO: lookd like conditional field
System.Diagnostics.Debugger.Break();
}
public override string Resolve(string value, PrinterSettings settings)
{
if (settings.GetValue<bool>(SettingsKey.enable_retractions))
{
return value;
}
else
{
return "0";
}
}
}
}

46
MatterControl.Printing/MappingClasses/UnescapeNewlineCharacters.cs
View file

@ -1,46 +0,0 @@
/*
Copyright (c) 2016, Lars Brubaker
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The views and conclusions contained in the software and documentation are those
of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
namespace MatterHackers.MatterControl.SlicerConfiguration.MappingClasses
{
// Replaces escaped newline characters with unescaped newline characters
public class UnescapeNewlineCharacters : MappedSetting
{
public UnescapeNewlineCharacters()
{
// TODO: This type has no role. Collapse into utility function in consumer
System.Diagnostics.Debugger.Break();
}
public override string Resolve(string value, PrinterSettings settings)
{
return value.Replace("\\n", "\n");
}
}
}

12
MatterControl.Printing/Settings/SliceSettingsFields.cs
View file

@ -371,7 +371,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
HelpText = "G-Code to be run at the end of all automatic output (the very end of the G-Code commands).".Localize(),
DataEditType = DataEditTypes.MULTI_LINE_TEXT,
DefaultValue = "M104 S0 ; turn off temperature\\nG28 X0 ; home X axis\\nM84 ; disable motors",
Resolver = new GCodeForSlicer(),
Resolver = new GCodeMapping(),
},
new SliceSettingData()
{
@ -526,7 +526,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
HelpText = "The amount of infill material to generate, expressed as a ratio or a percentage.".Localize(),
DataEditType = DataEditTypes.DOUBLE_OR_PERCENT,
DefaultValue = "0.4",
Resolver = new ScaledSingleNumber(100),
Resolver = new AsPercentOrDirectFirst(),
},
new SliceSettingData()
{
@ -1304,7 +1304,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
DataEditType = DataEditTypes.POSITIVE_DOUBLE,
Units = "%".Localize(),
DefaultValue = "90",
Resolver = new ScaledSingleNumber(.01),
Resolver = new AsPercentOrDirect(),
QuickMenuSettings = { { "Light", "20" }, { "Standard", "80" }, { "Heavy", "100" } }
},
new SliceSettingData()
@ -1396,7 +1396,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
DefaultValue = "1",
ShowIfSet = "!sla_printer",
EnableIfSet = SettingsKey.enable_retractions,
Resolver = new RetractionLength(),
Resolver = new ConditionalField(SettingsKey.enable_retractions, new MappedSetting())
},
new SliceSettingData()
{
@ -1644,7 +1644,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
HelpText = "G-Code to be run immediately following the temperature setting commands. Including commands to set temperature in this section will cause them not be generated outside of this section. Will accept Custom G-Code variables.".Localize(),
DataEditType = DataEditTypes.MULTI_LINE_TEXT,
DefaultValue = "G28 ; home all axes\\nG1 Z5 F5000 ; lift nozzle",
Resolver = new MapStartGCode(true),
Resolver = new GCodeMapping(),
},
new SliceSettingData()
{
@ -2264,7 +2264,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
DataEditType = DataEditTypes.POSITIVE_DOUBLE,
Units = "%".Localize(),
DefaultValue = "100",
Resolver = new ScaledSingleNumber(.01),
Resolver = new AsPercentOrDirect(),
},
new SliceSettingData()
{

233
MatterControlLib/SlicerConfiguration/EngineMappingsMatterSlice.cs
View file

@ -31,6 +31,8 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using MatterHackers.Agg;
namespace MatterHackers.MatterControl.SlicerConfiguration
{
@ -81,7 +83,17 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
[SettingsKey.max_acceleration] = new ExportField("maxAcceleration"),
[SettingsKey.max_velocity] = new ExportField("maxVelocity"),
[SettingsKey.jerk_velocity] = new ExportField("jerkVelocity"),
[SettingsKey.print_time_estimate_multiplier] = new ExportField("printTimeEstimateMultiplier"),
[SettingsKey.print_time_estimate_multiplier] = new ExportField(
"printTimeEstimateMultiplier",
(value, settings) =>
{
if (double.TryParse(value, out double infillRatio))
{
return $"{infillRatio * .01}";
}
return "0";
}),
// fan settings
[SettingsKey.min_fan_speed] = new ExportField("fanSpeedMinPercent"),
[SettingsKey.coast_at_end_distance] = new ExportField("coastAtEndDistance"),
@ -119,10 +131,35 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
[SettingsKey.merge_overlapping_lines] = new ExportField("MergeOverlappingLines"),
[SettingsKey.fill_thin_gaps] = new ExportField("fillThinGaps"),
[SettingsKey.spiral_vase] = new ExportField("continuousSpiralOuterPerimeter"),
[SettingsKey.start_gcode] = new ExportField("startCode"),
[SettingsKey.start_gcode] = new ExportField(
"startCode",
(value, settings) =>
{
return StartGCodeGenerator.BuildStartGCode(settings, value);
}),
[SettingsKey.layer_gcode] = new ExportField("layerChangeCode"),
[SettingsKey.fill_density] = new ExportField("infillPercent"),
[SettingsKey.perimeter_start_end_overlap] = new ExportField("perimeterStartEndOverlapRatio"),
[SettingsKey.fill_density] = new ExportField(
"infillPercent",
(value, settings) =>
{
if (double.TryParse(value, out double infillRatio))
{
return $"{infillRatio * 100}";
}
return "0";
}),
[SettingsKey.perimeter_start_end_overlap] = new ExportField(
"perimeterStartEndOverlapRatio",
(value, settings) =>
{
if (double.TryParse(value, out double infillRatio))
{
return $"{infillRatio * .01}";
}
return "0";
}),
[SettingsKey.raft_extruder] = new ExportField("raftExtruder"),
[SettingsKey.support_material_extruder] = new ExportField("supportExtruder"),
[SettingsKey.support_material_interface_extruder] = new ExportField("supportInterfaceExtruder"),
@ -146,9 +183,16 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
foreach (var (key, exportField) in this.Exports.Select(kvp => (kvp.Key, kvp.Value)))
{
string result = settings.ResolveValue(key);
// Run custom converter if defined on the field
if (exportField.Converter != null)
{
result = exportField.Converter(result, settings);
}
if (result != null)
{
sliceSettingsFile.WriteLine("{0} = {1}", key, result);
sliceSettingsFile.WriteLine("{0} = {1}", exportField.OuputName, result);
}
}
@ -164,5 +208,184 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
return matterSliceSettingNames.Contains(canonicalSettingsName)
|| PrinterSettings.ApplicationLevelSettings.Contains(canonicalSettingsName);
}
public static class StartGCodeGenerator
{
public static string BuildStartGCode(PrinterSettings settings, string userGCode)
{
var newStartGCode = new StringBuilder();
foreach (string line in PreStartGCode(settings, Slicer.ExtrudersUsed))
{
newStartGCode.Append(line + "\n");
}
newStartGCode.Append(userGCode);
foreach (string line in PostStartGCode(settings, Slicer.ExtrudersUsed))
{
newStartGCode.Append("\n");
newStartGCode.Append(line);
}
var result = newStartGCode.ToString();
return result.Replace("\n", "\\n");
}
private static List<string> PreStartGCode(PrinterSettings settings, List<bool> extrudersUsed)
{
string startGCode = settings.GetValue(SettingsKey.start_gcode);
string[] startGCodeLines = startGCode.Split(new string[] { "\\n" }, StringSplitOptions.RemoveEmptyEntries);
var preStartGCode = new List<string>
{
"; automatic settings before start_gcode"
};
AddDefaultIfNotPresent(preStartGCode, "G21", startGCodeLines, "set units to millimeters");
AddDefaultIfNotPresent(preStartGCode, "M107", startGCodeLines, "fan off");
double bed_temperature = settings.GetValue<double>(SettingsKey.bed_temperature);
if (bed_temperature > 0)
{
string setBedTempString = string.Format("M140 S{0}", bed_temperature);
AddDefaultIfNotPresent(preStartGCode, setBedTempString, startGCodeLines, "start heating the bed");
}
int numberOfHeatedExtruders = settings.Helpers.HotendCount();
// Start heating all the extruder that we are going to use.
for (int hotendIndex = 0; hotendIndex < numberOfHeatedExtruders; hotendIndex++)
{
if (extrudersUsed.Count > hotendIndex
&& extrudersUsed[hotendIndex])
{
double materialTemperature = settings.Helpers.ExtruderTargetTemperature(hotendIndex);
if (materialTemperature != 0)
{
string setTempString = "M104 T{0} S{1}".FormatWith(hotendIndex, materialTemperature);
AddDefaultIfNotPresent(preStartGCode, setTempString, startGCodeLines, $"start heating T{hotendIndex}");
}
}
}
// If we need to wait for the heaters to heat up before homing then set them to M109 (heat and wait).
if (settings.GetValue<bool>(SettingsKey.heat_extruder_before_homing))
{
for (int hotendIndex = 0; hotendIndex < numberOfHeatedExtruders; hotendIndex++)
{
if (extrudersUsed.Count > hotendIndex
&& extrudersUsed[hotendIndex])
{
double materialTemperature = settings.Helpers.ExtruderTargetTemperature(hotendIndex);
if (materialTemperature != 0)
{
string setTempString = "M109 T{0} S{1}".FormatWith(hotendIndex, materialTemperature);
AddDefaultIfNotPresent(preStartGCode, setTempString, startGCodeLines, $"wait for T{hotendIndex }");
}
}
}
}
// 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, startGCodeLines, "wait for bed temperature to be reached");
}
SwitchToFirstActiveExtruder(extrudersUsed, preStartGCode);
preStartGCode.Add("; settings from start_gcode");
return preStartGCode;
}
private static List<string> PostStartGCode(PrinterSettings settings, List<bool> extrudersUsed)
{
string startGCode = settings.GetValue(SettingsKey.start_gcode);
string[] startGCodeLines = startGCode.Split(new string[] { "\\n" }, StringSplitOptions.RemoveEmptyEntries);
var postStartGCode = new List<string>
{
"; automatic settings after start_gcode"
};
double bed_temperature = 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, startGCodeLines, "wait for bed temperature to be reached");
}
int numberOfHeatedExtruders = settings.GetValue<int>(SettingsKey.extruder_count);
// wait for them to finish
for (int hotendIndex = 0; hotendIndex < numberOfHeatedExtruders; hotendIndex++)
{
if (hotendIndex < extrudersUsed.Count
&& extrudersUsed[hotendIndex])
{
double materialTemperature = settings.Helpers.ExtruderTargetTemperature(hotendIndex);
if (materialTemperature != 0)
{
if (!(hotendIndex == 0 && LineStartsWith(startGCodeLines, "M109 S"))
&& !LineStartsWith(startGCodeLines, $"M109 T{hotendIndex} S"))
{
// always heat the extruders that are used beyond extruder 0
postStartGCode.Add($"M109 T{hotendIndex} S{materialTemperature} ; Finish heating T{hotendIndex}");
}
}
}
}
SwitchToFirstActiveExtruder(extrudersUsed, postStartGCode);
AddDefaultIfNotPresent(postStartGCode, "G90", startGCodeLines, "use absolute coordinates");
postStartGCode.Add(string.Format("{0} ; {1}", "G92 E0", "reset the expected extruder position"));
AddDefaultIfNotPresent(postStartGCode, "M82", startGCodeLines, "use absolute distance for extrusion");
return postStartGCode;
}
private static void AddDefaultIfNotPresent(List<string> linesAdded, string commandToAdd, string[] lines, string comment)
{
string command = commandToAdd.Split(' ')[0].Trim();
if (!LineStartsWith(lines, command))
{
linesAdded.Add(string.Format("{0} ; {1}", commandToAdd, comment));
}
}
private static 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++)
{
if (extrudersUsed[extruderIndex])
{
// set the active extruder to the first one that will be printing
preStartGCode.Add("T{0} ; {1}".FormatWith(extruderIndex, "set the active extruder to {0}".FormatWith(extruderIndex)));
// we have set the active extruder so don't set it to any other extruder
break;
}
}
}
private static bool LineStartsWith(string[] lines, string command)
{
foreach (string line in lines)
{
if (line.StartsWith(command))
{
return true;
}
}
return false;
}
}
}
}

7
MatterControlLib/SlicerConfiguration/ExportField.cs
View file

@ -28,15 +28,12 @@ either expressed or implied, of the FreeBSD Project.
*/
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
namespace MatterHackers.MatterControl.SlicerConfiguration
{
public class ExportField
{
public ExportField(string outputName, Func<string> converter = null)
public ExportField(string outputName, Func<string, PrinterSettings, string> converter = null)
{
this.OuputName = outputName;
this.Converter = converter;
@ -44,6 +41,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public string OuputName { get; }
public Func<string> Converter { get; }
public Func<string, PrinterSettings, string> Converter { get; }
}
}