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

Only require probe calibration if doing leveling

Browse source 
issue: MatterHackers/MCCentral#4351
Probe calibration is required even when software print leveling is turned off
This commit is contained in:
Lars Brubaker 2018-10-23 09:25:34 -07:00
parent 10d141395f
commit fd74320c8e
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -45,7 +45,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
public static bool UsingZProbe(PrinterConfig printer)
{
// we have a probe that we are using and we have not done leveling yet
return printer.Settings.GetValue<bool>(SettingsKey.has_z_probe)
return printer.Settings.GetValue<bool>(SettingsKey.print_leveling_enabled)
&& printer.Settings.GetValue<bool>(SettingsKey.has_z_probe)
&& printer.Settings.GetValue<bool>(SettingsKey.use_z_probe);
}

2
MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PauseResumeButton.cs
View file

@ -110,7 +110,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
protected void SetButtonStates()
{
// If we don't have leveling data and we need it
bool showSetupButton = PrintLevelingData.NeedsToBeRun(printer);
bool showSetupButton = PrintLevelingData.NeedsToBeRun(printer) || ProbeCalibrationWizard.NeedsToBeRun(printer);
switch (printer.Connection.CommunicationState)
{