diff --git a/CustomWidgets/PartThumbnailWidget.cs b/CustomWidgets/PartThumbnailWidget.cs index d25752016..964aa41ef 100644 --- a/CustomWidgets/PartThumbnailWidget.cs +++ b/CustomWidgets/PartThumbnailWidget.cs @@ -194,8 +194,8 @@ namespace MatterHackers.MatterControl } thumbnailWidget.thumbnailImage.SetRecieveBlender(new BlenderPreMultBGRA()); Graphics2D graphics = thumbnailWidget.thumbnailImage.NewGraphics2D(); - Ellipse outline = new Ellipse(new Vector2(Width / 2.0, Height / 2.0), Width/2 + Width/12); - graphics.Render(new Stroke(outline, 4), RGBA_Bytes.White); + Ellipse outline = new Ellipse(new Vector2(Width / 2.0, Height / 2.0), Width/2 - Width/12); + graphics.Render(new Stroke(outline, Width / 12), RGBA_Bytes.White); UiThread.RunOnIdle(thumbnailWidget.EnsureImageUpdated); return; diff --git a/PrinterCommunication/PrinterConnectionAndCommunication.cs b/PrinterCommunication/PrinterConnectionAndCommunication.cs index 3e7a253cd..211fc2681 100644 --- a/PrinterCommunication/PrinterConnectionAndCommunication.cs +++ b/PrinterCommunication/PrinterConnectionAndCommunication.cs @@ -2271,8 +2271,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication SendLineToPrinterNow("M25"); // : Pause SD print SendLineToPrinterNow("M26"); // : Set SD position // never leave the extruder and the bed hot - ReleaseMotors(); - TurnOffBedAndExtruders(); + DonePrintingSdFile(this, null); } break; @@ -2354,6 +2353,8 @@ namespace MatterHackers.MatterControl.PrinterCommunication return false; } + currentSdBytes = 0; + ClearQueuedGCode(); CommunicationState = CommunicationStates.PrintingFromSd; @@ -2458,7 +2459,9 @@ namespace MatterHackers.MatterControl.PrinterCommunication while (CommunicationState == CommunicationStates.AttemptingToConnect || (PrinterIsConnected && serialPort.IsOpen && !Disconnecting)) { - if(PrinterIsPrinting && PrinterIsConnected) + if(PrinterIsPrinting + && PrinterIsConnected + && CommunicationState != CommunicationStates.PrintingFromSd) { TryWriteNextLineFromGCodeFile(); }