diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingCura.cs b/SlicerConfiguration/SlicerMapping/EngineMappingCura.cs index e8d50e52e..c8ad50d2d 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMappingCura.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMappingCura.cs @@ -95,6 +95,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration new NotPassedItem("", "temperature"), new NotPassedItem("", "bed_temperature"), new NotPassedItem("", "bed_shape"), + new NotPassedItem("", "extruder_count"), #if true new NotPassedItem("", "has_fan"), diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs index 097ab75a1..9b111a40b 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs @@ -88,6 +88,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration //doCoolHeadLift=False # Will cause the head to be raised in z until the min layer time is reached. new MapItemToBool("doCoolHeadLift", "cool_extruder_lift"), + //new MapItemToBool("extruder_2_offset", ""), + //new MapItemToBool("temperature_extruder_2", ""), + new NotPassedItem("", "extruder_count"), + //endCode=M104 S0 new MapEndGCode("endCode", "end_gcode"), @@ -496,7 +500,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration { get { - return base.MappedValue.Replace("\n", "\\n"); + string endGCode = base.MappedValue.Replace("\n", "\\n"); + return endGCode; } } diff --git a/SlicerConfiguration/SlicerMapping/EngineMappingSlic3r.cs b/SlicerConfiguration/SlicerMapping/EngineMappingSlic3r.cs index a13cf1344..47a7b44b2 100644 --- a/SlicerConfiguration/SlicerMapping/EngineMappingSlic3r.cs +++ b/SlicerConfiguration/SlicerMapping/EngineMappingSlic3r.cs @@ -79,6 +79,9 @@ namespace MatterHackers.MatterControl.SlicerConfiguration hideItems.Add("extruder_clearance_height"); hideItems.Add("extruder_clearance_radius"); hideItems.Add("wipe_shield_distance"); + + hideItems.Add("extruder_2_offset"); + hideItems.Add("temperature_extruder_2"); #if false hideItems.Add("has_fan"); hideItems.Add("has_heated_bed"); diff --git a/StaticData/PrinterSettings/config.ini b/StaticData/PrinterSettings/config.ini index 8d63dd7c1..573d34ac1 100644 --- a/StaticData/PrinterSettings/config.ini +++ b/StaticData/PrinterSettings/config.ini @@ -16,16 +16,16 @@ complete_objects = 0 cool_extruder_lift = 0 cooling = 1 create_raft = 0 -raft_extra_distance_around_part = 5 -raft_air_gap = .2 default_acceleration = 0 disable_fan_first_layers = 1 end_gcode = M104 S0 ; turn off temperature\nG28 X0 ; home X axis\nM84 ; disable motors external_perimeter_speed = 70% external_perimeters_first = 0 extra_perimeters = 1 +extruder_2_offset = 0x0 extruder_clearance_height = 20 extruder_clearance_radius = 20 +extruder_count = 1 extruder_offset = 0x0 extrusion_axis = E extrusion_multiplier = 1 @@ -62,8 +62,8 @@ infill_speed = 60 infill_type = TRIANGLES layer_gcode = layer_height = 0.4 -min_extrusion_before_retract = .1 max_fan_speed = 100 +min_extrusion_before_retract = .1 min_fan_speed = 35 min_print_speed = 10 min_skirt_length = 0 @@ -81,6 +81,8 @@ perimeter_speed = 30 perimeters = 3 post_process = print_center = 100,100 +raft_air_gap = .2 +raft_extra_distance_around_part = 5 raft_layers = 0 randomize_start = 0 repair_outlines_extensive_stitching = 0 @@ -114,11 +116,11 @@ start_perimeters_at_concave_points = 0 start_perimeters_at_non_overhang = 0 support_material = 0 support_material_angle = 45 -support_material_infill_angle = 45 support_material_create_internal_support = 0 support_material_enforce_layers = 0 support_material_extruder = 1 support_material_extrusion_width = 0 +support_material_infill_angle = 45 support_material_interface_extruder = 1 support_material_interface_layers = 3 support_material_interface_spacing = 0 @@ -131,6 +133,7 @@ support_material_z_distance = 0.15 support_material_z_gap_layers = 1 support_type = LINES temperature = 200 +temperature_extruder_2 = 0 thin_walls = 1 threads = 2 toolchange_gcode =