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

@ -274,7 +274,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
displayControlRestartButton.Margin = new BorderDouble(right: 6);
displayControlRestartButton.Click += (sender, e) =>
{
if (PrinterConnectionAndCommunication.Instance.PrinterIsPrinting)
if (PrinterConnection.Instance.PrinterIsPrinting)
{
StyledMessageBox.ShowMessageBox(null, cannotRestartWhilePrintIsActiveMessage, cannotRestartWhileActive);
}
@ -435,7 +435,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
languageRestartButton.Click += (sender, e) =>
{
if (PrinterConnectionAndCommunication.Instance.PrinterIsPrinting)
if (PrinterConnection.Instance.PrinterIsPrinting)
{
StyledMessageBox.ShowMessageBox(null, cannotRestartWhilePrintIsActiveMessage, cannotRestartWhileActive);
}

View file

@ -38,8 +38,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage
AddChild(mainContainer);
PrinterConnectionAndCommunication.Instance.CommunicationStateChanged.RegisterEvent(PrinterStatusChanged, ref unregisterEvents);
PrinterConnectionAndCommunication.Instance.EnableChanged.RegisterEvent(PrinterStatusChanged, ref unregisterEvents);
PrinterConnection.Instance.CommunicationStateChanged.RegisterEvent(PrinterStatusChanged, ref unregisterEvents);
PrinterConnection.Instance.EnableChanged.RegisterEvent(PrinterStatusChanged, ref unregisterEvents);
SetVisibleControls();
}
@ -151,8 +151,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage
private void SetVisibleControls()
{
if (!ActiveSliceSettings.Instance.PrinterSelected
|| PrinterConnectionAndCommunication.Instance.CommunicationState == PrinterConnectionAndCommunication.CommunicationStates.Printing
|| PrinterConnectionAndCommunication.Instance.PrinterIsPaused)
|| PrinterConnection.Instance.CommunicationState == PrinterConnection.CommunicationStates.Printing
|| PrinterConnection.Instance.PrinterIsPaused)
{
printLevelingContainer.SetEnableLevel(DisableableWidget.EnableLevel.Disabled);
runPrintLevelingButton.Enabled = true; // setting this true when the element is disabled makes the colors stay correct
@ -160,7 +160,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage
else
{
printLevelingContainer.SetEnableLevel(DisableableWidget.EnableLevel.Enabled);
runPrintLevelingButton.Enabled = PrinterConnectionAndCommunication.Instance.PrinterIsConnected;
runPrintLevelingButton.Enabled = PrinterConnection.Instance.PrinterIsConnected;
}
}
}

View file

@ -187,8 +187,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage
private void AddHandlers()
{
PrinterConnectionAndCommunication.Instance.CommunicationStateChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents);
PrinterConnectionAndCommunication.Instance.EnableChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents);
PrinterConnection.Instance.CommunicationStateChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents);
PrinterConnection.Instance.EnableChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents);
}
private void onPrinterStatusChanged(object sender, EventArgs e)

View file

@ -182,7 +182,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
this.BedCenter = bedCenter;
this.NumberOfRadialSamples = numberOfRadialSamples;
PrinterConnectionAndCommunication.Instance.PositionRead.RegisterEvent(PrinterReportedPosition, ref unregisterEvents);
PrinterConnection.Instance.PositionRead.RegisterEvent(PrinterReportedPosition, ref unregisterEvents);
}
public Vector2 BedCenter
@ -291,7 +291,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
private void PrinterReportedPosition(object sender, EventArgs e)
{
lastDestinationWithLevelingApplied = GetPositionWithZOffset(PrinterConnectionAndCommunication.Instance.LastReportedPosition);
lastDestinationWithLevelingApplied = GetPositionWithZOffset(PrinterConnection.Instance.LastReportedPosition);
}
}
}

View file

@ -181,7 +181,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
// make sure the servo is retracted
var servoRetract = ActiveSliceSettings.Instance.GetValue<double>(SettingsKey.z_servo_retracted_angle);
PrinterConnectionAndCommunication.Instance.SendLineToPrinterNow($"M280 S{servoRetract}");
PrinterConnection.Instance.SendLineToPrinterNow($"M280 S{servoRetract}");
}
};
}

View file

