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
ConfigurationPage/CalibrationSettings/CalibrationSettingsView.cs
View file

@ -151,7 +151,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
private void SetVisibleControls()
{
if (!ActiveSliceSettings.Instance.PrinterSelected
|| PrinterConnection.Instance.CommunicationState == PrinterConnection.CommunicationStates.Printing
|| PrinterConnection.Instance.CommunicationState == CommunicationStates.Printing
|| PrinterConnection.Instance.PrinterIsPaused)
{
printLevelingContainer.SetEnableLevel(DisableableWidget.EnableLevel.Disabled);

30
ConfigurationPage/PrinterSettings/PrinterSettingsView.cs
View file

@ -120,28 +120,28 @@ namespace MatterHackers.MatterControl.ConfigurationPage
//cloudMonitorContainer.SetEnableLevel(DisableableWidget.EnableLevel.Enabled);
switch (PrinterConnection.Instance.CommunicationState)
{
case PrinterConnection.CommunicationStates.Disconnecting:
case PrinterConnection.CommunicationStates.ConnectionLost:
case PrinterConnection.CommunicationStates.Disconnected:
case PrinterConnection.CommunicationStates.AttemptingToConnect:
case PrinterConnection.CommunicationStates.FailedToConnect:
case CommunicationStates.Disconnecting:
case CommunicationStates.ConnectionLost:
case CommunicationStates.Disconnected:
case CommunicationStates.AttemptingToConnect:
case CommunicationStates.FailedToConnect:
break;
case PrinterConnection.CommunicationStates.FinishedPrint:
case PrinterConnection.CommunicationStates.Connected:
case CommunicationStates.FinishedPrint:
case CommunicationStates.Connected:
break;
case PrinterConnection.CommunicationStates.PrintingFromSd:
case CommunicationStates.PrintingFromSd:
break;
case PrinterConnection.CommunicationStates.PreparingToPrint:
case PrinterConnection.CommunicationStates.Printing:
case CommunicationStates.PreparingToPrint:
case CommunicationStates.Printing:
switch (PrinterConnection.Instance.PrintingState)
{
case PrinterConnection.DetailedPrintingState.HomingAxis:
case PrinterConnection.DetailedPrintingState.HeatingBed:
case PrinterConnection.DetailedPrintingState.HeatingExtruder:
case PrinterConnection.DetailedPrintingState.Printing:
case DetailedPrintingState.HomingAxis:
case DetailedPrintingState.HeatingBed:
case DetailedPrintingState.HeatingExtruder:
case DetailedPrintingState.Printing:
break;
default:
@ -149,7 +149,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
}
break;
case PrinterConnection.CommunicationStates.Paused:
case CommunicationStates.Paused:
break;
default: