diff --git a/MatterControl.Printing/Settings/SliceSettingData.cs b/MatterControl.Printing/Settings/SliceSettingData.cs index 6d1f2aa33..4bc31f18c 100644 --- a/MatterControl.Printing/Settings/SliceSettingData.cs +++ b/MatterControl.Printing/Settings/SliceSettingData.cs @@ -63,6 +63,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration OFFSET, OFFSET3, POSITIVE_DOUBLE, + POSITIVE_DOUBLE_OR_INCOMPATABLE, READONLY_STRING, SLICE_ENGINE, STRING, diff --git a/MatterControl.Printing/Settings/SliceSettingsFields.cs b/MatterControl.Printing/Settings/SliceSettingsFields.cs index fb2c268b6..c574991e3 100644 --- a/MatterControl.Printing/Settings/SliceSettingsFields.cs +++ b/MatterControl.Printing/Settings/SliceSettingsFields.cs @@ -139,8 +139,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { SlicerConfigName = SettingsKey.bed_temperature_blue_tape, PresentationName = "Blue Tape Bed Temperature".Localize(), - HelpText = "The temperature to print when the bed is coverd with blue tape. Set to 0 to disable.".Localize(), - DataEditType = DataEditTypes.POSITIVE_DOUBLE, + HelpText = "The temperature to print when the bed is coverd with blue tape. Set to 0 to disable or 'NC' if Not Compatible.".Localize(), + DataEditType = DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATABLE, Units = "°C".Localize(), Show = (settings) => settings.GetBool(SettingsKey.has_heated_bed) && settings.GetBool(SettingsKey.has_swappable_bed), @@ -150,8 +150,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { SlicerConfigName = SettingsKey.bed_temperature_buildtak, PresentationName = "BuildTak Bed Temperature".Localize(), - HelpText = "The temperature to print when the bed is using BuildTak. Set to 0 to disable.".Localize(), - DataEditType = DataEditTypes.POSITIVE_DOUBLE, + HelpText = "The temperature to print when the bed is using BuildTak. Set to 0 to disable or 'NC' if Not Compatible.".Localize(), + DataEditType = DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATABLE, Units = "°C".Localize(), Show = (settings) => settings.GetBool(SettingsKey.has_heated_bed) && settings.GetBool(SettingsKey.has_swappable_bed), @@ -161,8 +161,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { SlicerConfigName = SettingsKey.bed_temperature_garolite, PresentationName = "Garolite Bed Temperature".Localize(), - HelpText = "The temperature to print when the bed is using garolite. Set to 0 to disable.".Localize(), - DataEditType = DataEditTypes.POSITIVE_DOUBLE, + HelpText = "The temperature to print when the bed is using garolite. Set to 0 to disable or 'NC' if Not Compatible.".Localize(), + DataEditType = DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATABLE, Units = "°C".Localize(), Show = (settings) => settings.GetBool(SettingsKey.has_heated_bed) && settings.GetBool(SettingsKey.has_swappable_bed), @@ -172,8 +172,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { SlicerConfigName = SettingsKey.bed_temperature_glass, PresentationName = "Glass Bed Temperature".Localize(), - HelpText = "The temperature to print when the bed is using glass. Set to 0 to disable.".Localize(), - DataEditType = DataEditTypes.POSITIVE_DOUBLE, + HelpText = "The temperature to print when the bed is using glass. Set to 0 to disable or 'NC' if Not Compatible.".Localize(), + DataEditType = DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATABLE, Units = "°C".Localize(), Show = (settings) => settings.GetBool(SettingsKey.has_heated_bed) && settings.GetBool(SettingsKey.has_swappable_bed), @@ -183,8 +183,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { SlicerConfigName = SettingsKey.bed_temperature_kapton, PresentationName = "Kapton Bed Temperature".Localize(), - HelpText = "The temperature to print when the bed is coverd in kapton tape. Set to 0 to disable.".Localize(), - DataEditType = DataEditTypes.POSITIVE_DOUBLE, + HelpText = "The temperature to print when the bed is coverd in kapton tape. Set to 0 to disable or 'NC' if Not Compatible.".Localize(), + DataEditType = DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATABLE, Units = "°C".Localize(), Show = (settings) => settings.GetBool(SettingsKey.has_heated_bed) && settings.GetBool(SettingsKey.has_swappable_bed), @@ -194,8 +194,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { SlicerConfigName = SettingsKey.bed_temperature_pei, PresentationName = "PEI Bed Temperature".Localize(), - HelpText = "The temperature to print when the bed is using PEI. Set to 0 to disable.".Localize(), - DataEditType = DataEditTypes.POSITIVE_DOUBLE, + HelpText = "The temperature to print when the bed is using PEI. Set to 0 to disable or 'NC' if Not Compatible.".Localize(), + DataEditType = DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATABLE, Units = "°C".Localize(), Show = (settings) => settings.GetBool(SettingsKey.has_heated_bed) && settings.GetBool(SettingsKey.has_swappable_bed), @@ -205,8 +205,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { SlicerConfigName = SettingsKey.bed_temperature_pp, PresentationName = "Polypropylene Bed Temperature".Localize(), - HelpText = "The temperature to print when the bed is polypropylene. Set to 0 to disable.".Localize(), - DataEditType = DataEditTypes.POSITIVE_DOUBLE, + HelpText = "The temperature to print when the bed is polypropylene. Set to 0 to disable or 'NC' if Not Compatible.".Localize(), + DataEditType = DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATABLE, Units = "°C".Localize(), Show = (settings) => settings.GetBool(SettingsKey.has_heated_bed) && settings.GetBool(SettingsKey.has_swappable_bed), diff --git a/MatterControl.Printing/Settings/ValidationError.cs b/MatterControl.Printing/Settings/ValidationError.cs index c5a32d62d..f5aeab25b 100644 --- a/MatterControl.Printing/Settings/ValidationError.cs +++ b/MatterControl.Printing/Settings/ValidationError.cs @@ -59,16 +59,17 @@ namespace MatterHackers.MatterControl public static class ValidationErrors { - public static readonly string BedLevelingTemperature = nameof(BedLevelingTemperature); public static readonly string BedLevelingMesh = nameof(BedLevelingMesh); + public static readonly string BedLevelingTemperature = nameof(BedLevelingTemperature); + public static readonly string BedSurfaceNotSelected = nameof(BedSurfaceNotSelected); public static readonly string ExceptionDuringSliceSettingsValidation = nameof(ExceptionDuringSliceSettingsValidation); + public static readonly string IncompatableBedSurfaceAndMaterial = nameof(IncompatableBedSurfaceAndMaterial); public static readonly string ItemCannotBeExported = nameof(ItemCannotBeExported); public static readonly string ItemToAMFExportInvalid = nameof(ItemToAMFExportInvalid); public static readonly string ItemToSTLExportInvalid = nameof(ItemToSTLExportInvalid); + public static readonly string MaterialNotSelected = nameof(MaterialNotSelected); public static readonly string NoItemsToExport = nameof(NoItemsToExport); public static readonly string NoPrintableParts = nameof(NoPrintableParts); - public static readonly string BedSurfaceNotSelected = nameof(BedSurfaceNotSelected); - public static readonly string MaterialNotSelected = nameof(MaterialNotSelected); public static readonly string NoZipItemsToExport = nameof(NoZipItemsToExport); public static readonly string PrinterDisconnected = nameof(PrinterDisconnected); public static readonly string PrinterSetupRequired = nameof(PrinterSetupRequired); diff --git a/MatterControlLib/ActionBar/TemperatureWidgetBed.cs b/MatterControlLib/ActionBar/TemperatureWidgetBed.cs index 18cbbaaa3..c3a21c013 100644 --- a/MatterControlLib/ActionBar/TemperatureWidgetBed.cs +++ b/MatterControlLib/ActionBar/TemperatureWidgetBed.cs @@ -28,7 +28,6 @@ either expressed or implied, of the FreeBSD Project. */ using System; -using System.Collections.Generic; using System.Linq; using MatterHackers.Agg; using MatterHackers.Agg.Platform; diff --git a/MatterControlLib/ApplicationView/SettingsValidation.cs b/MatterControlLib/ApplicationView/SettingsValidation.cs index 01cbb720a..488c59253 100644 --- a/MatterControlLib/ApplicationView/SettingsValidation.cs +++ b/MatterControlLib/ApplicationView/SettingsValidation.cs @@ -605,6 +605,23 @@ namespace MatterHackers.MatterControl }); } + if (printer.Connection.IsConnected + && !PrinterSetupRequired(printer) + && validatePrintBed + && errors.Count(e => e.ErrorLevel == ValidationErrorLevel.Error) == 0 + && printer.PrintableItems(printer.Bed.Scene).Any() + && settings.GetValue(SettingsKey.has_swappable_bed) + && settings.GetValue(SettingsKey.bed_surface) != "Default" + && settings.GetValue(printer.Settings.Helpers.ActiveBedTemperatureSetting) == "NC") + { + errors.Add(new ValidationError(ValidationErrors.IncompatableBedSurfaceAndMaterial) + { + Error = "Selected Material and Bed Surface are Incompatable".Localize(), + Details = "The 'Material' you have selected is incompatible with the 'Bed Surface' you have selected. You may get poor bed adhesion or printing results. Changing the 'Bed Surface' is recommended. You can change it in the 'Bed Temperature' menu on the top right of your screen.".Localize(), + ErrorLevel = ValidationErrorLevel.Warning, + }); + } + if (printer.Connection.IsConnected && !PrinterSetupRequired(printer) && validatePrintBed diff --git a/MatterControlLib/Library/Widgets/AddMaterialWidget.cs b/MatterControlLib/Library/Widgets/AddMaterialWidget.cs index b9871cd41..33b78e692 100644 --- a/MatterControlLib/Library/Widgets/AddMaterialWidget.cs +++ b/MatterControlLib/Library/Widgets/AddMaterialWidget.cs @@ -206,7 +206,7 @@ namespace MatterHackers.MatterControl.Library.Widgets }); } - if (directory.Contains("MatterHackers")) + if (Path.GetFileName(directory).Contains("MatterHackers")) { treeNode.Expanded = true; } diff --git a/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs b/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs index 42ecceb3a..39e104658 100644 --- a/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs +++ b/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs @@ -683,6 +683,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration uiField = new DoubleOrPercentField(theme); break; + case SliceSettingData.DataEditTypes.POSITIVE_DOUBLE_OR_INCOMPATABLE: + uiField = new DoubleOrIncompatable(theme); + break; + case SliceSettingData.DataEditTypes.INT_OR_MM: uiField = new IntOrMmField(theme); break; diff --git a/MatterControlLib/SlicerConfiguration/UIFields/DoubleOrIncompatable.cs b/MatterControlLib/SlicerConfiguration/UIFields/DoubleOrIncompatable.cs new file mode 100644 index 000000000..96ccadf23 --- /dev/null +++ b/MatterControlLib/SlicerConfiguration/UIFields/DoubleOrIncompatable.cs @@ -0,0 +1,57 @@ +/* +Copyright (c) 2022, 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; + +namespace MatterHackers.MatterControl.SlicerConfiguration +{ + public class DoubleOrIncompatable : TextField + { + public DoubleOrIncompatable(ThemeConfig theme) + : base(theme) + { + } + + protected override string ConvertValue(string newValue) + { + string text = newValue.Trim(); + + if (text.ToUpper() == "NC") + { + return "NC"; + } + else + { + double.TryParse(text, out double currentValue); + return Math.Max(0, currentValue).ToString(); + } + + } + } +} diff --git a/MatterControlLib/SlicerConfiguration/UIFields/DoubleOrPercentField.cs b/MatterControlLib/SlicerConfiguration/UIFields/DoubleOrPercentField.cs index 951a20dc4..d89bb0314 100644 --- a/MatterControlLib/SlicerConfiguration/UIFields/DoubleOrPercentField.cs +++ b/MatterControlLib/SlicerConfiguration/UIFields/DoubleOrPercentField.cs @@ -1,5 +1,5 @@ /* -Copyright (c) 2017, Lars Brubaker, John Lewin +Copyright (c) 2022, Lars Brubaker, John Lewin All rights reserved. Redistribution and use in source and binary forms, with or without @@ -32,27 +32,12 @@ using MatterHackers.Agg.UI; namespace MatterHackers.MatterControl.SlicerConfiguration { - public class DoubleOrPercentField : ValueOrUnitsField + public class DoubleOrPercentField : ValueOrUnitsField { public DoubleOrPercentField(ThemeConfig theme) : base (theme) { unitsToken = "%"; } - - protected override string ConvertValue(string newValue) - { - string text = newValue.Trim(); - - int tokenIndex = text.IndexOf(unitsToken); - bool hasUnitsToken = tokenIndex != -1; - if (hasUnitsToken) - { - text = text.Substring(0, tokenIndex); - } - - double.TryParse(text, out double currentValue); - return currentValue + (hasUnitsToken ? unitsToken : ""); - } } } diff --git a/StaticData/Materials/3DXTech/PEEK-A.material b/StaticData/Materials/3DXTech/PEEK-A.material index c023f082a..62e9c3968 100644 --- a/StaticData/Materials/3DXTech/PEEK-A.material +++ b/StaticData/Materials/3DXTech/PEEK-A.material @@ -4,26 +4,27 @@ "Macros": [], "MaterialLayers": [ { - "layer_name": "PEEK", - "layer_id": "63342beb-0f41-4afb-bf96-bf73bd168bd7", - "filament_density": "1.32", "bed_temperature": "130", - "bridge_fan_speed": "50", - "max_fan_speed": "0", - "min_fan_speed": "0", - "temperature": "360", - "infill_speed": "60", - "top_solid_infill_speed": "20", - "perimeter_speed": "20", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "130", "bed_temperature_garolite": "130", "bed_temperature_glass": "130", "bed_temperature_kapton": "130", "bed_temperature_pei": "130", "bed_temperature_pp": "130", - "external_perimeter_speed": "20", + "bridge_fan_speed": "50", "enable_fan": "0", - "material_sku": "MRM86607" + "external_perimeter_speed": "20", + "filament_density": "1.32", + "infill_speed": "60", + "layer_id": "63342beb-0f41-4afb-bf96-bf73bd168bd7", + "layer_name": "PEEK", + "material_sku": "MRM86607", + "max_fan_speed": "0", + "min_fan_speed": "0", + "perimeter_speed": "20", + "temperature": "360", + "top_solid_infill_speed": "20" } ], "OemLayer": null, diff --git a/StaticData/Materials/3DXTech/ezPC.material b/StaticData/Materials/3DXTech/ezPC.material index 4e237b686..0715b3183 100644 --- a/StaticData/Materials/3DXTech/ezPC.material +++ b/StaticData/Materials/3DXTech/ezPC.material @@ -4,13 +4,14 @@ "Macros": [], "MaterialLayers": [ { + "bed_temperature": "115", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "110", "bed_temperature_garolite": "110", "bed_temperature_glass": "110", "bed_temperature_kapton": "110", "bed_temperature_pei": "110", "bed_temperature_pp": "110", - "bed_temperature": "115", "enable_fan": "0", "filament_density": "1.20", "infill_speed": "30", @@ -21,7 +22,7 @@ "min_fan_speed": "0", "perimeter_speed": "26", "temperature": "290", - "top_solid_infill_speed": "22", + "top_solid_infill_speed": "22" } ], "OemLayer": null, diff --git a/StaticData/Materials/BASF/ABS Fusion.material b/StaticData/Materials/BASF/ABS Fusion.material index c5f4c802c..f5a4c642d 100644 --- a/StaticData/Materials/BASF/ABS Fusion.material +++ b/StaticData/Materials/BASF/ABS Fusion.material @@ -4,26 +4,27 @@ "Macros": [], "MaterialLayers": [ { - "layer_name": "BASF ABS Fusion+", - "filament_density": "1.04", - "layer_id": "2bcc7c0a-2275-4e30-ae4e-e24b3acea1a2", "bed_temperature": "100", - "temperature": "240", - "min_fan_speed": "70", - "max_fan_speed": "100", - "bridge_fan_speed": "50", - "enable_fan": "0", - "filament_cost": "42", - "min_fan_speed_layer_time": "8", - "max_fan_speed_layer_time": "8", - "disable_fan_first_layers": "5", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "100", "bed_temperature_garolite": "100", "bed_temperature_glass": "100", "bed_temperature_kapton": "100", "bed_temperature_pei": "100", "bed_temperature_pp": "100", - "material_sku": "MU25ZAEV" + "bridge_fan_speed": "50", + "disable_fan_first_layers": "5", + "enable_fan": "0", + "filament_cost": "42", + "filament_density": "1.04", + "layer_id": "2bcc7c0a-2275-4e30-ae4e-e24b3acea1a2", + "layer_name": "BASF ABS Fusion+", + "material_sku": "MU25ZAEV", + "max_fan_speed": "100", + "max_fan_speed_layer_time": "8", + "min_fan_speed": "70", + "min_fan_speed_layer_time": "8", + "temperature": "240" } ], "OemLayer": null, diff --git a/StaticData/Materials/BASF/PRO1 Tough PLA.material b/StaticData/Materials/BASF/PRO1 Tough PLA.material index ff3fd2ceb..5a71f2fb2 100644 --- a/StaticData/Materials/BASF/PRO1 Tough PLA.material +++ b/StaticData/Materials/BASF/PRO1 Tough PLA.material @@ -4,13 +4,14 @@ "Macros": [], "MaterialLayers": [ { + "bed_temperature": "55", + "bed_temperature_blue_tape": "0", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "70", "bed_temperature_glass": "70", "bed_temperature_kapton": "55", "bed_temperature_pei": "70", "bed_temperature_pp": "55", - "bed_temperature": "55", "disable_fan_first_layers": "5", "filament_cost": "42", "filament_density": "1.24", @@ -18,8 +19,8 @@ "layer_name": "BASF PRO1 Tough PLA", "material_sku": "MZ2HXEPK", "max_fan_speed_layer_time": "60", - "min_fan_speed_layer_time": "180", "min_fan_speed": "60", + "min_fan_speed_layer_time": "180", "temperature": "220" } ], diff --git a/StaticData/Materials/BASF/Ultrafuse 17-4 PH.material b/StaticData/Materials/BASF/Ultrafuse 17-4 PH.material index 860fa4e2a..6573e6b02 100644 --- a/StaticData/Materials/BASF/Ultrafuse 17-4 PH.material +++ b/StaticData/Materials/BASF/Ultrafuse 17-4 PH.material @@ -4,34 +4,35 @@ "Macros": [], "MaterialLayers": [ { - "layer_name": "BASF 17-4 PH", - "layer_id": "1238d9d9-76b9-44af-3457-a349ba27151f", - "enable_fan": "0", - "retract_lift": "1", - "filament_cost": "465", - "temperature": "240", + "air_gap_speed": "30", "bed_temperature": "100", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "100", "bed_temperature_garolite": "100", "bed_temperature_glass": "100", "bed_temperature_kapton": "100", "bed_temperature_pei": "100", "bed_temperature_pp": "100", + "bridge_speed": "18", + "enable_fan": "0", + "filament_cost": "465", "filament_density": "7851", "fill_density": "100%", - "infill_type": "LINES", - "perimeter_start_end_overlap": "50", - "infill_overlap_perimeter": "50%", "first_layer_speed": "18", + "infill_overlap_perimeter": "50%", "infill_speed": "35", - "top_solid_infill_speed": "25", - "perimeter_speed": "30", - "support_material_speed": "30", + "infill_type": "LINES", "interface_layer_speed": "30", - "air_gap_speed": "30", - "bridge_speed": "18", + "layer_id": "1238d9d9-76b9-44af-3457-a349ba27151f", + "layer_name": "BASF 17-4 PH", + "material_sku": "MA27ESD5", "min_print_speed": "10", - "material_sku": "MA27ESD5" + "perimeter_speed": "30", + "perimeter_start_end_overlap": "50", + "retract_lift": "1", + "support_material_speed": "30", + "temperature": "240", + "top_solid_infill_speed": "25" } ], "OemLayer": null, diff --git a/StaticData/Materials/BASF/Ultrafuse 316L.material b/StaticData/Materials/BASF/Ultrafuse 316L.material index d4791ca99..aa70687bd 100644 --- a/StaticData/Materials/BASF/Ultrafuse 316L.material +++ b/StaticData/Materials/BASF/Ultrafuse 316L.material @@ -11,6 +11,7 @@ "filament_cost": "465", "temperature": "240", "bed_temperature": "100", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "100", "bed_temperature_garolite": "100", "bed_temperature_glass": "100", diff --git a/StaticData/Materials/Filamentum/CPE HG100.material b/StaticData/Materials/Filamentum/CPE HG100.material index 55ee564da..8cee137d3 100644 --- a/StaticData/Materials/Filamentum/CPE HG100.material +++ b/StaticData/Materials/Filamentum/CPE HG100.material @@ -4,26 +4,27 @@ "Macros": [], "MaterialLayers": [ { - "layer_name": "Filamentum CPE HG100", - "layer_id": "dbbf12f0-4237-41e8-b15e-85436d833fcc", - "temperature": "245", - "filament_density": "1.28", "bed_temperature": "75", - "bridge_fan_speed": "25", - "max_fan_speed": "100", - "min_fan_speed": "35", - "min_fan_speed_layer_time": "25", - "max_fan_speed_layer_time": "10", - "layer_etag": "", - "layer_source": "", - "filament_cost": "49.99", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "75", "bed_temperature_glass": "75", "bed_temperature_kapton": "75", "bed_temperature_pei": "75", "bed_temperature_pp": "55", - "material_sku": "MHSXGFA0" + "bridge_fan_speed": "25", + "filament_cost": "49.99", + "filament_density": "1.28", + "layer_etag": "", + "layer_id": "dbbf12f0-4237-41e8-b15e-85436d833fcc", + "layer_name": "Filamentum CPE HG100", + "layer_source": "", + "material_sku": "MHSXGFA0", + "max_fan_speed": "100", + "max_fan_speed_layer_time": "10", + "min_fan_speed": "35", + "min_fan_speed_layer_time": "25", + "temperature": "245" } ], "OemLayer": null, diff --git a/StaticData/Materials/General/ABS.material b/StaticData/Materials/General/ABS.material index 0036cf264..afa40090e 100644 --- a/StaticData/Materials/General/ABS.material +++ b/StaticData/Materials/General/ABS.material @@ -16,6 +16,7 @@ "enable_fan": "1", "min_fan_speed_layer_time": "8", "max_fan_speed_layer_time": "8", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "100", "bed_temperature_garolite": "100", "bed_temperature_glass": "100", diff --git a/StaticData/Materials/General/Nylon.material b/StaticData/Materials/General/Nylon.material index a9305eb08..df547d1f7 100644 --- a/StaticData/Materials/General/Nylon.material +++ b/StaticData/Materials/General/Nylon.material @@ -9,6 +9,7 @@ "temperature": "250", "bed_temperature": "55", "filament_density": "1.14", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "70", "bed_temperature_glass": "70", diff --git a/StaticData/Materials/General/PC.material b/StaticData/Materials/General/PC.material index e6c038b73..38180cded 100644 --- a/StaticData/Materials/General/PC.material +++ b/StaticData/Materials/General/PC.material @@ -4,13 +4,14 @@ "Macros": [], "MaterialLayers": [ { + "bed_temperature": "115", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "100", "bed_temperature_garolite": "100", "bed_temperature_glass": "100", "bed_temperature_kapton": "100", "bed_temperature_pei": "100", "bed_temperature_pp": "100", - "bed_temperature": "115", "enable_fan": "0", "filament_density": "1.20", "has_fan": "False", @@ -22,7 +23,7 @@ "min_fan_speed": "0", "perimeter_speed": "26", "temperature": "290", - "top_solid_infill_speed": "22", + "top_solid_infill_speed": "22" } ], "OemLayer": null, diff --git a/StaticData/Materials/General/PETg.material b/StaticData/Materials/General/PETg.material index 102fee80e..859ecc660 100644 --- a/StaticData/Materials/General/PETg.material +++ b/StaticData/Materials/General/PETg.material @@ -16,6 +16,7 @@ "max_fan_speed_layer_time": "10", "layer_etag": "", "layer_source": "", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "75", "bed_temperature_glass": "75", diff --git a/StaticData/Materials/General/PLA.material b/StaticData/Materials/General/PLA.material index ae555a5e8..f6fc741c1 100644 --- a/StaticData/Materials/General/PLA.material +++ b/StaticData/Materials/General/PLA.material @@ -15,6 +15,7 @@ "min_fan_speed_layer_time": "180", "max_fan_speed_layer_time": "60", "disable_fan_first_layers": "3", + "bed_temperature_blue_tape": "0", "bed_temperature_buildtak": "50", "bed_temperature_garolite": "75", "bed_temperature_glass": "75", diff --git a/StaticData/Materials/General/TPU.material b/StaticData/Materials/General/TPU.material index 238a01fb3..e1776ba4a 100644 --- a/StaticData/Materials/General/TPU.material +++ b/StaticData/Materials/General/TPU.material @@ -4,29 +4,30 @@ "Macros": [], "MaterialLayers": [ { - "layer_name": "TPU", - "filament_density": "1.23", - "layer_id": "80357dda-abc1-4837-be45-54912ce1071d", - "first_layer_speed": "15", - "filament_cost": "24.64", - "infill_speed": "25", - "top_solid_infill_speed": "25", - "perimeter_speed": "25", - "support_material_speed": "25", - "interface_layer_speed": "25", "air_gap_speed": "25", - "raft_print_speed": "25", - "enable_retractions": "0", - "temperature": "245", - "external_perimeter_speed": "25", - "min_print_speed": "25", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "55", "bed_temperature_glass": "65", "bed_temperature_kapton": "65", "bed_temperature_pei": "55", + "enable_retractions": "0", + "external_perimeter_speed": "25", + "filament_cost": "24.64", + "filament_density": "1.23", + "first_layer_speed": "15", + "infill_speed": "25", + "interface_layer_speed": "25", + "layer_id": "80357dda-abc1-4837-be45-54912ce1071d", + "layer_name": "TPU", + "material_sku": "TPU", "min_fan_speed": "0", - "material_sku": "TPU" + "min_print_speed": "25", + "perimeter_speed": "25", + "raft_print_speed": "25", + "support_material_speed": "25", + "temperature": "245", + "top_solid_infill_speed": "25" } ], "OemLayer": null, diff --git a/StaticData/Materials/NinjaTek/Ninja Flex.material b/StaticData/Materials/NinjaTek/Ninja Flex.material index 16cd809d7..b0f9f5dc7 100644 --- a/StaticData/Materials/NinjaTek/Ninja Flex.material +++ b/StaticData/Materials/NinjaTek/Ninja Flex.material @@ -4,31 +4,32 @@ "Macros": [], "MaterialLayers": [ { - "layer_name": "Ninja Flex", - "layer_id": "48bf0756-ddc9-4371-bb25-800f5003d502", - "bridge_fan_speed": "100", - "filament_density": "1.28", - "first_layer_speed": "10", - "max_fan_speed": "100", - "min_fan_speed": "100", - "infill_speed": "25", - "top_solid_infill_speed": "25", - "perimeter_speed": "25", - "support_material_speed": "25", - "interface_layer_speed": "25", "air_gap_speed": "25", - "raft_print_speed": "25", - "external_perimeter_speed": "25", - "retract_length": "0", - "temperature": "235", "bed_temperature": "75", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "75", "bed_temperature_glass": "75", "bed_temperature_kapton": "75", "bed_temperature_pei": "75", "bed_temperature_pp": "55", - "material_sku": "MH7SK8X3" + "bridge_fan_speed": "100", + "external_perimeter_speed": "25", + "filament_density": "1.28", + "first_layer_speed": "10", + "infill_speed": "25", + "interface_layer_speed": "25", + "layer_id": "48bf0756-ddc9-4371-bb25-800f5003d502", + "layer_name": "Ninja Flex", + "material_sku": "MH7SK8X3", + "max_fan_speed": "100", + "min_fan_speed": "100", + "perimeter_speed": "25", + "raft_print_speed": "25", + "retract_length": "0", + "support_material_speed": "25", + "temperature": "235", + "top_solid_infill_speed": "25" } ], "OemLayer": null, diff --git a/StaticData/Materials/Taulman/230 Nylon.material b/StaticData/Materials/Taulman/230 Nylon.material index 4a1005a3c..f7ea4a81a 100644 --- a/StaticData/Materials/Taulman/230 Nylon.material +++ b/StaticData/Materials/Taulman/230 Nylon.material @@ -5,6 +5,7 @@ "MaterialLayers": [ { "bed_temperature": "70", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "70", "bed_temperature_glass": "70", @@ -12,13 +13,11 @@ "bed_temperature_pei": "70", "bed_temperature_pp": "50", "enable_fan": "0", - "filament_cost": "60", + "filament_cost": "80", "filament_density": "1.1", "layer_id": "d0993cbe-031d-4db2-b521-77915c2f8725", "layer_name": "230 Nylon (Taulman)", - "material_sku": "MQPV5RUM", - "retract_restart_extra": "0", - "retract_restart_extra_time_to_apply": "0", + "material_sku": "MKATKF3A", "temperature": "235" } ], diff --git a/StaticData/Materials/Taulman/645 Nylon.material b/StaticData/Materials/Taulman/645 Nylon.material index 88f1b6ec3..f89492934 100644 --- a/StaticData/Materials/Taulman/645 Nylon.material +++ b/StaticData/Materials/Taulman/645 Nylon.material @@ -5,6 +5,7 @@ "MaterialLayers": [ { "bed_temperature": "70", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "70", "bed_temperature_glass": "70", @@ -14,11 +15,9 @@ "enable_fan": "0", "filament_cost": "60", "filament_density": "1.1", - "layer_id": "b499cd18-3539-4648-91eb-ad65dad74d13", + "layer_id": "b4991d18-3539-4648-91eb-ad65dad24d13", "layer_name": "645 Nylon (Taulman)", "material_sku": "MSFDVGY6", - "retract_restart_extra": "0", - "retract_restart_extra_time_to_apply": "0", "temperature": "250" } ], diff --git a/StaticData/Materials/Taulman/680 Nylon.material b/StaticData/Materials/Taulman/680 Nylon.material index 913e53feb..7ff0a01ff 100644 --- a/StaticData/Materials/Taulman/680 Nylon.material +++ b/StaticData/Materials/Taulman/680 Nylon.material @@ -5,6 +5,7 @@ "MaterialLayers": [ { "bed_temperature": "70", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "70", "bed_temperature_glass": "70", @@ -12,13 +13,11 @@ "bed_temperature_pei": "70", "bed_temperature_pp": "50", "enable_fan": "0", - "filament_cost": "60", + "filament_cost": "80", "filament_density": "1.1", "layer_id": "b411cd18-3539-46a8-91eb-ad25dad74d33", "layer_name": "680 Nylon (Taulman)", - "material_sku": "MSFDVGY6", - "retract_restart_extra": "0", - "retract_restart_extra_time_to_apply": "0", + "material_sku": "M4SHDVY7", "temperature": "250" } ], diff --git a/StaticData/Materials/Taulman/Alloy 910.material b/StaticData/Materials/Taulman/Alloy 910.material index 2190dc84b..79b57f7b3 100644 --- a/StaticData/Materials/Taulman/Alloy 910.material +++ b/StaticData/Materials/Taulman/Alloy 910.material @@ -4,19 +4,21 @@ "Macros": [], "MaterialLayers": [ { - "bed_temperature": "100", - "external_perimeter_speed": "45", - "extruder_wipe_temperature": "180", - "infill_speed": "55", + "bed_temperature": "70", + "bed_temperature_blue_tape": "NC", + "bed_temperature_buildtak": "55", + "bed_temperature_garolite": "70", + "bed_temperature_glass": "70", + "bed_temperature_kapton": "70", + "bed_temperature_pei": "70", + "bed_temperature_pp": "50", + "enable_fan": "0", + "filament_cost": "80", + "filament_density": "1.1", "layer_id": "a160e052-1fc6-4843-a74e-305d4f01ed13", "layer_name": "Alloy 910 (Taulman)", - "max_fan_speed": "50", - "min_fan_speed": "3", - "perimeter_speed": "50", - "retract_length": "1.5", - "slowdown_below_layer_time": "15", - "temperature": "235", - "top_solid_infill_speed": "45" + "material_sku": "MVSK2VGK", + "temperature": "250" } ], "OemLayer": null, diff --git a/StaticData/Materials/Taulman/Bridge Nylon.material b/StaticData/Materials/Taulman/Bridge Nylon.material index b1dfc6f91..cbeaa1783 100644 --- a/StaticData/Materials/Taulman/Bridge Nylon.material +++ b/StaticData/Materials/Taulman/Bridge Nylon.material @@ -4,19 +4,21 @@ "Macros": [], "MaterialLayers": [ { - "bed_temperature": "110", - "external_perimeter_speed": "35", - "extruder_wipe_temperature": "160", - "first_layer_speed": "12", - "infill_speed": "45", + "bed_temperature": "70", + "bed_temperature_blue_tape": "NC", + "bed_temperature_buildtak": "55", + "bed_temperature_garolite": "70", + "bed_temperature_glass": "70", + "bed_temperature_kapton": "70", + "bed_temperature_pei": "70", + "bed_temperature_pp": "50", + "enable_fan": "0", + "filament_cost": "80", + "filament_density": "1.1", "layer_id": "96d5a543-c84f-47d1-b55d-6d2a324241c4", "layer_name": "Bridge Nylon (Taulman)", - "max_fan_speed": "5", - "min_fan_speed": "2", - "perimeter_speed": "40", - "slowdown_below_layer_time": "15", - "temperature": "245", - "top_solid_infill_speed": "35" + "material_sku": "MXEQ5PRX", + "temperature": "250" } ], "OemLayer": null, diff --git a/StaticData/Materials/Taulman/PCTPE.material b/StaticData/Materials/Taulman/PCTPE.material index 6dfe76eb2..19c054ed6 100644 --- a/StaticData/Materials/Taulman/PCTPE.material +++ b/StaticData/Materials/Taulman/PCTPE.material @@ -4,18 +4,21 @@ "Macros": [], "MaterialLayers": [ { - "bed_temperature": "80", - "external_perimeter_speed": "45", - "extruder_wipe_temperature": "160", - "infill_speed": "55", + "bed_temperature": "70", + "bed_temperature_blue_tape": "NC", + "bed_temperature_buildtak": "55", + "bed_temperature_garolite": "70", + "bed_temperature_glass": "70", + "bed_temperature_kapton": "70", + "bed_temperature_pei": "70", + "bed_temperature_pp": "50", + "enable_fan": "0", + "filament_cost": "80", + "filament_density": "1.1", "layer_id": "07183e86-9108-47fd-b138-7fdec91c4a4c", "layer_name": "PCTPE (Taulman)", - "max_fan_speed": "20", - "min_fan_speed": "10", - "perimeter_speed": "50", - "slowdown_below_layer_time": "15", - "temperature": "230", - "top_solid_infill_speed": "45" + "material_sku": "MCAMWFTM", + "temperature": "235" } ], "OemLayer": null, diff --git a/StaticData/Materials/Taulman/PETG.material b/StaticData/Materials/Taulman/PETG.material index 87dc12d4f..bd87f9802 100644 --- a/StaticData/Materials/Taulman/PETG.material +++ b/StaticData/Materials/Taulman/PETG.material @@ -4,19 +4,21 @@ "Macros": [], "MaterialLayers": [ { - "layer_name": "PETG Taulman (on Paper Tape)", - "layer_id": "5d87ab7d-5579-4fc8-acf0-33b1331efeff", "bed_temperature": "70", - "bridge_fan_speed": "100", - "disable_fan_first_layers": "2", - "filament_diameter": "1.73", - "max_fan_speed": "100", - "min_fan_speed": "100", - "retract_length": "3", - "temperature": "240", - "z_offset": "0", - "layer_etag": "", - "layer_source": "" + "bed_temperature_blue_tape": "NC", + "bed_temperature_buildtak": "55", + "bed_temperature_garolite": "70", + "bed_temperature_glass": "70", + "bed_temperature_kapton": "70", + "bed_temperature_pei": "70", + "bed_temperature_pp": "50", + "enable_fan": "0", + "filament_cost": "80", + "filament_density": "1.1", + "layer_id": "5d87ab7d-5579-4fc8-acf0-33b1331efeff", + "layer_name": "TECH-G PETG (Taulman)", + "material_sku": "M88D4SXA", + "temperature": "240" } ], "OemLayer": null, diff --git a/StaticData/Materials/Taulman/n-vent.material b/StaticData/Materials/Taulman/n-vent.material index bf571c56a..2e3e1c95c 100644 --- a/StaticData/Materials/Taulman/n-vent.material +++ b/StaticData/Materials/Taulman/n-vent.material @@ -4,19 +4,21 @@ "Macros": [], "MaterialLayers": [ { - "layer_name": "n-vent (Taulman)", + "bed_temperature": "70", + "bed_temperature_blue_tape": "NC", + "bed_temperature_buildtak": "55", + "bed_temperature_garolite": "70", + "bed_temperature_glass": "70", + "bed_temperature_kapton": "70", + "bed_temperature_pei": "70", + "bed_temperature_pp": "50", + "enable_fan": "0", + "filament_cost": "80", + "filament_density": "1.1", "layer_id": "3ae26ddb-d19b-4d5b-9e80-61bf5a2d5a08", - "external_perimeter_speed": "35", - "extruder_wipe_temperature": "150", - "filament_diameter": "2.89", - "first_layer_speed": "10", - "infill_speed": "40", - "max_fan_speed": "60", - "min_fan_speed": "40", - "perimeter_speed": "37", - "slowdown_below_layer_time": "15", - "temperature": "235", - "top_solid_infill_speed": "35", + "layer_name": "n-vent (Taulman)", + "material_sku": "MCZVPSY0", + "temperature": "250" } ], "OemLayer": null, diff --git a/StaticData/Materials/Taulman/t-glase.material b/StaticData/Materials/Taulman/t-glase.material index dab0fb222..25ed3abd7 100644 --- a/StaticData/Materials/Taulman/t-glase.material +++ b/StaticData/Materials/Taulman/t-glase.material @@ -4,22 +4,21 @@ "Macros": [], "MaterialLayers": [ { - "layer_name": "t-glase (Taulman)", + "bed_temperature": "70", + "bed_temperature_blue_tape": "NC", + "bed_temperature_buildtak": "55", + "bed_temperature_garolite": "70", + "bed_temperature_glass": "70", + "bed_temperature_kapton": "70", + "bed_temperature_pei": "70", + "bed_temperature_pp": "50", + "enable_fan": "0", + "filament_cost": "80", + "filament_density": "1.1", "layer_id": "2042dcf4-c242-4cb5-a220-91a3aa73f043", - "external_perimeter_speed": "15", - "extruder_wipe_temperature": "160", - "first_layer_speed": "10", - "infill_speed": "22", - "max_fan_speed": "50", - "min_fan_speed": "40", - "min_print_speed": "7", - "nozzle_diameter": "0.6", - "perimeter_speed": "18", - "slowdown_below_layer_time": "20", - "temperature": "240", - "top_solid_infill_speed": "15", - "layer_etag": "", - "layer_source": "" + "layer_name": "T-Glase (Taulman)", + "material_sku": "MD90W6VY", + "temperature": "235" } ], "OemLayer": null, diff --git a/StaticData/Materials/_MatterHackers/Build Series/ABS.material b/StaticData/Materials/_MatterHackers/Build Series/ABS.material index 0b3d63dc0..98d0bbec4 100644 --- a/StaticData/Materials/_MatterHackers/Build Series/ABS.material +++ b/StaticData/Materials/_MatterHackers/Build Series/ABS.material @@ -4,20 +4,21 @@ "Macros": [], "MaterialLayers": [ { - "layer_name": "Build Series ABS", - "filament_density": "1.04", - "layer_id": "8b9e4573-75c3-43cb-b02d-9b9926ed5d27", "bed_temperature": "100", - "temperature": "235", - "enable_fan": "0", - "filament_cost": "16.17", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "100", "bed_temperature_garolite": "100", "bed_temperature_glass": "100", "bed_temperature_kapton": "100", "bed_temperature_pei": "100", "bed_temperature_pp": "100", - "material_sku": "MWVCRU99" + "enable_fan": "0", + "filament_cost": "16.17", + "filament_density": "1.04", + "layer_id": "8b9e4573-75c3-43cb-b02d-9b9926ed5d27", + "layer_name": "Build Series ABS", + "material_sku": "MWVCRU99", + "temperature": "235" } ], "OemLayer": null, diff --git a/StaticData/Materials/_MatterHackers/Build Series/PETg.material b/StaticData/Materials/_MatterHackers/Build Series/PETg.material index df68e109d..2beff12fe 100644 --- a/StaticData/Materials/_MatterHackers/Build Series/PETg.material +++ b/StaticData/Materials/_MatterHackers/Build Series/PETg.material @@ -4,24 +4,25 @@ "Macros": [], "MaterialLayers": [ { - "layer_name": "Build Series PETg", - "layer_id": "dbbf12f0-4197-41e8-b15e-85436d833fcc", - "temperature": "245", - "filament_density": "1.28", "bed_temperature": "75", - "bridge_fan_speed": "25", - "max_fan_speed": "100", - "min_fan_speed": "35", - "min_fan_speed_layer_time": "25", - "max_fan_speed_layer_time": "10", - "filament_cost": "21.98", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "75", "bed_temperature_glass": "75", "bed_temperature_kapton": "75", "bed_temperature_pei": "75", "bed_temperature_pp": "55", - "material_sku": "MSNJXN9N" + "bridge_fan_speed": "25", + "filament_cost": "21.98", + "filament_density": "1.28", + "layer_id": "dbbf12f0-4197-41e8-b15e-85436d833fcc", + "layer_name": "Build Series PETg", + "material_sku": "MSNJXN9N", + "max_fan_speed": "100", + "max_fan_speed_layer_time": "10", + "min_fan_speed": "35", + "min_fan_speed_layer_time": "25", + "temperature": "245" } ], "OemLayer": null, diff --git a/StaticData/Materials/_MatterHackers/Build Series/PLA.material b/StaticData/Materials/_MatterHackers/Build Series/PLA.material index 16d9d8d7d..456318bfe 100644 --- a/StaticData/Materials/_MatterHackers/Build Series/PLA.material +++ b/StaticData/Materials/_MatterHackers/Build Series/PLA.material @@ -4,25 +4,26 @@ "Macros": [], "MaterialLayers": [ { - "layer_name": "Build Series PLA", - "filament_density": "1.24", - "layer_id": "74679ff2-0dde-4808-bd9d-06c23e897dfe", "bed_temperature": "75", - "temperature": "205", - "min_fan_speed": "70", - "max_fan_speed": "100", - "bridge_fan_speed": "100", - "filament_cost": "16.17", - "min_fan_speed_layer_time": "180", - "max_fan_speed_layer_time": "60", - "disable_fan_first_layers": "5", + "bed_temperature_blue_tape": "0", "bed_temperature_buildtak": "50", "bed_temperature_garolite": "75", "bed_temperature_glass": "75", "bed_temperature_kapton": "50", "bed_temperature_pei": "75", "bed_temperature_pp": "75", - "material_sku": "MY6CYEZM" + "bridge_fan_speed": "100", + "disable_fan_first_layers": "5", + "filament_cost": "16.17", + "filament_density": "1.24", + "layer_id": "74679ff2-0dde-4808-bd9d-06c23e897dfe", + "layer_name": "Build Series PLA", + "material_sku": "MY6CYEZM", + "max_fan_speed": "100", + "max_fan_speed_layer_time": "60", + "min_fan_speed": "70", + "min_fan_speed_layer_time": "180", + "temperature": "205" } ], "OemLayer": null, diff --git a/StaticData/Materials/_MatterHackers/Build Series/Silky PLA.material b/StaticData/Materials/_MatterHackers/Build Series/Silky PLA.material index 544f428aa..bc732a29f 100644 --- a/StaticData/Materials/_MatterHackers/Build Series/Silky PLA.material +++ b/StaticData/Materials/_MatterHackers/Build Series/Silky PLA.material @@ -16,6 +16,7 @@ "min_fan_speed_layer_time": "180", "max_fan_speed_layer_time": "60", "disable_fan_first_layers": "5", + "bed_temperature_blue_tape": "0", "bed_temperature_buildtak": "50", "bed_temperature_garolite": "75", "bed_temperature_glass": "75", diff --git a/StaticData/Materials/_MatterHackers/Build Series/TPU.material b/StaticData/Materials/_MatterHackers/Build Series/TPU.material index 5608f2efd..3cf703f05 100644 --- a/StaticData/Materials/_MatterHackers/Build Series/TPU.material +++ b/StaticData/Materials/_MatterHackers/Build Series/TPU.material @@ -4,29 +4,30 @@ "Macros": [], "MaterialLayers": [ { - "layer_name": "TPU", - "filament_density": "1.23", - "layer_id": "80657dda-a7c1-4837-be45-54990ce1071d", - "first_layer_speed": "15", - "filament_cost": "38.25", - "infill_speed": "25", - "top_solid_infill_speed": "25", - "perimeter_speed": "25", - "support_material_speed": "25", - "interface_layer_speed": "25", "air_gap_speed": "25", - "raft_print_speed": "25", - "external_perimeter_speed": "25", - "min_print_speed": "25", - "enable_retractions": "0", - "temperature": "245", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "55", "bed_temperature_glass": "65", "bed_temperature_kapton": "65", "bed_temperature_pei": "55", + "enable_retractions": "0", + "external_perimeter_speed": "25", + "filament_cost": "38.25", + "filament_density": "1.23", + "first_layer_speed": "15", + "infill_speed": "25", + "interface_layer_speed": "25", + "layer_id": "80657dda-a7c1-4837-be45-54990ce1071d", + "layer_name": "TPU", + "material_sku": "MWDVWSZ3", "min_fan_speed": "0", - "material_sku": "MWDVWSZ3" + "min_print_speed": "25", + "perimeter_speed": "25", + "raft_print_speed": "25", + "support_material_speed": "25", + "temperature": "245", + "top_solid_infill_speed": "25" } ], "OemLayer": null, diff --git a/StaticData/Materials/_MatterHackers/NylonG.material b/StaticData/Materials/_MatterHackers/NylonG.material index d94e77b21..d91216636 100644 --- a/StaticData/Materials/_MatterHackers/NylonG.material +++ b/StaticData/Materials/_MatterHackers/NylonG.material @@ -4,27 +4,28 @@ "Macros": [], "MaterialLayers": [ { - "layer_name": "NylonG", - "layer_id": "f8bf5181-0d9a-47ac-b8dd-c6ff6e24dc57", - "temperature": "265", "bed_temperature": "70", - "filament_density": "1.01", - "filament_cost": "64", - "min_fan_speed": "35", - "max_fan_speed": "100", - "raft_fan_speed_percent": "0", - "bridge_fan_speed": "50", - "min_fan_speed_layer_time": "10", - "max_fan_speed_layer_time": "10", - "layer_etag": "", - "layer_source": "", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "70", "bed_temperature_garolite": "80", "bed_temperature_glass": "85", "bed_temperature_kapton": "60", "bed_temperature_pei": "75", "bed_temperature_pp": "60", - "material_sku": "MZ9H8W56" + "bridge_fan_speed": "50", + "filament_cost": "64", + "filament_density": "1.01", + "layer_etag": "", + "layer_id": "f8bf5181-0d9a-47ac-b8dd-c6ff6e24dc57", + "layer_name": "NylonG", + "layer_source": "", + "material_sku": "MZ9H8W56", + "max_fan_speed": "100", + "max_fan_speed_layer_time": "10", + "min_fan_speed": "35", + "min_fan_speed_layer_time": "10", + "raft_fan_speed_percent": "0", + "temperature": "265" } ], "OemLayer": null, diff --git a/StaticData/Materials/_MatterHackers/NylonK.material b/StaticData/Materials/_MatterHackers/NylonK.material index b016ae08c..0b0b144d3 100644 --- a/StaticData/Materials/_MatterHackers/NylonK.material +++ b/StaticData/Materials/_MatterHackers/NylonK.material @@ -4,27 +4,28 @@ "Macros": [], "MaterialLayers": [ { - "layer_name": "NylonK", - "layer_id": "f8235181-0d9a-47ac-b3dd-c6ff1224dc57", - "temperature": "265", "bed_temperature": "70", - "filament_density": "1.01", - "filament_cost": "64", - "min_fan_speed": "35", - "max_fan_speed": "100", - "raft_fan_speed_percent": "0", - "bridge_fan_speed": "50", - "min_fan_speed_layer_time": "10", - "max_fan_speed_layer_time": "10", - "layer_etag": "", - "layer_source": "", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "70", "bed_temperature_garolite": "80", "bed_temperature_glass": "85", "bed_temperature_kapton": "60", "bed_temperature_pei": "75", "bed_temperature_pp": "60", - "material_sku": "MXTJFMYQ" + "bridge_fan_speed": "50", + "filament_cost": "64", + "filament_density": "1.01", + "layer_etag": "", + "layer_id": "f8235181-0d9a-47ac-b3dd-c6ff1224dc57", + "layer_name": "NylonK", + "layer_source": "", + "material_sku": "MXTJFMYQ", + "max_fan_speed": "100", + "max_fan_speed_layer_time": "10", + "min_fan_speed": "35", + "min_fan_speed_layer_time": "10", + "raft_fan_speed_percent": "0", + "temperature": "265" } ], "OemLayer": null, diff --git a/StaticData/Materials/_MatterHackers/NylonX.material b/StaticData/Materials/_MatterHackers/NylonX.material index bc1522e73..0c7c8a27d 100644 --- a/StaticData/Materials/_MatterHackers/NylonX.material +++ b/StaticData/Materials/_MatterHackers/NylonX.material @@ -4,28 +4,29 @@ "Macros": [], "MaterialLayers": [ { - "layer_name": "NylonX", - "layer_id": "9c66e529-0034-407e-baa2-e4bb2d1fa0b8", - "temperature": "265", "bed_temperature": "70", - "filament_density": "1.01", - "filament_cost": "51.04", - "min_fan_speed": "35", - "max_fan_speed": "50", - "raft_fan_speed_percent": "0", - "bridge_fan_speed": "35", - "min_fan_speed_layer_time": "5", - "max_fan_speed_layer_time": "5", - "disable_fan_first_layers": "10", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "60", "bed_temperature_garolite": "75", "bed_temperature_glass": "75", "bed_temperature_kapton": "60", "bed_temperature_pei": "75", "bed_temperature_pp": "60", + "bridge_fan_speed": "35", + "disable_fan_first_layers": "10", + "filament_cost": "51.04", + "filament_density": "1.01", "layer_etag": "", + "layer_id": "9c66e529-0034-407e-baa2-e4bb2d1fa0b8", + "layer_name": "NylonX", "layer_source": "", - "material_sku": "MD5LDGS7" + "material_sku": "MD5LDGS7", + "max_fan_speed": "50", + "max_fan_speed_layer_time": "5", + "min_fan_speed": "35", + "min_fan_speed_layer_time": "5", + "raft_fan_speed_percent": "0", + "temperature": "265" } ], "OemLayer": null, diff --git a/StaticData/Materials/_MatterHackers/PRO Series/ABS.material b/StaticData/Materials/_MatterHackers/PRO Series/ABS.material index 7b52c42f9..ba14377a9 100644 --- a/StaticData/Materials/_MatterHackers/PRO Series/ABS.material +++ b/StaticData/Materials/_MatterHackers/PRO Series/ABS.material @@ -4,26 +4,27 @@ "Macros": [], "MaterialLayers": [ { - "layer_name": "PRO Series ABS", - "filament_density": "1.04", - "layer_id": "4bca7c0a-2275-4e30-ae4e-e2466ace81a0", "bed_temperature": "100", - "temperature": "240", - "min_fan_speed": "70", - "max_fan_speed": "100", - "bridge_fan_speed": "50", - "enable_fan": "0", - "filament_cost": "42", - "min_fan_speed_layer_time": "8", - "max_fan_speed_layer_time": "8", - "disable_fan_first_layers": "5", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "100", "bed_temperature_garolite": "100", "bed_temperature_glass": "100", "bed_temperature_kapton": "100", "bed_temperature_pei": "100", "bed_temperature_pp": "100", - "material_sku": "M6A3VYQ9" + "bridge_fan_speed": "50", + "disable_fan_first_layers": "5", + "enable_fan": "0", + "filament_cost": "42", + "filament_density": "1.04", + "layer_id": "4bca7c0a-2275-4e30-ae4e-e2466ace81a0", + "layer_name": "PRO Series ABS", + "material_sku": "M6A3VYQ9", + "max_fan_speed": "100", + "max_fan_speed_layer_time": "8", + "min_fan_speed": "70", + "min_fan_speed_layer_time": "8", + "temperature": "240" } ], "OemLayer": null, diff --git a/StaticData/Materials/_MatterHackers/PRO Series/Nylon.material b/StaticData/Materials/_MatterHackers/PRO Series/Nylon.material index 8bb09b65d..4fd85593a 100644 --- a/StaticData/Materials/_MatterHackers/PRO Series/Nylon.material +++ b/StaticData/Materials/_MatterHackers/PRO Series/Nylon.material @@ -5,6 +5,7 @@ "MaterialLayers": [ { "bed_temperature": "70", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "70", "bed_temperature_glass": "70", diff --git a/StaticData/Materials/_MatterHackers/PRO Series/PLA.material b/StaticData/Materials/_MatterHackers/PRO Series/PLA.material index 14586c7ab..19ec91a44 100644 --- a/StaticData/Materials/_MatterHackers/PRO Series/PLA.material +++ b/StaticData/Materials/_MatterHackers/PRO Series/PLA.material @@ -16,6 +16,7 @@ "max_fan_speed_layer_time": "60", "filament_cost": "42", "disable_fan_first_layers": "3", + "bed_temperature_blue_tape": "0", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "75", "bed_temperature_glass": "75", diff --git a/StaticData/Materials/_MatterHackers/PRO Series/RYNO.material b/StaticData/Materials/_MatterHackers/PRO Series/RYNO.material index 779138fff..4bc94c016 100644 --- a/StaticData/Materials/_MatterHackers/PRO Series/RYNO.material +++ b/StaticData/Materials/_MatterHackers/PRO Series/RYNO.material @@ -4,25 +4,26 @@ "Macros": [], "MaterialLayers": [ { - "layer_name": "PRO Series RYNO", - "layer_id": "99225341-9133-46be-b075-43009ea8f2a0", - "temperature": "245", - "filament_density": "1.28", "bed_temperature": "55", - "bridge_fan_speed": "50", - "max_fan_speed": "100", - "min_fan_speed": "35", - "min_fan_speed_layer_time": "15", - "max_fan_speed_layer_time": "10", - "filament_cost": "64", - "disable_fan_first_layers": "3", + "bed_temperature_blue_tape": "NC", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "75", "bed_temperature_glass": "75", "bed_temperature_kapton": "55", "bed_temperature_pei": "75", "bed_temperature_pp": "55", - "material_sku": "M6989PRZ" + "bridge_fan_speed": "50", + "disable_fan_first_layers": "3", + "filament_cost": "64", + "filament_density": "1.28", + "layer_id": "99225341-9133-46be-b075-43009ea8f2a0", + "layer_name": "PRO Series RYNO", + "material_sku": "M6989PRZ", + "max_fan_speed": "100", + "max_fan_speed_layer_time": "10", + "min_fan_speed": "35", + "min_fan_speed_layer_time": "15", + "temperature": "245" } ], "OemLayer": null, diff --git a/StaticData/Materials/_MatterHackers/PRO Series/Tough PLA.material b/StaticData/Materials/_MatterHackers/PRO Series/Tough PLA.material index 789093c3a..c4570dbe5 100644 --- a/StaticData/Materials/_MatterHackers/PRO Series/Tough PLA.material +++ b/StaticData/Materials/_MatterHackers/PRO Series/Tough PLA.material @@ -4,23 +4,24 @@ "Macros": [], "MaterialLayers": [ { - "layer_name": "PRO Series Tough PLA", - "layer_id": "35158031-fcdf-4e93-bfbc-6b5e78a94d39", - "temperature": "215", "bed_temperature": "55", - "min_fan_speed_layer_time": "180", - "max_fan_speed_layer_time": "60", - "min_fan_speed": "60", - "disable_fan_first_layers": "5", - "filament_density": "1.24", - "filament_cost": "42", + "bed_temperature_blue_tape": "0", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "70", "bed_temperature_glass": "70", "bed_temperature_kapton": "55", "bed_temperature_pei": "70", "bed_temperature_pp": "55", - "material_sku": "MY6C8H7E" + "disable_fan_first_layers": "5", + "filament_cost": "42", + "filament_density": "1.24", + "layer_id": "35158031-fcdf-4e93-bfbc-6b5e78a94d39", + "layer_name": "PRO Series Tough PLA", + "material_sku": "MY6C8H7E", + "max_fan_speed_layer_time": "60", + "min_fan_speed": "60", + "min_fan_speed_layer_time": "180", + "temperature": "215" } ], "OemLayer": null, diff --git a/StaticData/Materials/_MatterHackers/Quantum PLA.material b/StaticData/Materials/_MatterHackers/Quantum PLA.material index 1a765d3d3..6c13fd835 100644 --- a/StaticData/Materials/_MatterHackers/Quantum PLA.material +++ b/StaticData/Materials/_MatterHackers/Quantum PLA.material @@ -16,6 +16,7 @@ "max_fan_speed_layer_time": "60", "filament_cost": "37", "disable_fan_first_layers": "5", + "bed_temperature_blue_tape": "0", "bed_temperature_buildtak": "55", "bed_temperature_garolite": "75", "bed_temperature_glass": "75", diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index d83a5c302..9baaa8444 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -4279,6 +4279,9 @@ Translated:Select this option only if your printer does not appear in the list English:Select What to Import Translated:Select What to Import +English:Selected Material and Bed Surface are Incompatable +Translated:Selected Material and Bed Surface are Incompatable + English:Selected Object Options Translated:Selected Object Options @@ -5050,6 +5053,12 @@ Translated:The Markdown that will be shown on the second extruders Insert Filame English:The Markdown that will be shown on the Trim Filament page. Translated:The Markdown that will be shown on the Trim Filament page. +English:The Material you have selected is incompatible with the Bed Surface you have selected. You may get poor bed adhesion or printing results. Changing the bed is recommended. +Translated:The Material you have selected is incompatible with the Bed Surface you have selected. You may get poor bed adhesion or printing results. Changing the bed is recommended. + +English:The 'Material' you have selected is incompatible with the 'Bed Surface' you have selected. You may get poor bed adhesion or printing results. Changing the 'Bed Surface' is recommended. You can change it in the 'Bed Temperature' menu on the top right of your screen. +Translated:The 'Material' you have selected is incompatible with the 'Bed Surface' you have selected. You may get poor bed adhesion or printing results. Changing the 'Bed Surface' is recommended. You can change it in the 'Bed Temperature' menu on the top right of your screen. + English:The maximum amount that an avoid crossing travel can exceed the direct distance. If the avoid travel is too long, a direct move will be executed. Translated:The maximum amount that an avoid crossing travel can exceed the direct distance. If the avoid travel is too long, a direct move will be executed. @@ -5305,42 +5314,63 @@ Translated:The target temperature the extruder will attempt to reach during the English:The temperature at which the extruder will wipe the nozzle, as specified by Custom G-Code. Translated:The temperature at which the extruder will wipe the nozzle, as specified by Custom G-Code. +English:The temperature to print when the bed is coverd in kapton tape. Set to 0 to disable or 'NC' if Not Compatible. +Translated:The temperature to print when the bed is coverd in kapton tape. Set to 0 to disable or 'NC' if Not Compatible. + English:The temperature to print when the bed is coverd in kapton tape. Set to 0 to disable. Translated:The temperature to print when the bed is coverd in kapton tape. Set to 0 to disable. English:The temperature to print when the bed is coverd in kapton tape. Set to 0 to use default. Translated:The temperature to print when the bed is coverd in kapton tape. Set to 0 to use default. +English:The temperature to print when the bed is coverd with blue tape. Set to 0 to disable or 'NC' if Not Compatible. +Translated:The temperature to print when the bed is coverd with blue tape. Set to 0 to disable or 'NC' if Not Compatible. + English:The temperature to print when the bed is coverd with blue tape. Set to 0 to disable. Translated:The temperature to print when the bed is coverd with blue tape. Set to 0 to disable. English:The temperature to print when the bed is coverd with blue tape. Set to 0 to use default. Translated:The temperature to print when the bed is coverd with blue tape. Set to 0 to use default. +English:The temperature to print when the bed is polypropylene. Set to 0 to disable or 'NC' if Not Compatible. +Translated:The temperature to print when the bed is polypropylene. Set to 0 to disable or 'NC' if Not Compatible. + English:The temperature to print when the bed is polypropylene. Set to 0 to disable. Translated:The temperature to print when the bed is polypropylene. Set to 0 to disable. English:The temperature to print when the bed is polypropylene. Set to 0 to use default. Translated:The temperature to print when the bed is polypropylene. Set to 0 to use default. +English:The temperature to print when the bed is using BuildTak. Set to 0 to disable or 'NC' if Not Compatible. +Translated:The temperature to print when the bed is using BuildTak. Set to 0 to disable or 'NC' if Not Compatible. + English:The temperature to print when the bed is using BuildTak. Set to 0 to disable. Translated:The temperature to print when the bed is using BuildTak. Set to 0 to disable. English:The temperature to print when the bed is using BuildTak. Set to 0 to use default. Translated:The temperature to print when the bed is using BuildTak. Set to 0 to use default. +English:The temperature to print when the bed is using garolite. Set to 0 to disable or 'NC' if Not Compatible. +Translated:The temperature to print when the bed is using garolite. Set to 0 to disable or 'NC' if Not Compatible. + English:The temperature to print when the bed is using garolite. Set to 0 to disable. Translated:The temperature to print when the bed is using garolite. Set to 0 to disable. English:The temperature to print when the bed is using garolite. Set to 0 to use default. Translated:The temperature to print when the bed is using garolite. Set to 0 to use default. +English:The temperature to print when the bed is using glass. Set to 0 to disable or 'NC' if Not Compatible. +Translated:The temperature to print when the bed is using glass. Set to 0 to disable or 'NC' if Not Compatible. + English:The temperature to print when the bed is using glass. Set to 0 to disable. Translated:The temperature to print when the bed is using glass. Set to 0 to disable. English:The temperature to print when the bed is using glass. Set to 0 to use default. Translated:The temperature to print when the bed is using glass. Set to 0 to use default. +English:The temperature to print when the bed is using PEI. Set to 0 to disable or 'NC' if Not Compatible. +Translated:The temperature to print when the bed is using PEI. Set to 0 to disable or 'NC' if Not Compatible. + English:The temperature to print when the bed is using PEI. Set to 0 to disable. Translated:The temperature to print when the bed is using PEI. Set to 0 to disable. diff --git a/Tests/MatterControl.Tests/MatterControl/OemProfileTests.cs b/Tests/MatterControl.Tests/MatterControl/OemProfileTests.cs index fa853cfb6..dc9bc893b 100644 --- a/Tests/MatterControl.Tests/MatterControl/OemProfileTests.cs +++ b/Tests/MatterControl.Tests/MatterControl/OemProfileTests.cs @@ -217,6 +217,7 @@ M300 S3000 P30 ; Resume Tone"; var isPresentKeys = new string[] { + "bed_temperature_blue_tape", "bed_temperature_buildtak", "bed_temperature_garolite", "bed_temperature_glass",