diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs index cc0eb41c5..01c721674 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs @@ -136,6 +136,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration new MapItemToBool("generateSupport", "support_material"), + new MapItem("supportPercent", "support_material_percent"), + //infillExtendIntoPerimeter=0.06 # The amount the infill extends into the perimeter in millimeters. new MapItem("infillExtendIntoPerimeter", "infill_overlap_perimeter"), diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingSlic3r.cs b/SlicerConfiguration/SlicerMapping/EngineMappingSlic3r.cs index bdd4b1d4d..b90086a55 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMappingSlic3r.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMappingSlic3r.cs @@ -70,6 +70,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration hideItems.Add("repair_outlines_keep_open"); hideItems.Add("complete_objects"); hideItems.Add("output_filename_format"); + hideItems.Add("support_material_percent"); hideItems.Add("post_process"); hideItems.Add("extruder_clearance_height"); hideItems.Add("extruder_clearance_radius"); diff --git a/StaticData/PrinterSettings/config.ini b/StaticData/PrinterSettings/config.ini index 6fd7aed59..2a497f4da 100644 --- a/StaticData/PrinterSettings/config.ini +++ b/StaticData/PrinterSettings/config.ini @@ -132,6 +132,7 @@ start_perimeters_at_non_overhang = 0 support_air_gap = .3 support_material = 0 support_material_angle = 45 +support_material_percent = 50 support_material_create_internal_support = 0 support_material_enforce_layers = 0 support_material_extruder = 1 diff --git a/StaticData/SliceSettings/Layouts.txt b/StaticData/SliceSettings/Layouts.txt index 6eb1f65b7..cea12a3f9 100644 --- a/StaticData/SliceSettings/Layouts.txt +++ b/StaticData/SliceSettings/Layouts.txt @@ -34,6 +34,7 @@ Intermediate support_material_create_internal_support Support Options support_material_spacing + support_material_percent Extruders support_material_extruder Filament @@ -145,6 +146,7 @@ Advanced support_material_pattern support_material_spacing support_material_angle + support_material_percent support_material_infill_angle support_material_interface_layers support_material_interface_spacing diff --git a/StaticData/SliceSettings/Properties.json b/StaticData/SliceSettings/Properties.json index f0914292a..e572d00d9 100644 --- a/StaticData/SliceSettings/Properties.json +++ b/StaticData/SliceSettings/Properties.json @@ -914,6 +914,13 @@ "DataEditType": "POSITIVE_DOUBLE", "ExtraSettings": "degrees" }, + { + "SlicerConfigName": "support_material_percent", + "PresentationName": "Support Percent", + "HelpText": "The amount of support to generate.", + "DataEditType": "POSITIVE_DOUBLE", + "ExtraSettings": "degrees", + "QuickMenuSettings": [{"MenuName" : "Little", "Value": "10"},{"MenuName" : "Standard", "Value": "50"},{"MenuName" : "Lots", "Value": "90"}] }, { "SlicerConfigName": "support_material_infill_angle", "PresentationName": "Infill Angle", diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 358dea060..dcdc7bcfd 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -4006,3 +4006,18 @@ Translated:Extruder Temperatures English:Bed Temperatures Translated:Bed Temperatures +English:Waiting for device to connect... +Translated:Waiting for device to connect... + +English:Detecting device firmware... +Translated:Detecting device firmware... + +English:Detecting target firmware... +Translated:Detecting target firmware... + +English:The amount of support to generate. +Translated:The amount of support to generate. + +English:Support Percent +Translated:Support Percent + diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index c19453ad3..d07f673c5 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit c19453ad3953d62a9c5387f636e1765a6366dc78 +Subproject commit d07f673c5168e9a751213f8e61a48166c370a865