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

Making per tool baby stepping

Browse source
This commit is contained in:
LarsBrubaker 2020-08-11 11:06:56 -07:00
parent 7945b381f5
commit 012fad0b65
13 changed files with 202 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -246,6 +246,39 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
SettingsKey.z_servo_retracted_angle,
};
/// <summary>
/// Call the given function for every active tool
/// </summary>
/// <typeparam name="T">The type for the given key</typeparam>
/// <param name="key">The settings key to lookup per tool</param>
/// <param name="applyToEach">The function to call per active tool</param>
public void ForTools<T>(string key, Action<string, T, int> applyToEach)
{
string Tool(int toolIndex)
{
if (toolIndex == 0)
{
return key;
}
// If the setting has a described method for constructing the keys per tool, use it.
var perToolName = SettingsData[key].PerToolName;
if (perToolName != null)
{
return perToolName(toolIndex);
}
return $"{key}_{toolIndex}";
}
var extruderCount = this.GetValue<int>(SettingsKey.extruder_count);
for (int i = 0; i < extruderCount; i++)
{
var toolKey = Tool(i);
applyToEach(toolKey, this.GetValue<T>(toolKey), i);
}
}
public void OnSettingChanged(string slicerConfigName)
{
if (slicerConfigName == SettingsKey.t0_inset
@ -1021,9 +1054,13 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
return value;
}
///<summary>
///Returns the first matching value discovered while enumerating the settings layers
///</summary>
/// <summary>
/// Returns the first matching value discovered while enumerating the settings layers
/// </summary>
/// <typeparam name="T">The type to return</typeparam>
/// <param name="settingsKey">The setting to look up</param>
/// <param name="layerCascade">The settings layers to look at in order</param>
/// <returns>The value of the setting cast to type</returns>
public T GetValue<T>(string settingsKey, IEnumerable<PrinterSettingsLayer> layerCascade = null)
{
#if DEBUG
@ -1060,21 +1097,21 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
switch (settingsValue)
{
case "3 Point Plane":
return (T)(object)(LevelingSystem.Probe3Points);
return (T)(object)LevelingSystem.Probe3Points;
case "7 Point Disk":
return (T)(object)(LevelingSystem.Probe7PointRadial);
return (T)(object)LevelingSystem.Probe7PointRadial;
case "13 Point Disk":
return (T)(object)(LevelingSystem.Probe13PointRadial);
return (T)(object)LevelingSystem.Probe13PointRadial;
case "100 Point Disk":
return (T)(object)(LevelingSystem.Probe100PointRadial);
return (T)(object)LevelingSystem.Probe100PointRadial;
case "3x3 Mesh":
return (T)(object)(LevelingSystem.Probe3x3Mesh);
return (T)(object)LevelingSystem.Probe3x3Mesh;
case "5x5 Mesh":
return (T)(object)(LevelingSystem.Probe5x5Mesh);
return (T)(object)LevelingSystem.Probe5x5Mesh;
case "10x10 Mesh":
return (T)(object)(LevelingSystem.Probe10x10Mesh);
return (T)(object)LevelingSystem.Probe10x10Mesh;
case "Custom Points":
return (T)(object)(LevelingSystem.ProbeCustom);
return (T)(object)LevelingSystem.ProbeCustom;
default:
#if DEBUG
throw new NotImplementedException();
@ -1207,7 +1244,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
var persistenceLayer = layer ?? UserLayer;
// If the setting exists and is set to the requested value, exit without setting or saving
if (persistenceLayer.TryGetValue(settingsKey, out string existingValue)
if (persistenceLayer.TryGetValue(settingsKey, out string existingValue)
&& existingValue == settingsValue)
{
return;

1
MatterControl.Printing/Settings/SettingsKey.cs
View file

@ -39,7 +39,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public const string avoid_crossing_max_ratio = nameof(avoid_crossing_max_ratio);
public const string avoid_crossing_perimeters = nameof(avoid_crossing_perimeters);
public const string baby_step_z_offset = nameof(baby_step_z_offset);
public const string baby_step_z_offset_t1 = nameof(baby_step_z_offset_t1);
public const string backup_firmware_before_update = nameof(backup_firmware_before_update);
public const string baud_rate = nameof(baud_rate);
public const string bed_remove_part_temperature = nameof(bed_remove_part_temperature);

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

@ -27,6 +27,7 @@ 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 MatterHackers.MatterControl.SlicerConfiguration.MappingClasses;
using Newtonsoft.Json;
@ -67,12 +68,14 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public List<QuickMenuNameValue> QuickMenuSettings = new List<QuickMenuNameValue>();
public List<Dictionary<string, string>> SetSettingsOnChange = new List<Dictionary<string,string>>();
public List<Dictionary<string, string>> SetSettingsOnChange = new List<Dictionary<string, string>>();
public bool ResetAtEndOfPrint { get; set; } = false;
public bool RebuildGCodeOnChange { get; set; } = true;
public Func<int, string> PerToolName { get; set; } = null;
public bool ReloadUiWhenChanged { get; set; } = false;
public SettingsLayout.Group OrganizerGroup { get; set; }

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

@ -443,18 +443,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
Units = "mm".Localize(),
DefaultValue = "0",
ShowIfSet = "!sla_printer",
RebuildGCodeOnChange = false
},
new SliceSettingData()
{
SlicerConfigName = SettingsKey.baby_step_z_offset_t1,
PresentationName = "Baby Step Offset T1".Localize(),
HelpText = "The z offset to apply to T1 to improve the first layer adhesion.".Localize(),
DataEditType = DataEditTypes.DOUBLE,
Units = "mm".Localize(),
DefaultValue = "0",
ShowIfSet = "!sla_printer",
RebuildGCodeOnChange = false
RebuildGCodeOnChange = false,
PerToolName = (toolIndex) => $"{SettingsKey.baby_step_z_offset}_{toolIndex}"
},
new SliceSettingData()
{