Rename PrinterConnectionAndCommunication

This commit is contained in:
John Lewin 2017-06-13 17:22:49 -07:00
parent 6c0e78eef6
commit 9aaf0f6311
71 changed files with 504 additions and 504 deletions

View file

@ -100,8 +100,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage
private void AddHandlers()
{
PrinterConnectionAndCommunication.Instance.CommunicationStateChanged.RegisterEvent((e, s) => SetEnabledStates(), ref unregisterEvents);
PrinterConnectionAndCommunication.Instance.EnableChanged.RegisterEvent((e,s) => SetEnabledStates(), ref unregisterEvents);
PrinterConnection.Instance.CommunicationStateChanged.RegisterEvent((e, s) => SetEnabledStates(), ref unregisterEvents);
PrinterConnection.Instance.EnableChanged.RegisterEvent((e,s) => SetEnabledStates(), ref unregisterEvents);
}
private void openCameraPreview_Click(object sender, EventArgs e)
@ -118,30 +118,30 @@ namespace MatterHackers.MatterControl.ConfigurationPage
else // we at least have a printer selected
{
//cloudMonitorContainer.SetEnableLevel(DisableableWidget.EnableLevel.Enabled);
switch (PrinterConnectionAndCommunication.Instance.CommunicationState)
switch (PrinterConnection.Instance.CommunicationState)
{
case PrinterConnectionAndCommunication.CommunicationStates.Disconnecting:
case PrinterConnectionAndCommunication.CommunicationStates.ConnectionLost:
case PrinterConnectionAndCommunication.CommunicationStates.Disconnected:
case PrinterConnectionAndCommunication.CommunicationStates.AttemptingToConnect:
case PrinterConnectionAndCommunication.CommunicationStates.FailedToConnect:
case PrinterConnection.CommunicationStates.Disconnecting:
case PrinterConnection.CommunicationStates.ConnectionLost:
case PrinterConnection.CommunicationStates.Disconnected:
case PrinterConnection.CommunicationStates.AttemptingToConnect:
case PrinterConnection.CommunicationStates.FailedToConnect:
break;
case PrinterConnectionAndCommunication.CommunicationStates.FinishedPrint:
case PrinterConnectionAndCommunication.CommunicationStates.Connected:
case PrinterConnection.CommunicationStates.FinishedPrint:
case PrinterConnection.CommunicationStates.Connected:
break;
case PrinterConnectionAndCommunication.CommunicationStates.PrintingFromSd:
case PrinterConnection.CommunicationStates.PrintingFromSd:
break;
case PrinterConnectionAndCommunication.CommunicationStates.PreparingToPrint:
case PrinterConnectionAndCommunication.CommunicationStates.Printing:
switch (PrinterConnectionAndCommunication.Instance.PrintingState)
case PrinterConnection.CommunicationStates.PreparingToPrint:
case PrinterConnection.CommunicationStates.Printing:
switch (PrinterConnection.Instance.PrintingState)
{
case PrinterConnectionAndCommunication.DetailedPrintingState.HomingAxis:
case PrinterConnectionAndCommunication.DetailedPrintingState.HeatingBed:
case PrinterConnectionAndCommunication.DetailedPrintingState.HeatingExtruder:
case PrinterConnectionAndCommunication.DetailedPrintingState.Printing:
case PrinterConnection.DetailedPrintingState.HomingAxis:
case PrinterConnection.DetailedPrintingState.HeatingBed:
case PrinterConnection.DetailedPrintingState.HeatingExtruder:
case PrinterConnection.DetailedPrintingState.Printing:
break;
default:
@ -149,7 +149,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
}
break;
case PrinterConnectionAndCommunication.CommunicationStates.Paused:
case PrinterConnection.CommunicationStates.Paused:
break;
default: