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

Added has hardware leveling to slice settings and implemented in code to

Browse source 
remove the software print leveling when present.
Added the setting to lulzbot mini, robo r1 and prntrbot simple metal
This commit is contained in:
larsbrubaker 2015-01-23 08:03:59 -08:00
parent f814760fde
commit 51dcf9bc17
13 changed files with 42 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

17
ConfigurationPage/PrinterSettings/PrinterSettingsView.cs
View file

@ -7,6 +7,7 @@ using MatterHackers.Agg.PlatformAbstract;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.ConfigurationPage.PrintLeveling;
using MatterHackers.MatterControl.SlicerConfiguration;
using MatterHackers.MatterControl.CustomWidgets;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.PrinterCommunication;
@ -17,7 +18,6 @@ namespace MatterHackers.MatterControl.ConfigurationPage
{
public class HardwareSettingsWidget : SettingsViewBase
{
Button configureAutoLevelButton;
Button configureEePromButton;
Button openGcodeTerminalButton;
Button openCameraButton;
@ -36,10 +36,15 @@ namespace MatterHackers.MatterControl.ConfigurationPage
eePromControlsContainer.AddChild(GetEEPromControl());
terminalCommunicationsContainer = new DisableableWidget();
terminalCommunicationsContainer.AddChild(GetGcodeTerminalControl());
printLevelingContainer = new DisableableWidget();
printLevelingContainer.AddChild(GetAutoLevelControl());
mainContainer.AddChild(printLevelingContainer);
printLevelingContainer = new DisableableWidget();
if (!ActiveSliceSettings.Instance.HasHardwareLeveling())
{
printLevelingContainer.AddChild(GetAutoLevelControl());
mainContainer.AddChild(printLevelingContainer);
}
mainContainer.AddChild(new HorizontalLine(separatorLineColor));
mainContainer.AddChild(eePromControlsContainer);
mainContainer.AddChild(new HorizontalLine(separatorLineColor));
@ -70,9 +75,10 @@ namespace MatterHackers.MatterControl.ConfigurationPage
buttonRow.HAnchor = HAnchor.ParentLeftRight;
buttonRow.Margin = new BorderDouble(0,4);
configureAutoLevelButton = textImageButtonFactory.Generate("Configure".Localize().ToUpper());
Button configureAutoLevelButton = textImageButtonFactory.Generate("Configure".Localize().ToUpper());
configureAutoLevelButton.Margin = new BorderDouble(left: 6);
configureAutoLevelButton.VAnchor = VAnchor.ParentCenter;
configureAutoLevelButton.Click += new EventHandler(configureAutoLevelButton_Click);
TextWidget notificationSettingsLabel = new TextWidget("Automatic Print Leveling");
notificationSettingsLabel.AutoExpandBoundsToText = true;
@ -262,7 +268,6 @@ namespace MatterHackers.MatterControl.ConfigurationPage
private void AddHandlers()
{
configureAutoLevelButton.Click += new EventHandler(configureAutoLevelButton_Click);
configureEePromButton.Click += new EventHandler(configureEePromButton_Click);
PrinterConnectionAndCommunication.Instance.CommunicationStateChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents);
PrinterConnectionAndCommunication.Instance.EnableChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents);

15
SlicerConfiguration/ActiveSliceSettings.cs
View file

@ -228,12 +228,17 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
public bool HasFan()
{
return GetActiveValue("has_fan") == "1";
}
public bool HasFan()
{
return GetActiveValue("has_fan") == "1";
}
public bool HasSdCardReader()
public bool HasHardwareLeveling()
{
return GetActiveValue("has_hardware_leveling") == "1";
}
public bool HasSdCardReader()
{
return GetActiveValue("has_sd_card_reader") == "1";
}

1
SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -259,6 +259,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
"has_fan",
"has_heated_bed",
"has_hardware_leveling",
"has_sd_card_reader",
"extruder_count",
"extruders_share_temperature",

3
SlicerConfiguration/SlicerMapping/EngineMappingCura.cs
View file

@ -96,12 +96,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
new NotPassedItem("", "bed_temperature"),
new NotPassedItem("", "bed_shape"),
#if true
new NotPassedItem("", "has_fan"),
new NotPassedItem("", "has_heated_bed"),
new NotPassedItem("", "has_hardware_leveling"),
new NotPassedItem("", "has_sd_card_reader"),
new NotPassedItem("", "z_can_be_negative"),
#endif
new ScaledSingleNumber("objectSink", "bottom_clip_amount", 1000),

3
SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs
View file

@ -204,12 +204,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
new MapRepairOutlines("repairOutlines", "repair_outlines_extensive_stitching"),
new NotPassedItem("", "repair_outlines_keep_open"),
#if true
new NotPassedItem("", "has_fan"),
new NotPassedItem("", "has_hardware_leveling"),
new NotPassedItem("", "has_heated_bed"),
new NotPassedItem("", "has_sd_card_reader"),
new NotPassedItem("", "z_can_be_negative"),
#endif
//retractionOnExtruderSwitch=14.5
new MapItem("retractionOnExtruderSwitch", "retract_length_tool_change"),

6
SlicerConfiguration/SlicerMapping/EngineMappingSlic3r.cs
View file

@ -79,12 +79,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
hideItems.Add("wipe_shield_distance");
hideItems.Add("extruder_count");
#if false
hideItems.Add("has_fan");
hideItems.Add("has_heated_bed");
hideItems.Add("has_sd_card_reader");
#endif
}
return instance;
}

