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

Move CommunicationState enums into PrinterCommunication namespace

Browse source
This commit is contained in:
John Lewin 2017-06-13 17:32:38 -07:00
parent 9aaf0f6311
commit 1ac3274e7d
27 changed files with 148 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PrinterCommunication/Io/PauseHandlingStream.cs
View file

@ -196,7 +196,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
if (PrinterConnection.Instance.PrinterIsPrinting)
{
// remember where we were after we ran the pause gcode
PrinterConnection.Instance.CommunicationState = PrinterConnection.CommunicationStates.Paused;
PrinterConnection.Instance.CommunicationState = CommunicationStates.Paused;
}
lineToSend = "";

60
PrinterCommunication/PrinterConnectionAndCommunication.cs → PrinterCommunication/PrinterConnection.cs
View file

@ -27,6 +27,15 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.IO.Compression;
using System.Linq;
using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;
using Gaming.Game;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
@ -42,18 +51,28 @@ using MatterHackers.SerialPortCommunication;
using MatterHackers.SerialPortCommunication.FrostedSerial;
using MatterHackers.VectorMath;
using Microsoft.Win32.SafeHandles;
using System;
using System.Diagnostics;
using System.Globalization;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using System.Threading;
using System.Threading.Tasks;
using System.IO.Compression;
namespace MatterHackers.MatterControl.PrinterCommunication
{
public enum CommunicationStates
{
Disconnected,
AttemptingToConnect,
FailedToConnect,
Connected,
PreparingToPrint,
Printing,
PrintingFromSd,
Paused,
FinishedPrint,
Disconnecting,
ConnectionLost
};
public enum DetailedPrintingState { HomingAxis, HeatingBed, HeatingExtruder, Printing };
public enum FirmwareTypes { Unknown, Repetier, Marlin, Sprinter };
public static class PrintItemWrapperExtensionMethods
{
private static TextInfo textInfo = new CultureInfo("en-US", false).TextInfo;
@ -364,25 +383,6 @@ namespace MatterHackers.MatterControl.PrinterCommunication
[Flags]
public enum Axis { X = 1, Y = 2, Z = 4, E = 8, XYZ = (X | Y | Z) }
public enum CommunicationStates
{
Disconnected,
AttemptingToConnect,
FailedToConnect,
Connected,
PreparingToPrint,
Printing,
PrintingFromSd,
Paused,
FinishedPrint,
Disconnecting,
ConnectionLost
};
public enum DetailedPrintingState { HomingAxis, HeatingBed, HeatingExtruder, Printing };
public enum FirmwareTypes { Unknown, Repetier, Marlin, Sprinter };
public static PrinterConnection Instance
{
get
@ -1393,7 +1393,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication
}
else
{
CommunicationState = PrinterConnection.CommunicationStates.PreparingToPrint;
CommunicationState = CommunicationStates.PreparingToPrint;
PrintItemWrapper partToPrint = ActivePrintItem;
SlicingQueue.Instance.QueuePartForSlicing(partToPrint);
partToPrint.SlicingDone += partToPrint_SliceDone;
@ -2539,7 +2539,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication
{
if (messageBoxResponse)
{
CommunicationState = PrinterConnection.CommunicationStates.PreparingToPrint;
CommunicationState = CommunicationStates.PreparingToPrint;
PrintItemWrapper partToPrint = ActivePrintItem;
SlicingQueue.Instance.QueuePartForSlicing(partToPrint);
partToPrint.SlicingDone += partToPrint_SliceDone;