@ -237,7 +237,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
this.SampledPositions = new List<Vector3>(levelingData.SampledPositions);
PrinterConnectionAndCommunication.Instance.PositionRead.RegisterEvent(PrinterReportedPosition, ref unregisterEvents);
PrinterConnection.Instance.PositionRead.RegisterEvent(PrinterReportedPosition, ref unregisterEvents);
for (int y = 0; y < gridHeight - 1; y++)
{
@ -385,7 +385,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
private void PrinterReportedPosition(object sender, EventArgs e)
{
lastDestinationWithLevelingApplied = GetPositionWithZOffset(PrinterConnectionAndCommunication.Instance.LastReportedPosition);
lastDestinationWithLevelingApplied = GetPositionWithZOffset(PrinterConnection.Instance.LastReportedPosition);
}
public class Region

View file

@ -77,7 +77,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
if (ActiveSliceSettings.Instance.GetValue<bool>(SettingsKey.z_homes_to_max))
{
PrinterConnectionAndCommunication.Instance.HomeAxis(PrinterConnectionAndCommunication.Axis.XYZ);
PrinterConnection.Instance.HomeAxis(PrinterConnection.Axis.XYZ);
}
container.backButton.Enabled = false;
@ -112,14 +112,14 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
public override void PageIsBecomingActive()
{
// first make sure there is no leftover FinishedProbe event
PrinterConnectionAndCommunication.Instance.ReadLine.UnregisterEvent(FinishedProbe, ref unregisterEvents);
PrinterConnection.Instance.ReadLine.UnregisterEvent(FinishedProbe, ref unregisterEvents);
var feedRates = ActiveSliceSettings.Instance.Helpers.ManualMovementSpeeds();
PrinterConnectionAndCommunication.Instance.MoveAbsolute(PrinterConnectionAndCommunication.Axis.Z, probeStartPosition.z, feedRates.z);
PrinterConnectionAndCommunication.Instance.MoveAbsolute(probeStartPosition, feedRates.x);
PrinterConnectionAndCommunication.Instance.SendLineToPrinterNow("G30");
PrinterConnectionAndCommunication.Instance.ReadLine.RegisterEvent(FinishedProbe, ref unregisterEvents);
PrinterConnection.Instance.MoveAbsolute(PrinterConnection.Axis.Z, probeStartPosition.z, feedRates.z);
PrinterConnection.Instance.MoveAbsolute(probeStartPosition, feedRates.x);
PrinterConnection.Instance.SendLineToPrinterNow("G30");
PrinterConnection.Instance.ReadLine.RegisterEvent(FinishedProbe, ref unregisterEvents);
base.PageIsBecomingActive();
@ -134,12 +134,12 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
if (currentEvent.Data.Contains("endstops hit"))
{
PrinterConnectionAndCommunication.Instance.ReadLine.UnregisterEvent(FinishedProbe, ref unregisterEvents);
PrinterConnection.Instance.ReadLine.UnregisterEvent(FinishedProbe, ref unregisterEvents);
int zStringPos = currentEvent.Data.LastIndexOf("Z:");
string zProbeHeight = currentEvent.Data.Substring(zStringPos + 2);
probePosition.position = new Vector3(probeStartPosition.x, probeStartPosition.y, double.Parse(zProbeHeight));
PrinterConnectionAndCommunication.Instance.MoveAbsolute(probeStartPosition, ActiveSliceSettings.Instance.Helpers.ManualMovementSpeeds().z);
PrinterConnectionAndCommunication.Instance.ReadPosition();
PrinterConnection.Instance.MoveAbsolute(probeStartPosition, ActiveSliceSettings.Instance.Helpers.ManualMovementSpeeds().z);
PrinterConnection.Instance.ReadPosition();
container.nextButton.ClickButton(new MouseEventArgs(MouseButtons.Left, 1, 0, 0, 0));
}
@ -156,7 +156,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
public override void PageIsBecomingActive()
{
PrinterConnectionAndCommunication.Instance.HomeAxis(PrinterConnectionAndCommunication.Axis.XYZ);
PrinterConnection.Instance.HomeAxis(PrinterConnection.Axis.XYZ);
base.PageIsBecomingActive();
}
}
@ -180,7 +180,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
this.allowLessThan0 = allowLessThan0;
this.probePositions = probePositions;
this.moveAmount = moveDistance;
this.lastReportedPosition = PrinterConnectionAndCommunication.Instance.LastReportedPosition;
this.lastReportedPosition = PrinterConnection.Instance.LastReportedPosition;
this.probePositionsBeingEditedIndex = probePositionsBeingEditedIndex;
GuiWidget spacer = new GuiWidget(15, 15);
@ -225,7 +225,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
public override void PageIsBecomingInactive()
{
this.Parents<SystemWindow>().First().KeyDown -= TopWindowKeyDown;
probePositions[probePositionsBeingEditedIndex].position = PrinterConnectionAndCommunication.Instance.LastReportedPosition;
probePositions[probePositionsBeingEditedIndex].position = PrinterConnection.Instance.LastReportedPosition;
base.PageIsBecomingInactive();
}
@ -278,7 +278,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
private void zMinusControl_Click(object sender, EventArgs mouseEvent)
{
if (!allowLessThan0
&& PrinterConnectionAndCommunication.Instance.LastReportedPosition.z - moveAmount < 0)
&& PrinterConnection.Instance.LastReportedPosition.z - moveAmount < 0)
{
UiThread.RunOnIdle(() =>
{
@ -288,14 +288,14 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
return;
}
PrinterConnectionAndCommunication.Instance.MoveRelative(PrinterConnectionAndCommunication.Axis.Z, -moveAmount, ActiveSliceSettings.Instance.Helpers.ManualMovementSpeeds().z);
PrinterConnectionAndCommunication.Instance.ReadPosition();
PrinterConnection.Instance.MoveRelative(PrinterConnection.Axis.Z, -moveAmount, ActiveSliceSettings.Instance.Helpers.ManualMovementSpeeds().z);
PrinterConnection.Instance.ReadPosition();
}
private void zPlusControl_Click(object sender, EventArgs mouseEvent)
{
PrinterConnectionAndCommunication.Instance.MoveRelative(PrinterConnectionAndCommunication.Axis.Z, moveAmount, ActiveSliceSettings.Instance.Helpers.ManualMovementSpeeds().z);
PrinterConnectionAndCommunication.Instance.ReadPosition();
PrinterConnection.Instance.MoveRelative(PrinterConnection.Axis.Z, moveAmount, ActiveSliceSettings.Instance.Helpers.ManualMovementSpeeds().z);
PrinterConnection.Instance.ReadPosition();
}
}
@ -319,7 +319,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
this.allowLessThan0 = allowLessThan0;
this.probePositions = probePositions;
this.lastReportedPosition = PrinterConnectionAndCommunication.Instance.LastReportedPosition;
this.lastReportedPosition = PrinterConnection.Instance.LastReportedPosition;
this.probePositionsBeingEditedIndex = probePositionsBeingEditedIndex;
GuiWidget spacer = new GuiWidget(15, 15);
@ -396,7 +396,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
// make sure the servo is deployed
var servoDeploy = ActiveSliceSettings.Instance.GetValue<double>(SettingsKey.z_servo_depolyed_angle);
PrinterConnectionAndCommunication.Instance.SendLineToPrinterNow($"M280 S{servoDeploy}");
PrinterConnection.Instance.SendLineToPrinterNow($"M280 S{servoDeploy}");
}
var feedRates = ActiveSliceSettings.Instance.Helpers.ManualMovementSpeeds();
@ -406,29 +406,29 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
var probeOffset = ActiveSliceSettings.Instance.GetValue<Vector2>(SettingsKey.z_probe_xy_offset);
adjustedProbePosition -= new Vector3(probeOffset);
PrinterConnectionAndCommunication.Instance.MoveAbsolute(PrinterConnectionAndCommunication.Axis.Z, probeStartPosition.z, feedRates.z);
PrinterConnectionAndCommunication.Instance.MoveAbsolute(adjustedProbePosition, feedRates.x);
PrinterConnection.Instance.MoveAbsolute(PrinterConnection.Axis.Z, probeStartPosition.z, feedRates.z);
PrinterConnection.Instance.MoveAbsolute(adjustedProbePosition, feedRates.x);
int numberOfSamples = ActiveSliceSettings.Instance.GetValue<int>(SettingsKey.z_probe_samples);
for (int i = 0; i < numberOfSamples; i++)
{
PrinterConnectionAndCommunication.Instance.SendLineToPrinterNow("G30"); // probe the current position
PrinterConnection.Instance.SendLineToPrinterNow("G30"); // probe the current position
}
container.backButton.Enabled = false;
container.nextButton.Enabled = false;
if (PrinterConnectionAndCommunication.Instance.PrinterIsConnected
&& !(PrinterConnectionAndCommunication.Instance.PrinterIsPrinting
|| PrinterConnectionAndCommunication.Instance.PrinterIsPaused))
if (PrinterConnection.Instance.PrinterIsConnected
&& !(PrinterConnection.Instance.PrinterIsPrinting
|| PrinterConnection.Instance.PrinterIsPaused))
{
PrinterConnectionAndCommunication.Instance.ReadLine.RegisterEvent(GetZProbeHeight, ref unregisterEvents);
PrinterConnection.Instance.ReadLine.RegisterEvent(GetZProbeHeight, ref unregisterEvents);
}
}
public override void PageIsBecomingInactive()
{
PrinterConnectionAndCommunication.Instance.ReadLine.UnregisterEvent(GetZProbeHeight, ref unregisterEvents);
PrinterConnection.Instance.ReadLine.UnregisterEvent(GetZProbeHeight, ref unregisterEvents);
base.PageIsBecomingInactive();
}
}
@ -458,9 +458,9 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
var feedRates = ActiveSliceSettings.Instance.Helpers.ManualMovementSpeeds();
PrinterConnectionAndCommunication.Instance.MoveAbsolute(PrinterConnectionAndCommunication.Axis.Z, probeStartPosition.z, feedRates.z);
PrinterConnectionAndCommunication.Instance.MoveAbsolute(probeStartPosition, feedRates.x);
PrinterConnectionAndCommunication.Instance.ReadPosition();
PrinterConnection.Instance.MoveAbsolute(PrinterConnection.Axis.Z, probeStartPosition.z, feedRates.z);
PrinterConnection.Instance.MoveAbsolute(probeStartPosition, feedRates.x);
PrinterConnection.Instance.ReadPosition();
container.backButton.Enabled = false;
container.nextButton.Enabled = false;
@ -521,7 +521,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
if (haveDrawn)
{
PrinterConnectionAndCommunication.Instance.MoveRelative(PrinterConnectionAndCommunication.Axis.Z, 2, ActiveSliceSettings.Instance.Helpers.ManualMovementSpeeds().z);
PrinterConnection.Instance.MoveRelative(PrinterConnection.Axis.Z, 2, ActiveSliceSettings.Instance.Helpers.ManualMovementSpeeds().z);
}
base.PageIsBecomingInactive();
}

