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

refactoring

Browse source
This commit is contained in:
Lars Brubaker 2021-08-25 17:57:22 -07:00
parent f86a5d5608
commit 82adc982d8
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
MatterControlLib/PrinterCommunication/PrinterConnection.cs
View file

@ -2140,7 +2140,7 @@ Make sure that your printer is turned on. Some printers will appear to be connec
haveReportedError = false; haveReportedError = false;
PrintWasCanceled = false; PrintWasCanceled = false;
printMarkedCanceled = false; cancelPrintNextWriteLine = false;
waitingForPosition.Reset(); waitingForPosition.Reset();
PositionReadType = PositionReadType.None; 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. // let the process know we canceled not ended normally.
this.printMarkedCanceled = true; this.cancelPrintNextWriteLine = true;
CanceleRequested?.Invoke(this, null); CanceleRequested?.Invoke(this, null);
if (markPrintCanceled if (markPrintCanceled
&& ActivePrintTask != null) && 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; CommunicationState = CommunicationStates.Connected;
// never leave the extruder and the bed hot // 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(); TurnOffPartCoolingFan();
TurnOffBedAndExtruders(TurnOff.AfterDelay); TurnOffBedAndExtruders(TurnOff.AfterDelay);
this.PrintWasCanceled = true; this.PrintWasCanceled = true;
this.printMarkedCanceled = false; this.cancelPrintNextWriteLine = false;
// and finally notify anyone that wants to know // and finally notify anyone that wants to know
CancelCompleted?.Invoke(this, null); 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 Vector3 _homingPosition = Vector3.NegativeInfinity;
private int noOkResendCount; private int noOkResendCount;
private ProcessWriteRegexStream processWriteRegexStream; private ProcessWriteRegexStream processWriteRegexStream;
private bool printMarkedCanceled; private bool cancelPrintNextWriteLine;
public class ReadThread public class ReadThread
{ {

BIN
StaticData/Stls/auto_pilot_multi.stl Normal file
View file

Binary file not shown.

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit 261f8caa884411ea418762e032efe4aa7d06b64f Subproject commit 9352d21185adb4d111970d985c48d1c93f716d82