From 2cf0fa8ad9f2394b9ae024de397bdb2bb95ed924 Mon Sep 17 00:00:00 2001 From: Kevin Pope Date: Mon, 3 Mar 2014 11:42:22 -0800 Subject: [PATCH 1/3] Updated R3D support material threshold from 30 degrees to 40 degrees. --- StaticData/PrinterSettings/RoBo 3D/RoBo 3D ABS/config.ini | 2 +- .../PrinterSettings/RoBo 3D/Robo 3D PLA - Heated Bed/config.ini | 2 +- .../RoBo 3D/Robo 3D PLA - Unheated Bed/config.ini | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/StaticData/PrinterSettings/RoBo 3D/RoBo 3D ABS/config.ini b/StaticData/PrinterSettings/RoBo 3D/RoBo 3D ABS/config.ini index d01bda6a7..9674f4be6 100644 --- a/StaticData/PrinterSettings/RoBo 3D/RoBo 3D ABS/config.ini +++ b/StaticData/PrinterSettings/RoBo 3D/RoBo 3D ABS/config.ini @@ -100,7 +100,7 @@ support_material_interface_spacing = 0 support_material_pattern = rectilinear support_material_spacing = 3 support_material_speed = 60 -support_material_threshold = 30 +support_material_threshold = 40 temperature = 215 threads = 2 toolchange_gcode = diff --git a/StaticData/PrinterSettings/RoBo 3D/Robo 3D PLA - Heated Bed/config.ini b/StaticData/PrinterSettings/RoBo 3D/Robo 3D PLA - Heated Bed/config.ini index 796631730..9941c7a26 100644 --- a/StaticData/PrinterSettings/RoBo 3D/Robo 3D PLA - Heated Bed/config.ini +++ b/StaticData/PrinterSettings/RoBo 3D/Robo 3D PLA - Heated Bed/config.ini @@ -100,7 +100,7 @@ support_material_interface_spacing = 0 support_material_pattern = rectilinear support_material_spacing = 3 support_material_speed = 60 -support_material_threshold = 30 +support_material_threshold = 40 temperature = 185 threads = 2 toolchange_gcode = diff --git a/StaticData/PrinterSettings/RoBo 3D/Robo 3D PLA - Unheated Bed/config.ini b/StaticData/PrinterSettings/RoBo 3D/Robo 3D PLA - Unheated Bed/config.ini index bf494cae2..5da89e45d 100644 --- a/StaticData/PrinterSettings/RoBo 3D/Robo 3D PLA - Unheated Bed/config.ini +++ b/StaticData/PrinterSettings/RoBo 3D/Robo 3D PLA - Unheated Bed/config.ini @@ -100,7 +100,7 @@ support_material_interface_spacing = 0 support_material_pattern = rectilinear support_material_spacing = 3 support_material_speed = 60 -support_material_threshold = 30 +support_material_threshold = 40 temperature = 185 threads = 2 toolchange_gcode = From 370ee8c86d2daacd2aea7b42f9f17830c6b59e5c Mon Sep 17 00:00:00 2001 From: larsbrubaker Date: Mon, 3 Mar 2014 15:50:23 -0800 Subject: [PATCH 2/3] Making sure we are releasing some EventHandlers so we don't hold onto memory. --- PartPreviewWindow/GcodeViewBasic.cs | 8 +++++++- PrintQueue/ExportToFolderProcess.cs | 1 + PrintQueue/PrintQueueItem.cs | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/PartPreviewWindow/GcodeViewBasic.cs b/PartPreviewWindow/GcodeViewBasic.cs index 52ce0dc97..2d597d6a7 100644 --- a/PartPreviewWindow/GcodeViewBasic.cs +++ b/PartPreviewWindow/GcodeViewBasic.cs @@ -145,7 +145,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow // we only hook these up to make sure we can regenerate the gcode when we want printItem.SlicingOutputMessage += sliceItem_SlicingOutputMessage; - printItem.Done += new EventHandler(sliceItem_Done); + printItem.Done += sliceItem_Done; } centerPartPreviewAndControls.AddChild(gcodeDispalyWidget); @@ -622,6 +622,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow void sliceItem_Done(object sender, EventArgs e) { + // We can add this while we have it open (when we are done loading). + // So we need to make sure we only have it added once. This will be ok to run when + // not added or when added and will ensure we only have one hook. + printItem.SlicingOutputMessage -= sliceItem_SlicingOutputMessage; + printItem.Done -= sliceItem_Done; + UiThread.RunOnIdle(CreateAndAddChildren); startedSliceFromGenerateButton = false; } diff --git a/PrintQueue/ExportToFolderProcess.cs b/PrintQueue/ExportToFolderProcess.cs index 835077283..5ff047e95 100644 --- a/PrintQueue/ExportToFolderProcess.cs +++ b/PrintQueue/ExportToFolderProcess.cs @@ -101,6 +101,7 @@ namespace MatterHackers.MatterControl.PrintQueue PrintItemWrapper sliceItem = (PrintItemWrapper)sender; sliceItem.Done -= new EventHandler(sliceItem_Done); + sliceItem.SlicingOutputMessage -= printItemWrapper_SlicingOutputMessage; savedGCodeFileNames.Add(sliceItem.GCodePathAndFileName); itemCountBeingWorkedOn++; diff --git a/PrintQueue/PrintQueueItem.cs b/PrintQueue/PrintQueueItem.cs index 10931edb4..c00ace4b4 100644 --- a/PrintQueue/PrintQueueItem.cs +++ b/PrintQueue/PrintQueueItem.cs @@ -279,6 +279,7 @@ namespace MatterHackers.MatterControl.PrintQueue public override void OnClosed(EventArgs e) { + PrintItemWrapper.SlicingOutputMessage -= PrintItem_SlicingOutputMessage; if (unregisterEvents != null) { unregisterEvents(this, null); From 48e68b9f8e7239d1471afe2f3306150de4ccaa4e Mon Sep 17 00:00:00 2001 From: Kevin Pope Date: Mon, 3 Mar 2014 16:31:51 -0800 Subject: [PATCH 3/3] Fixed issue where bed temperature and extruder temperature were not being set to zero. --- PrinterCommunication.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PrinterCommunication.cs b/PrinterCommunication.cs index a17dc3a79..771105bb1 100644 --- a/PrinterCommunication.cs +++ b/PrinterCommunication.cs @@ -1614,14 +1614,14 @@ namespace MatterHackers.MatterControl { if (printerCommandQueueIndex == loadedGCode.GCodeCommandQueue.Count) { - printJobDisplayName = null; + CommunicationState = CommunicationStates.FinishedPrint; + printJobDisplayName = null; + // never leave the extruder and the bed hot ReleaseMotors(); TargetExtruderTemperature = 0; - TargetBedTemperature = 0; - - CommunicationState = CommunicationStates.FinishedPrint; + TargetBedTemperature = 0; } else if (!PrinterIsPaused) {