From 1db346d0240fe14915e7774a725b6bf70f19bc82 Mon Sep 17 00:00:00 2001 From: larsbrubaker Date: Tue, 17 Jun 2014 17:57:50 -0700 Subject: [PATCH] Removed dead code. Make sure bed leveling stays on after export to SD card. Put bridge speed into MatterSlice. Default to slower bridge speed. --- ConfigurationPage/PrinterConfigurationPage.cs | 13 +------------ CustomWidgets/ExportPrintItemWindow.cs | 3 +++ .../SlicerMapping/EngineMappingMatterSlice.cs | 2 ++ StaticData/PrinterSettings/config.ini | 2 +- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/ConfigurationPage/PrinterConfigurationPage.cs b/ConfigurationPage/PrinterConfigurationPage.cs index c796f3239..a07948b43 100644 --- a/ConfigurationPage/PrinterConfigurationPage.cs +++ b/ConfigurationPage/PrinterConfigurationPage.cs @@ -476,12 +476,6 @@ namespace MatterHackers.MatterControl disablePrintLevelingButton.VAnchor = VAnchor.ParentCenter; disablePrintLevelingButton.Click += new ButtonBase.ButtonEventHandler(disablePrintLeveling_Click); - CheckBox doLevelingCheckBox = new CheckBox(LocalizedString.Get("Enable Automatic Print Leveling")); - doLevelingCheckBox.Margin = new BorderDouble(left: 3); - doLevelingCheckBox.TextColor = ActiveTheme.Instance.PrimaryTextColor; - doLevelingCheckBox.VAnchor = VAnchor.ParentCenter; - doLevelingCheckBox.Checked = ActivePrinterProfile.Instance.DoPrintLeveling; - printLevelingStatusLabel = new TextWidget (""); printLevelingStatusLabel.AutoExpandBoundsToText = true; printLevelingStatusLabel.TextColor = ActiveTheme.Instance.PrimaryTextColor; @@ -491,16 +485,11 @@ namespace MatterHackers.MatterControl hSpacer.HAnchor = HAnchor.ParentLeftRight; buttonBar.AddChild(levelingIcon); - //buttonBar.AddChild(doLevelingCheckBox); buttonBar.AddChild (printLevelingStatusLabel); buttonBar.AddChild (hSpacer); buttonBar.AddChild(enablePrintLevelingButton); buttonBar.AddChild(disablePrintLevelingButton); buttonBar.AddChild(runPrintLevelingButton); - doLevelingCheckBox.CheckedStateChanged += (sender, e) => - { - ActivePrinterProfile.Instance.DoPrintLeveling = doLevelingCheckBox.Checked; - }; ActivePrinterProfile.Instance.DoPrintLevelingChanged.RegisterEvent((sender, e) => { SetPrintLevelButtonVisiblity(); @@ -564,7 +553,7 @@ namespace MatterHackers.MatterControl case PrinterConnectionAndCommunication.CommunicationStates.AttemptingToConnect: case PrinterConnectionAndCommunication.CommunicationStates.FailedToConnect: eePromControlsContainer.SetEnableLevel(DisableableWidget.EnableLevel.Disabled); - printLevelContainer.SetEnableLevel(DisableableWidget.EnableLevel.ConfigOnly); + printLevelContainer.SetEnableLevel(DisableableWidget.EnableLevel.Enabled); terminalCommunicationsContainer.SetEnableLevel(DisableableWidget.EnableLevel.Enabled); break; diff --git a/CustomWidgets/ExportPrintItemWindow.cs b/CustomWidgets/ExportPrintItemWindow.cs index 617736fa3..eae21c94b 100644 --- a/CustomWidgets/ExportPrintItemWindow.cs +++ b/CustomWidgets/ExportPrintItemWindow.cs @@ -243,6 +243,9 @@ namespace MatterHackers.MatterControl } } unleveledGCode.Save(dest); + + // Make sure we turn this back on as it can get turned off by the LevelWizard2Point.ProcessCommand and it was on. + ActivePrinterProfile.Instance.DoPrintLeveling = true; } else { diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs index a7be4d486..a2dedb7ab 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs @@ -136,6 +136,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration //infillSpeed=50 # mm/s. new MapItem("infillSpeed", "infill_speed"), + + new MapItem("bridgeSpeed", "bridge_speed"), //infillStartingAngle=45 new MapItem("infillStartingAngle", "fill_angle"), diff --git a/StaticData/PrinterSettings/config.ini b/StaticData/PrinterSettings/config.ini index f891661c0..6853397a7 100644 --- a/StaticData/PrinterSettings/config.ini +++ b/StaticData/PrinterSettings/config.ini @@ -7,7 +7,7 @@ bottom_solid_layers = 3 bridge_acceleration = 0 bridge_fan_speed = 100 bridge_flow_ratio = 1 -bridge_speed = 60 +bridge_speed = 20 brim_width = 0 build_height = 0 cancel_gcode =