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

Adding warning for swappable bed being set

Browse source 
Adding Taulman materials
Changing binding order
This commit is contained in:
Lars Brubaker 2022-03-24 18:16:02 -07:00
parent 119fcbdcf5
commit 5513134a9b
16 changed files with 25015 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MatterControl.OpenGL/GCodeRenderer/GCodeVertexBuffer.cs
View file

@ -94,11 +94,11 @@ namespace MatterHackers.GCodeVisualizer
fixed (ColorVertexData* pFixedColorData = colorVertexData)
{
byte* pColorData = (byte*)(pFixedColorData + offset);
GL.ColorPointer(4, ColorPointerType.UnsignedByte, ColorVertexData.Stride, new IntPtr(pColorData));
byte* pNormalData = pColorData + 4;
GL.NormalPointer(NormalPointerType.Float, ColorVertexData.Stride, new IntPtr(pNormalData));
byte* pPosition = pNormalData + 12;
GL.VertexPointer(3, VertexPointerType.Float, ColorVertexData.Stride, new IntPtr(pPosition));
GL.NormalPointer(NormalPointerType.Float, ColorVertexData.Stride, new IntPtr(pNormalData));
GL.ColorPointer(4, ColorPointerType.UnsignedByte, ColorVertexData.Stride, new IntPtr(pColorData));
GL.DrawArrays(BeginMode.Triangles, ColorVertexData.Stride, Math.Min(colorVertexData.Length, count));
}
}

2
MatterControl.Printing/Settings/ValidationError.cs
View file

@ -67,6 +67,8 @@ namespace MatterHackers.MatterControl
public static readonly string ItemToSTLExportInvalid = nameof(ItemToSTLExportInvalid);
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);

31
MatterControlLib/ApplicationView/SettingsValidation.cs
View file

@ -589,6 +589,37 @@ 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<bool>(SettingsKey.has_swappable_bed)
&& settings.GetValue(SettingsKey.bed_surface) == "Default")
{
errors.Add(new ValidationError(ValidationErrors.BedSurfaceNotSelected)
{
Error = "Bed Surface Needs to be Selected".Localize(),
Details = "You need to select your printer's 'Bed Surface' under the 'Bed Temperature' menu on the top right of your screen.".Localize(),
ErrorLevel = ValidationErrorLevel.Error,
});
}
if (printer.Connection.IsConnected
&& !PrinterSetupRequired(printer)
&& validatePrintBed
&& errors.Count(e => e.ErrorLevel == ValidationErrorLevel.Error) == 0
&& printer.PrintableItems(printer.Bed.Scene).Any()
&& string.IsNullOrEmpty(settings.GetValue(SettingsKey.active_material_key)))
{
errors.Add(new ValidationError(ValidationErrors.MaterialNotSelected)
{
Error = "A Material Should be Selected".Localize(),
Details = "You should select the 'Material' your are printing with under the 'Hotend Temperature' menu on the top right of your screen.".Localize(),
ErrorLevel = ValidationErrorLevel.Warning,
});
}
return errors;
}

29
StaticData/Materials/Taulman/230 Nylon.material Normal file
View file

@ -0,0 +1,29 @@
{
"DocumentVersion": 201606271,
"ID": null,
"Macros": [],
"MaterialLayers": [
{
"bed_temperature": "70",
"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": "60",
"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",
"temperature": "235"
}
],
"OemLayer": null,
"QualityLayers": [],
"StagedUserSettings": {},
"UserLayer": {}
}

29
StaticData/Materials/Taulman/645 Nylon.material Normal file
View file

@ -0,0 +1,29 @@
{
"DocumentVersion": 201606271,
"ID": null,
"Macros": [],
"MaterialLayers": [
{
"bed_temperature": "70",
"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": "60",
"filament_density": "1.1",
"layer_id": "b499cd18-3539-4648-91eb-ad65dad74d13",
"layer_name": "645 Nylon (Taulman)",
"material_sku": "MSFDVGY6",
"retract_restart_extra": "0",
"retract_restart_extra_time_to_apply": "0",
"temperature": "250"
}
],
"OemLayer": null,
"QualityLayers": [],
"StagedUserSettings": {},
"UserLayer": {}
}