View file

@ -239,8 +239,8 @@ namespace MatterHackers.MatterControl
private void AddHandlers()
{
PrinterConnectionAndCommunication.Instance.CommunicationStateChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents);
PrinterConnectionAndCommunication.Instance.EnableChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents);
PrinterConnection.Instance.CommunicationStateChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents);
PrinterConnection.Instance.EnableChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents);
}
private void onPrinterStatusChanged(object sender, EventArgs e)

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:

View file

@ -57,7 +57,7 @@ namespace MatterHackers.MatterControl.PrinterControls
cancelButton.Click += (s, e) =>
{
PrinterConnectionAndCommunication.Instance.MacroCancel();
PrinterConnection.Instance.MacroCancel();
};
if (macroData.showMaterialSelector)
@ -69,7 +69,7 @@ namespace MatterHackers.MatterControl.PrinterControls
contentRow.AddChild(materialSelector);
}
PrinterConnectionAndCommunication.Instance.WroteLine.RegisterEvent(LookForTempRequest, ref unregisterEvents);
PrinterConnection.Instance.WroteLine.RegisterEvent(LookForTempRequest, ref unregisterEvents);
if (macroData.waitOk | macroData.expireTime > 0)
{
@ -77,7 +77,7 @@ namespace MatterHackers.MatterControl.PrinterControls
okButton.Click += (s, e) =>
{
PrinterConnectionAndCommunication.Instance.MacroContinue();
PrinterConnection.Instance.MacroContinue();
UiThread.RunOnIdle(() => WizardWindow?.Close());
};
@ -146,7 +146,7 @@ namespace MatterHackers.MatterControl.PrinterControls
{
if(e.OsEvent)
{
PrinterConnectionAndCommunication.Instance.MacroCancel();
PrinterConnection.Instance.MacroCancel();
}
unregisterEvents?.Invoke(this, null);
@ -173,7 +173,7 @@ namespace MatterHackers.MatterControl.PrinterControls
if(stringEvent != null
&& stringEvent.Data.Contains("M104"))
{
startingTemp = PrinterConnectionAndCommunication.Instance.GetActualExtruderTemperature(0);
startingTemp = PrinterConnection.Instance.GetActualExtruderTemperature(0);
UiThread.RunOnIdle(ShowTempChangeProgress);
}
}
@ -181,8 +181,8 @@ namespace MatterHackers.MatterControl.PrinterControls
private void ShowTempChangeProgress()
{
progressBar.Visible = true;
double targetTemp = PrinterConnectionAndCommunication.Instance.GetTargetExtruderTemperature(0);
double actualTemp = PrinterConnectionAndCommunication.Instance.GetActualExtruderTemperature(0);
double targetTemp = PrinterConnection.Instance.GetTargetExtruderTemperature(0);
double actualTemp = PrinterConnection.Instance.GetActualExtruderTemperature(0);
double totalDelta = targetTemp - startingTemp;
double currentDelta = actualTemp - startingTemp;
double ratioDone = totalDelta != 0 ? (currentDelta / totalDelta) : 1;