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

Getting switch extruder pre-gcode to run when needed

Browse source 
refactoring
This commit is contained in:
Lars Brubaker 2019-02-06 10:34:19 -08:00
parent 8eefd9c059
commit 572fdd847a
17 changed files with 74 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControlLib/ConfigurationPage/PrintLeveling/LoadFilamentWizard.cs
View file

@ -358,7 +358,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
public DoneLoadingPage(PrinterSetupWizard setupWizard, int extruderIndex)
: base(setupWizard, "Success".Localize(), "Success!\n\nYour filament should now be loaded".Localize())
{
if (printer.Connection.PrinterIsPaused)
if (printer.Connection.Paused)
{
var resumePrintingButton = new TextButton("Resume Printing".Localize(), theme)
{

3
MatterControlLib/ConfigurationPage/PrintLeveling/ProbeCalibrationWizard.cs
View file

@ -253,6 +253,9 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
else if (i == 1)
{
// store the offset into the extruder offset z position
var extruder1Offset = printer.Settings.Helpers.ExtruderOffset(1);
//var newZOffset = extruder1Offset.Z
double newProbeOffset = autoProbePositions[0].position.Z - manualProbePositions[0].position.Z;
}
}

4
MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/AutoProbeFeedback.cs
View file

@ -155,8 +155,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
NextButton.Enabled = false;
if (printer.Connection.IsConnected
&& !(printer.Connection.PrinterIsPrinting
|| printer.Connection.PrinterIsPaused))
&& !(printer.Connection.Printing
|| printer.Connection.Paused))
{
printer.Connection.LineReceived += GetZProbeHeight;
}