29
StaticData/Materials/Taulman/680 Nylon.material Normal file
View file

@ -0,0 +1,29 @@
{
"DocumentVersion": 201606271,
"ID": null,
"Macros": [],
"MaterialLayers": [
{
"bed_temperature": "70",
"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": "60",
"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",
"temperature": "250"
}
],
"OemLayer": null,
"QualityLayers": [],
"StagedUserSettings": {},
"UserLayer": {}
}

26
StaticData/Materials/Taulman/Alloy 910.material Normal file
View file

@ -0,0 +1,26 @@
{
"DocumentVersion": 201606271,
"ID": null,
"Macros": [],
"MaterialLayers": [
{
"bed_temperature": "100",
"external_perimeter_speed": "45",
"extruder_wipe_temperature": "180",
"infill_speed": "55",
"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"
}
],
"OemLayer": null,
"QualityLayers": [],
"StagedUserSettings": {},
"UserLayer": {}
}

26
StaticData/Materials/Taulman/Bridge Nylon.material Normal file
View file

@ -0,0 +1,26 @@
{
"DocumentVersion": 201606271,
"ID": null,
"Macros": [],
"MaterialLayers": [
{
"bed_temperature": "110",
"external_perimeter_speed": "35",
"extruder_wipe_temperature": "160",
"first_layer_speed": "12",
"infill_speed": "45",
"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"
}
],
"OemLayer": null,
"QualityLayers": [],
"StagedUserSettings": {},
"UserLayer": {}
}

25
StaticData/Materials/Taulman/PCTPE.material Normal file
View file

@ -0,0 +1,25 @@
{
"DocumentVersion": 201606271,
"ID": null,
"Macros": [],
"MaterialLayers": [
{
"bed_temperature": "80",
"external_perimeter_speed": "45",
"extruder_wipe_temperature": "160",
"infill_speed": "55",
"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"
}
],
"OemLayer": null,
"QualityLayers": [],
"StagedUserSettings": {},
"UserLayer": {}
}

26
StaticData/Materials/Taulman/PETG.material Normal file
View file

@ -0,0 +1,26 @@
{
"DocumentVersion": 201606271,
"ID": null,
"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": ""
}
],
"OemLayer": null,
"QualityLayers": [],
"StagedUserSettings": {},
"UserLayer": {}
}

26
StaticData/Materials/Taulman/n-vent.material Normal file
View file

@ -0,0 +1,26 @@
{
"DocumentVersion": 201606271,
"ID": null,
"Macros": [],
"MaterialLayers": [
{
"layer_name": "n-vent (Taulman)",
"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",
}
],
"OemLayer": null,
"QualityLayers": [],
"StagedUserSettings": {},
"UserLayer": {}
}

29
StaticData/Materials/Taulman/t-glase.material Normal file
View file

@ -0,0 +1,29 @@
{
"DocumentVersion": 201606271,
"ID": null,
"Macros": [],
"MaterialLayers": [
{
"layer_name": "t-glase (Taulman)",
"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": ""
}
],
"OemLayer": null,
"QualityLayers": [],
"StagedUserSettings": {},
"UserLayer": {}
}

18
StaticData/Materials/_MatterHackers/PRO Series/Nylon.material
View file

