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

Merge pull request #2914 from larsbrubaker/design_tools

Browse source 
Made load and unload intrinsic to all printers and extruders
This commit is contained in:
johnlewin 2018-01-18 16:38:58 -08:00 • committed by GitHub
commit b09ab51bad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 170 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

41
ActionBar/TemperatureWidgetExtruder.cs
View file

@ -28,8 +28,10 @@ either expressed or implied, of the FreeBSD Project.
*/
using System;
using System.IO;
using System.Linq;
using MatterHackers.Agg;
using MatterHackers.Agg.Platform;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.ConfigurationPage;
@ -51,12 +53,9 @@ namespace MatterHackers.MatterControl.ActionBar
this.printer = printer;
// add in any macros for this extruder
// add in load and unload buttons
var macroButtons = GetExtruderMacros(extruderIndex, buttonFactory);
if (macroButtons != null)
{
this.AddChild(new SettingsItem("Filament".Localize(), macroButtons, enforceGutter: false));
}
this.AddChild(new SettingsItem("Filament".Localize(), macroButtons, enforceGutter: false));
// Add the Extrude buttons
var moveButtonFactory = ApplicationController.Instance.Theme.MicroButtonMenu;
@ -144,26 +143,22 @@ namespace MatterHackers.MatterControl.ActionBar
private GuiWidget GetExtruderMacros(int extruderIndex, TextImageButtonFactory buttonFactory)
{
MacroUiLocation extruderUiMacros;
if (Enum.TryParse($"Extruder_{extruderIndex + 1}", out extruderUiMacros))
{
var macros = printer.Settings.GetMacros(extruderUiMacros);
if (macros.Any())
{
var row = new FlowLayoutWidget();
foreach (GCodeMacro macro in macros)
{
Button macroButton = buttonFactory.Generate(GCodeMacro.FixMacroName(macro.Name));
macroButton.Margin = new BorderDouble(left: 5);
macroButton.Click += (s, e) => macro.Run(printer.Connection);
var row = new FlowLayoutWidget();
row.AddChild(macroButton);
}
return row;
}
}
GCodeMacro loadFilament = new GCodeMacro();
loadFilament.GCode = AggContext.StaticData.ReadAllText(Path.Combine("SliceSettings", "load_filament.txt"));
Button loadButton = buttonFactory.Generate("Load".Localize());
loadButton.Margin = new BorderDouble(0, 8, 8, 4);
loadButton.Click += (s, e) => loadFilament.Run(printer.Connection);
row.AddChild(loadButton);
return null;
GCodeMacro unloadFilament = new GCodeMacro();
unloadFilament.GCode = AggContext.StaticData.ReadAllText(Path.Combine("SliceSettings", "unload_filament.txt"));
Button unloadButton = buttonFactory.Generate("Unload".Localize());
unloadButton.Click += (s, e) => unloadFilament.Run(printer.Connection);
row.AddChild(unloadButton);
return row;
}
}

2
MatterControl.csproj
View file

@ -511,6 +511,8 @@
</Content>
<Content Include="StaticData\OEMSettings\AboutPage.html" />
<Content Include="StaticData\SliceSettings\Layouts.txt" />
<Content Include="StaticData\SliceSettings\load_filament.txt" />
<Content Include="StaticData\SliceSettings\unload_filament.txt" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="config.json">

4
PrinterControls/ControlWidgets/MacroControls.cs
View file

