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

Made load and unload intrinsic to all printers and extruders

Browse source 
Took out macro location option
Added load and unload macros to StaticData
This commit is contained in:
Lars Brubaker 2018-01-18 15:28:09 -08:00
parent 8225b4bb20
commit 8e9904c6d2
12 changed files with 160 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

7
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,11 @@ 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 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)

6
SlicerConfiguration/SlicerMapping/SliceEngineMapping.cs
View file

@ -104,7 +104,11 @@ 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",
};
public SliceEngineMapping(string engineName)