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

Change the namespace of PrinterCommunication and the class name.

Browse source 
Deleted lots of unused usings.
Working to get the 2point leveling working.
Started work on a new printer io layer
Fixed the crash on disconnect while printing.
This commit is contained in:
larsbrubaker 2014-06-11 14:52:58 -07:00
parent e6a1cabadf
commit 0e646dca68
50 changed files with 571 additions and 443 deletions
Download patch file Download diff file Expand all files Collapse all files

21
ActionBar/TemperatureWidgetBed.cs
View file

@ -38,6 +38,7 @@ using MatterHackers.Localizations;
using MatterHackers.MatterControl.PrintQueue;
using MatterHackers.MatterControl.SlicerConfiguration;
using MatterHackers.VectorMath;
using MatterHackers.MatterControl.PrinterCommunication;
namespace MatterHackers.MatterControl.ActionBar
{
@ -55,7 +56,7 @@ namespace MatterHackers.MatterControl.ActionBar
event EventHandler unregisterEvents;
void AddHandlers()
{
PrinterCommunication.Instance.BedTemperatureRead.RegisterEvent(onTemperatureRead, ref unregisterEvents);
PrinterConnectionAndCommunication.Instance.BedTemperatureRead.RegisterEvent(onTemperatureRead, ref unregisterEvents);
this.MouseEnterBounds += onMouseEnterBounds;
this.MouseLeaveBounds += onMouseLeaveBounds;
}
@ -83,18 +84,18 @@ namespace MatterHackers.MatterControl.ActionBar
void setToCurrentTemperature()
{
string tempDirectionIndicator = "";
if (PrinterCommunication.Instance.TargetBedTemperature > 0)
if (PrinterConnectionAndCommunication.Instance.TargetBedTemperature > 0)
{
if ((int)(PrinterCommunication.Instance.TargetBedTemperature + 0.5) < (int)(PrinterCommunication.Instance.ActualBedTemperature + 0.5))
if ((int)(PrinterConnectionAndCommunication.Instance.TargetBedTemperature + 0.5) < (int)(PrinterConnectionAndCommunication.Instance.ActualBedTemperature + 0.5))
{
tempDirectionIndicator = "↓";
}
else if ((int)(PrinterCommunication.Instance.TargetBedTemperature + 0.5) > (int)(PrinterCommunication.Instance.ActualBedTemperature + 0.5))
else if ((int)(PrinterConnectionAndCommunication.Instance.TargetBedTemperature + 0.5) > (int)(PrinterConnectionAndCommunication.Instance.ActualBedTemperature + 0.5))
{
tempDirectionIndicator = "↑";
}
}
this.IndicatorValue = string.Format(" {0:0.#}°{1}", PrinterCommunication.Instance.ActualBedTemperature, tempDirectionIndicator);
this.IndicatorValue = string.Format(" {0:0.#}°{1}", PrinterConnectionAndCommunication.Instance.ActualBedTemperature, tempDirectionIndicator);
}
void onTemperatureRead(Object sender, EventArgs e)
@ -111,16 +112,16 @@ namespace MatterHackers.MatterControl.ActionBar
if (double.TryParse(ActiveSliceSettings.Instance.GetActiveValue("first_layer_bed_temperature"), out targetTemp))
{
double goalTemp = (int)(targetTemp + .5);
if (PrinterCommunication.Instance.PrinterIsPrinting
&& PrinterCommunication.Instance.PrintingState == PrinterCommunication.DetailedPrintingState.HeatingBed
&& goalTemp != PrinterCommunication.Instance.TargetBedTemperature)
if (PrinterConnectionAndCommunication.Instance.PrinterIsPrinting
&& PrinterConnectionAndCommunication.Instance.PrintingState == PrinterConnectionAndCommunication.DetailedPrintingState.HeatingBed
&& goalTemp != PrinterConnectionAndCommunication.Instance.TargetBedTemperature)
{
string message = string.Format(waitingForBedToHeatMessage, PrinterCommunication.Instance.TargetBedTemperature, sliceSettingsNote);
string message = string.Format(waitingForBedToHeatMessage, PrinterConnectionAndCommunication.Instance.TargetBedTemperature, sliceSettingsNote);
StyledMessageBox.ShowMessageBox(message, waitingForBedToHeatTitle);
}
else
{
PrinterCommunication.Instance.TargetBedTemperature = (int)(targetTemp + .5);
PrinterConnectionAndCommunication.Instance.TargetBedTemperature = (int)(targetTemp + .5);
}
}
}