@ -45,13 +45,13 @@ namespace MatterHackers.MatterControl.PrinterControls
var noMacrosFound = new TextWidget("No macros are currently set up for this printer.".Localize(), pointSize: 10, textColor: theme.Colors.PrimaryTextColor);
this.AddChild(noMacrosFound);
if (printer.Settings?.GetMacros(MacroUiLocation.Controls).Any() != true)
if (printer.Settings?.Macros.Any() != true)
{
noMacrosFound.Visible = true;
return;
}
foreach (GCodeMacro macro in printer.Settings.GetMacros(MacroUiLocation.Controls))
foreach (GCodeMacro macro in printer.Settings.Macros)
{
var macroButton = new TextButton(GCodeMacro.FixMacroName(macro.Name), theme)
{

30
PrinterControls/MacroDetailPage.cs
View file

@ -37,8 +37,6 @@ using MatterHackers.MatterControl.SlicerConfiguration;
namespace MatterHackers.MatterControl
{
public enum MacroUiLocation { Controls, Extruder_1, Extruder_2, Extruder_3, Extruder_4 }
public class MacroDetailPage : DialogPage
{
private List<FormField> formFields;
@ -109,27 +107,6 @@ namespace MatterHackers.MatterControl
HAnchor = HAnchor.Stretch
};
container.AddChild(new TextWidget("Where to show this macro:")
{
TextColor = theme.Colors.PrimaryTextColor,
VAnchor = VAnchor.Center
});
var macroUiLocation = new DropDownList("Default", theme.Colors.PrimaryTextColor, Direction.Up, pointSize: theme.DefaultFontSize)
{
TextColor = theme.Colors.PrimaryTextColor,
Margin = new BorderDouble(5, 0),
VAnchor = VAnchor.Center
};
foreach (var location in Enum.GetValues(typeof(MacroUiLocation)))
{
macroUiLocation.AddItem(location.ToString().Replace("_", " ").Localize(), location.ToString());
}
macroUiLocation.SelectedValue = gcodeMacro.MacroUiLocation.ToString();
container.AddChild(macroUiLocation);
contentRow.AddChild(container);
Button addMacroButton = textImageButtonFactory.Generate("Save".Localize());
@ -143,13 +120,6 @@ namespace MatterHackers.MatterControl
gcodeMacro.Name = macroNameInput.Text;
gcodeMacro.GCode = macroCommandInput.Text;
MacroUiLocation result;
if (!Enum.TryParse(macroUiLocation.SelectedValue, out result))
{
result = MacroUiLocation.Controls;
}
gcodeMacro.MacroUiLocation = result;
if (!printerSettings.Macros.Contains(gcodeMacro))
{
printerSettings.Macros.Add(gcodeMacro);

1
SlicerConfiguration/Settings/GCodeMacro.cs
View file

@ -38,7 +38,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
public string Name { get; set; }
public string GCode { get; set; }
public MacroUiLocation MacroUiLocation { get; set; }
public DateTime LastModified { get; set; }
public static string FixMacroName(string input)

2
SlicerConfiguration/Settings/PrinterSettings.cs
View file

@ -90,8 +90,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public List<GCodeMacro> Macros { get; set; } = new List<GCodeMacro>();
public IEnumerable<GCodeMacro> GetMacros(MacroUiLocation macroLocation) => Macros.Where(m => m.MacroUiLocation == macroLocation).OrderBy(p => p.Name);
/// <summary>
/// Restore deactivated user overrides by iterating the active preset and removing/restoring matching items
/// </summary>

8
SlicerConfiguration/SlicerMapping/MappingClasses.cs
View file

@ -39,7 +39,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public static class GCodeProcessing
{
private static MappedSetting[] replaceWithSettingsStrings = new MappedSetting[]
{
{
// Have a mapping so that MatterSlice while always use a setting that can be set. (the user cannot set first_layer_bedTemperature in MatterSlice)
new AsPercentOfReferenceOrDirect(SettingsKey.first_layer_speed, "first_layer_speed", "infill_speed", 60),
new AsPercentOfReferenceOrDirect("external_perimeter_speed","external_perimeter_speed", "perimeter_speed", 60),
@ -63,6 +63,12 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
new ScaledSingleNumber("retract_speed","retract_speed", 60),
new ScaledSingleNumber("support_material_speed","support_material_speed", 60),
new ScaledSingleNumber("travel_speed", "travel_speed", 60),
new AsPercentOfReferenceOrDirect("load_filament_length_over_six", "", "load_filament_length", 1.0/6.0, false),
new AsPercentOfReferenceOrDirect("unload_filament_length_over_six", "", "unload_filament_length", 1.0/6.0, false),
new ScaledSingleNumber("load_filament_speed", "load_filament_speed", 60),
new MappedSetting("trim_image", "trim_image"),
new MappedSetting("insert_image", "insert_image"),
new MappedSetting("running_clean_image", "running_clean_image"),
};
public static string ReplaceMacroValues(string gcodeWithMacros)

7
SlicerConfiguration/SlicerMapping/SliceEngineMapping.cs
View file

@ -104,7 +104,12 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
SettingsKey.max_acceleration,
SettingsKey.ip_address,
SettingsKey.ip_port,
"load_filament_length",
"trim_image",
"insert_image",
"running_clean_image",
"unload_filament_length",
"load_filament_speed",
};
public SliceEngineMapping(string engineName)

8
StaticData/SliceSettings/Layouts.txt
View file

@ -191,6 +191,14 @@ Printer
max_acceleration
max_velocity
jerk_velocity
Loading
Loading
load_filament_length
load_filament_speed
trim_image
insert_image
running_clean_image
unload_filament_length
Slicing
Slicing Options
output_only_first_layer

69
StaticData/SliceSettings/Properties.json
View file

@ -33,6 +33,75 @@
"ShowIfSet": "has_heated_bed",
"DefaultValue": "70"
},
{
"SlicerConfigName": "load_filament_length",
"PresentationName": "Load Filament Length",
"HelpText": "The amount of filament to insert into the printer when loading.",
"DataEditType": "POSITIVE_DOUBLE",
"Units": "mm",
"ShowIfSet": "!sla_printer",
"DefaultValue": "20"
},
{
"SlicerConfigName": "load_filament_speed",
"PresentationName": "Load Filament Speed",
"HelpText": "The speed to run filament into the printer when loading.",
"DataEditType": "POSITIVE_DOUBLE",
"Units": "mm/s",
"ShowIfSet": "!sla_printer",
"DefaultValue": "80"
},
{
"SlicerConfigName": "load_filament_length_over_six",
"PresentationName": "Load Filament Length",
"HelpText": "Should be 100%. Not shown to user.",
"DataEditType": "DOUBLE_OR_PERCENT",
"Units": "%",
"ShowIfSet": "!sla_printer",
"DefaultValue": "100%"
},
{
"SlicerConfigName": "unload_filament_length",
"PresentationName": "Unload Filament Length",
"HelpText": "The amount of filament to remove from the printer while unloading.",
"DataEditType": "POSITIVE_DOUBLE",
"Units": "mm",
"ShowIfSet": "!sla_printer",
"DefaultValue": "70"
},
{
"SlicerConfigName": "unload_filament_length_over_six",
"PresentationName": "Unload Filament Length",
"HelpText": "Should be 100%. Not shown to user.",
"DataEditType": "DOUBLE_OR_PERCENT",
"Units": "%",
"ShowIfSet": "!sla_printer",
"DefaultValue": "100%"
},
{
"SlicerConfigName": "trim_image",
"PresentationName": "Trim Image",
"HelpText": "The image to show when explaining trimming.",
"DataEditType": "STRING",
"ShowIfSet": "!sla_printer",
"DefaultValue": "https://lh3.googleusercontent.com/7vFs0ih2mGseQBKo-0gHnzaT2SsuAPgeRuqFlVKG23c4brFnIaA2nlYIg8BUcdI-mVaDAadgu5bdBv_jZ69VOi3mYw"
},
{
"SlicerConfigName": "insert_image",
"PresentationName": "Insert Image",
"HelpText": "The image to show when explaining inserting.",
"DataEditType": "STRING",
"ShowIfSet": "!sla_printer",
"DefaultValue": "https://lh3.googleusercontent.com/S4eW9-uZ0lgpg_ws9Ss4LmUc_MiXCfHnfJmGVQ0XtOdpvr_XZQLuP5zWGv7eCSM65EbsWIdHVMC40EYL7u8k7LvMP4Y"
},
{
"SlicerConfigName": "running_clean_image",
"PresentationName": "Running Clean Image",
"HelpText": "The image to show when explaining filament running clean.",
"DataEditType": "STRING",
"ShowIfSet": "!sla_printer",
"DefaultValue": ""
},
{
"SlicerConfigName": "bottom_solid_layers",
"PresentationName": "Bottom Solid Layers",

34
StaticData/SliceSettings/load_filament.txt Normal file
View file

@ -0,0 +1,34 @@
; host.choose_material(title:"Choose the material that you are loading.")
M104 S[temperature] ; start heating up the extruder
; host.show_message(title:"Trim the end of the filament to ensure a good load.", image:"[trim_image]", wait_ok:"true")
M302 S0 ; Allow extrusion at any temperature
G91 ; Relative positioning
; host.show_message(title:"Put filament into extruder until you feel it start to feed and then click Continue.", repeat_gcode:"G1 E.1 F150|G4 P10", expire:"90", image:"[insert_image]")
G90 ; Absolute positioning
; host.show_message(title:"Loading filament...", count_down:"28")
G92 E0 ; reset the extruder position to 0
G91 ; Relative positioning
G1 E[load_filament_length_over_six] F[load_filament_speed] ; extrude the filament (pulse was 598)
G1 E[load_filament_length_over_six] F[load_filament_speed] ; extrude the filament
G1 E[load_filament_length_over_six] F[load_filament_speed] ; extrude the filament
G1 E[load_filament_length_over_six] F[load_filament_speed] ; extrude the filament
G1 E[load_filament_length_over_six] F[load_filament_speed] ; extrude the filament
G1 E[load_filament_length_over_six] F[load_filament_speed] ; extrude the filament
G4 S1 ; wait for move to finish
M302 S150 ; Set cold extrude temp back to reasonable
; host.show_message(title:"Waiting for extruder to heat to [temperature].")
G4 S1 ; wait message to display
M109 S[temperature] ; heat up the extruder
; extrude slowly so that we can prime the extruder
; host.show_message(title:"Click 'Continue' when filament is running cleanly through the nozzle.", repeat_gcode:"G1 E1 F300|G4 P10", expire:"90", image:"[running_clean_image]")
G4 S1 ; wait for move to finish
G90 ; Absolute positioning
G92 E0 ; reset the extruder position to 0
M104 S0 ; turn the extruder temperature off

24
StaticData/SliceSettings/unload_filament.txt Normal file
View file

@ -0,0 +1,24 @@
; host.choose_material(title:"Confirm the material you are unloading.")
; host.show_message(title:"Waiting for extruder to heat to [temperature], before unloading.")
G4 S1 ; wait message to display
M109 S[temperature] ; heat up the extruder
M302 S0 ; Allow extrusion at any temperature
; host.show_message(title:"Unloading filament..." count_down:28)
G92 E0 ; reset the extruder position to 0
G91 ; Relative positioning
G1 E15 F600 ; push some out first
G1 E-[unload_filament_length_over_six] F[load_filament_speed] ; unload the filament
G1 E-[unload_filament_length_over_six] F[load_filament_speed] ; unload the filament
G1 E-[unload_filament_length_over_six] F[load_filament_speed] ; unload the filament
G1 E-[unload_filament_length_over_six] F[load_filament_speed] ; unload the filament
G1 E-[unload_filament_length_over_six] F[load_filament_speed] ; unload the filament
G1 E-[unload_filament_length_over_six] F[load_filament_speed] ; unload the filament
G4 S1 ; wait for move to finish
G90 ; Absolute positioning
G92 E0 ; reset the extruder position to 0
M302 S150 ; Set cold extrude temp back to reasonable
M104 S0 ; turn the extruder temperature off