@ -4,14 +4,7 @@
"Macros": [],
"MaterialLayers": [
{
"layer_name": "PRO Series Nylon",
"layer_id": "b8d72ad6-9b04-4bbb-852f-4fec1bc4262b",
"temperature": "250",
"bed_temperature": "55",
"retract_restart_extra": "0",
"retract_restart_extra_time_to_apply": "0",
"filament_density": "1.1",
"filament_cost": "73.3",
"bed_temperature": "70",
"bed_temperature_buildtak": "55",
"bed_temperature_garolite": "70",
"bed_temperature_glass": "70",
@ -19,7 +12,14 @@
"bed_temperature_pei": "70",
"bed_temperature_pp": "50",
"enable_fan": "0",
"material_sku": "MCR8GQZT"
"filament_cost": "73.3",
"filament_density": "1.1",
"layer_id": "b8d72ad6-9b04-4bbb-852f-4fec1bc4262b",
"layer_name": "PRO Series Nylon",
"material_sku": "MCR8GQZT",
"retract_restart_extra": "0",
"retract_restart_extra_time_to_apply": "0",
"temperature": "250"
}
],
"OemLayer": null,

27
StaticData/Translations/Master.txt
View file

@ -121,6 +121,9 @@ Translated:A component must be selected
English:A device attached to the system is not functioning.
Translated:A device attached to the system is not functioning.
English:A Material Should be Selected
Translated:A Material Should be Selected
English:A modifier of the width of the extrusion for the first layer of the print. A value greater than 100% can help with adhesion to the print bed.
Translated:A modifier of the width of the extrusion for the first layer of the print. A value greater than 100% can help with adhesion to the print bed.
@ -532,6 +535,12 @@ Translated:Bed Size
English:Bed Surface
Translated:Bed Surface
English:Bed Surface Needs to be Selected
Translated:Bed Surface Needs to be Selected
English:Bed Surface Should be Selected
Translated:Bed Surface Should be Selected
English:Bed Surface Temperatures
Translated:Bed Surface Temperatures
@ -6127,9 +6136,24 @@ Translated:You have successfully imported a new printer profile. You can find '{
English:You may need to wait a minute for your printer to finish initializing.
Translated:You may need to wait a minute for your printer to finish initializing.
English:You need to select your printer's 'Bed Surface' under the bed setting menu on the top right of your screen
Translated:You need to select your printer's 'Bed Surface' under the bed setting menu on the top right of your screen
English:You need to select your printer's 'Bed Surface' under the 'Bed Temperature' menu on the top right of your screen
Translated:You need to select your printer's 'Bed Surface' under the 'Bed Temperature' menu on the top right of your screen
English:You need to select your printer's 'Bed Surface' under the 'Bed Temperature' menu on the top right of your screen.
Translated:You need to select your printer's 'Bed Surface' under the 'Bed Temperature' menu on the top right of your screen.
English:You should have at least 3 top layers for this calibration to measure off of.
Translated:You should have at least 3 top layers for this calibration to measure off of.
English:You should select the 'Material' your are printing with under the 'Hotend Temperature' menu on the top right of your screen
Translated:You should select the 'Material' your are printing with under the 'Hotend Temperature' menu on the top right of your screen
English:You should select the 'Material' your are printing with under the 'Hotend Temperature' menu on the top right of your screen.
Translated:You should select the 'Material' your are printing with under the 'Hotend Temperature' menu on the top right of your screen.
English:Your 3D print has been auto-paused.\n\nLayer {0} reached.
Translated:Your 3D print has been auto-paused.\n\nLayer {0} reached.
@ -6160,6 +6184,9 @@ Translated:Your printer has been adjusted but we should run calibrating again to
English:Your printer is reporting a HARDWARE ERROR and has been paused. Check the error and cancel the print if required.
Translated:Your printer is reporting a HARDWARE ERROR and has been paused. Check the error and cancel the print if required.
English:Your printer's 'Bed Surface' should be selected under the bed setting menu on the top right of your screen
Translated:Your printer's 'Bed Surface' should be selected under the bed setting menu on the top right of your screen
English:Your probe is now finely calibrated and should produce excellent first layer results
Translated:Your probe is now finely calibrated and should produce excellent first layer results

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit d3ceb0f48a56be29dcd7639d92371a8f1e27f422
Subproject commit dec590da7530f63c5bbaea1ff75eacc78b34a994

24698
Tests/TestData/ExportedGcode/2022-03-24T12-22-27/Batman.gcode Normal file
View file

File diff suppressed because it is too large Load diff