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

More debug info

Browse source
This commit is contained in:
Lars Brubaker 2022-03-21 17:59:29 -07:00 • committed by LarsBrubaker
parent ef3f57a524
commit 09b194654a
5 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
StaticData/Materials/3DXTech/ezPC.material
View file

@ -8,7 +8,6 @@
"layer_id": "d9240109-d750-462a-9d72-4c4f53678710",
"bed_temperature": "115",
"enable_fan": "0",
"has_fan": "False",
"infill_speed": "30",
"max_fan_speed": "0",
"min_fan_speed": "0",

3
StaticData/Materials/General/PC.material
View file

@ -5,7 +5,7 @@
"MaterialLayers": [
{
"layer_name": "Polycarbonate",
"layer_id": "d9240109-d750-462a-9d72-4c4f53678710",
"layer_id": "d924b109-d750-4a2a-9d72-4c4f53178710",
"bed_temperature": "115",
"enable_fan": "0",
"has_fan": "False",
@ -21,6 +21,7 @@
"bed_temperature_pei": "100",
"bed_temperature_pp": "100",
"top_solid_infill_speed": "22",
"material_sku": "PC"
}
],
"OemLayer": null,

3
StaticData/Materials/General/TPU.material
View file

@ -6,7 +6,7 @@
{
"layer_name": "TPU",
"filament_density": "1.23",
"layer_id": "80257dda-abc1-4837-be45-54910ce1071d",
"layer_id": "80357dda-abc1-4837-be45-54912ce1071d",
"first_layer_speed": "15",
"filament_cost": "24.64",
"infill_speed": "25",
@ -26,6 +26,7 @@
"bed_temperature_kapton": "65",
"bed_temperature_pei": "55",
"min_fan_speed": "0",
"material_sku": "TPU"
}
],
"OemLayer": null,

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit a6816b76febf66e9c9aca2d30af8ef698ba2893f
Subproject commit 0683344758e8784f1ce10fb51b34dcf0a1c3c158

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

@ -193,13 +193,14 @@ M300 S3000 P30 ; Resume Tone";
var allMaterialIds = new HashSet<string>();
foreach(var profile in profiles)
for(var i = 0; i < profiles.Count; i++)
{
var profile = profiles[i];
Assert.AreEqual(1, profile.MaterialLayers.Count, "Each material profile should have 1 material in it");
var material = profile.MaterialLayers[0];
profile.ActiveMaterialKey = material.LayerID;
Assert.IsTrue(!string.IsNullOrEmpty(profile.GetValue(SettingsKey.material_sku)));
Assert.IsTrue(!allMaterialIds.Contains(material.LayerID), "Every material needs a unique Id");
Assert.IsTrue(!string.IsNullOrEmpty(profile.GetValue(SettingsKey.material_sku)), $"All profiles should have a material_sku set {files[i].FullName}");
Assert.IsTrue(!allMaterialIds.Contains(material.LayerID), $"Every material needs a unique Id {files[i].FullName}");
allMaterialIds.Add(material.LayerID);
}
}