diff --git a/MatterControlLib/PrinterCommunication/PrinterConnection.cs b/MatterControlLib/PrinterCommunication/PrinterConnection.cs index 1b81b2e03..b22bff4a8 100644 --- a/MatterControlLib/PrinterCommunication/PrinterConnection.cs +++ b/MatterControlLib/PrinterCommunication/PrinterConnection.cs @@ -2140,7 +2140,7 @@ Make sure that your printer is turned on. Some printers will appear to be connec haveReportedError = false; PrintWasCanceled = false; - printMarkedCanceled = false; + cancelPrintNextWriteLine = false; waitingForPosition.Reset(); PositionReadType = PositionReadType.None; @@ -2310,7 +2310,7 @@ Make sure that your printer is turned on. Some printers will appear to be connec } // let the process know we canceled not ended normally. - this.printMarkedCanceled = true; + this.cancelPrintNextWriteLine = true; CanceleRequested?.Invoke(this, null); if (markPrintCanceled && ActivePrintTask != null) @@ -2739,7 +2739,7 @@ Make sure that your printer is turned on. Some printers will appear to be connec } } } - else if (this.printMarkedCanceled) + else if (this.cancelPrintNextWriteLine) { CommunicationState = CommunicationStates.Connected; // never leave the extruder and the bed hot @@ -2747,7 +2747,7 @@ Make sure that your printer is turned on. Some printers will appear to be connec TurnOffPartCoolingFan(); TurnOffBedAndExtruders(TurnOff.AfterDelay); this.PrintWasCanceled = true; - this.printMarkedCanceled = false; + this.cancelPrintNextWriteLine = false; // and finally notify anyone that wants to know CancelCompleted?.Invoke(this, null); } @@ -3134,7 +3134,7 @@ Make sure that your printer is turned on. Some printers will appear to be connec private Vector3 _homingPosition = Vector3.NegativeInfinity; private int noOkResendCount; private ProcessWriteRegexStream processWriteRegexStream; - private bool printMarkedCanceled; + private bool cancelPrintNextWriteLine; public class ReadThread { diff --git a/StaticData/Stls/auto_pilot_multi.stl b/StaticData/Stls/auto_pilot_multi.stl new file mode 100644 index 000000000..00ca3ed8b Binary files /dev/null and b/StaticData/Stls/auto_pilot_multi.stl differ diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index 261f8caa8..9352d2118 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit 261f8caa884411ea418762e032efe4aa7d06b64f +Subproject commit 9352d21185adb4d111970d985c48d1c93f716d82