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

Fixing profiles to pass test

Browse source
This commit is contained in:
Lars Brubaker 2020-08-13 17:29:01 -07:00
parent 9687243811
commit 8b894f8c53
9 changed files with 64 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

53
Tests/MatterControl.Tests/MatterControl/OemProfileTests.cs
View file

@ -42,33 +42,40 @@ namespace MatterControl.Tests.MatterControl
{
printer.RuleViolated = true;
/* Fix existing invalid items...
string layerValue;
if (settings.OemLayer.TryGetValue(SettingsKey.layer_gcode, out layerValue) && layerValue == "")
{
settings.OemLayer.Remove(SettingsKey.layer_gcode);
}
if (settings.QualityLayer?.TryGetValue(SettingsKey.layer_gcode, out layerValue) == true && layerValue == "")
{
settings.QualityLayer.Remove(SettingsKey.layer_gcode);
}
if (settings.MaterialLayer?.TryGetValue(SettingsKey.layer_gcode, out layerValue) == true && layerValue == "")
{
settings.MaterialLayer.Remove(SettingsKey.layer_gcode);
}
// Reset to default values
settings.UserLayer.Remove(SettingsKey.active_quality_key);
settings.MaterialSettingsKeys = new List<string>();
settings.StagedUserSettings = new PrinterSettingsLayer();
settings.Save(printer.ConfigPath); */
// SetSettingInOem(printer, settings, SettingsKey.layer_gcode, "; LAYER:[layer_num]");
}
});
}
private static void SetSettingInOem(PrinterTestDetails printer, PrinterSettings settings, string key, string value)
{
// Fix existing invalid items...
string layerValue;
if (settings.OemLayer.TryGetValue(key, out layerValue) && layerValue == "")
{
settings.OemLayer.Remove(key);
}
if (settings.QualityLayer?.TryGetValue(key, out layerValue) == true && layerValue == "")
{
settings.QualityLayer.Remove(key);
}
if (settings.MaterialLayer?.TryGetValue(key, out layerValue) == true && layerValue == "")
{
settings.MaterialLayer.Remove(key);
}
settings.OemLayer[key] = value;
// Reset to default values
settings.UserLayer.Remove(SettingsKey.active_quality_key);
settings.UserLayer.Remove(SettingsKey.active_material_key);
settings.StagedUserSettings = new PrinterSettingsLayer();
settings.Save(printer.ConfigPath);
}
[Test]
public void StartGCodeWithExtrudesMustFollowM109Heatup()
{