1
StaticData/PrinterSettings/Lulzbot/Mini/config.ini
View file

@ -49,6 +49,7 @@ gcode_comments = 0
gcode_flavor = reprap
gcode_output_type = REPRAP
has_fan = 1
has_hardware_leveling = 1
has_heated_bed = 1
has_sd_card_reader = 0
infill_acceleration = 0

1
StaticData/PrinterSettings/Printrbot/Simple Metal/config.ini
View file

@ -41,6 +41,7 @@ gap_fill_speed = 30
gcode_arcs = 0
gcode_comments = 0
gcode_flavor = reprap
has_hardware_leveling = 1
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

1
StaticData/PrinterSettings/RoBo 3D/R1/config.ini
View file

@ -49,6 +49,7 @@ gcode_comments = 0
gcode_flavor = reprap
gcode_output_type = REPRAP
has_sd_card_reader = 1
has_hardware_leveling = 1
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

1
StaticData/PrinterSettings/config.ini
View file

@ -49,6 +49,7 @@ gcode_comments = 0
gcode_flavor = reprap
gcode_output_type = REPRAP
has_fan = 1
has_hardware_leveling = 0
has_heated_bed = 1
has_sd_card_reader = 0
infill_acceleration = 0

1
StaticData/SliceSettings/Layouts.txt
View file

@ -237,6 +237,7 @@ Advanced
bed_shape
Hardware
has_fan
has_hardware_leveling
has_heated_bed
has_sd_card_reader
extruder_count

7
StaticData/SliceSettings/Properties.json
View file

@ -385,6 +385,13 @@
"DataEditType": "HARDWARE_PRESENT",
"ExtraSettings": "bridge_fan_speed,disable_fan_first_layers,fan_always_on,fan_below_layer_time,max_fan_speed,min_fan_speed"
},
{
"SlicerConfigName": "has_hardware_leveling",
"PresentationName": "Has Hardware Leveling",
"HelpText": "Specify if your printer has the ability to do print leveling directly (support for G29).",
"DataEditType": "HARDWARE_PRESENT",
"ExtraSettings": ""
},
{
"SlicerConfigName": "has_heated_bed",
"PresentationName": "Has Heated Bed",

6
StaticData/Translations/Master.txt
View file

@ -3086,3 +3086,9 @@ Translated:Please wait. Sending files...
English:File too big to load.
Translated:File too big to load.
English:Specify if your printer has the ability to do print leveling directly (support for G29).
Translated:Specify if your printer has the ability to do print leveling directly (support for G29).
English:Has Hardware Leveling
Translated:Has Hardware Leveling