diff --git a/MatterControl.sln b/MatterControl.sln index 6188ea2d3..510de7098 100644 --- a/MatterControl.sln +++ b/MatterControl.sln @@ -99,6 +99,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{9EA7B0 ProjectSection(SolutionItems) = preProject .nuget\NuGet.Config = .nuget\NuGet.Config .nuget\NuGet.exe = .nuget\NuGet.exe + .nuget\NuGet.targets = .nuget\NuGet.targets EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrintNotifications", "..\CloudServicesPlugin\PrintNotifications\PrintNotifications.csproj", "{291CD87C-2C58-4369-9D85-238C7EB31542}" diff --git a/PrinterCommunication/PrinterConnectionAndCommunication.cs b/PrinterCommunication/PrinterConnectionAndCommunication.cs index fa57016c9..9d554b0f9 100644 --- a/PrinterCommunication/PrinterConnectionAndCommunication.cs +++ b/PrinterCommunication/PrinterConnectionAndCommunication.cs @@ -1478,7 +1478,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication && readThreadHolder.IsCurrentThread()) { using (TimedLock.Lock(this, "ReadFromPrinter")) - { + { string allDataRead = serialPort.ReadExisting(); //Debug.Write("r: " + allDataRead); //Console.Write(indata); @@ -2899,11 +2899,12 @@ namespace MatterHackers.MatterControl.PrinterCommunication try { - timeSinceLastWrite.Restart(); - timeHaveBeenWaitingForOK.Restart(); using (TimedLock.Lock(this, "serialPort.Write")) { - serialPort.Write(lineToWrite); + serialPort.Write(lineToWrite); + timeSinceLastWrite.Restart(); + timeHaveBeenWaitingForOK.Restart(); + } //Debug.Write("w: " + lineToWrite); } diff --git a/PrinterControls/TerminalWindow/TextScrolBar.cs b/PrinterControls/TerminalWindow/TextScrolBar.cs index b36cc11e5..39d469f01 100644 --- a/PrinterControls/TerminalWindow/TextScrolBar.cs +++ b/PrinterControls/TerminalWindow/TextScrolBar.cs @@ -77,5 +77,20 @@ namespace MatterHackers.MatterControl downOnBar = false; base.OnMouseUp(mouseEvent); } + + public override void OnMouseWheel(MouseEventArgs mouseEvent) + { + double scrolledPos = mouseEvent.WheelDelta / Height + textScrollWidget.Position0To1; + if (scrolledPos > 1) + { + scrolledPos = 1; + } + else if (scrolledPos < 0) + { + scrolledPos = 0; + } + textScrollWidget.Position0To1 = scrolledPos; + base.OnMouseWheel(mouseEvent); + } } } \ No newline at end of file diff --git a/StaticData/PrinterSettings/MakerBot/Replicator 2/config.ini b/StaticData/PrinterSettings/MakerBot/Replicator 2/config.ini index ae3761794..57a9f683d 100644 --- a/StaticData/PrinterSettings/MakerBot/Replicator 2/config.ini +++ b/StaticData/PrinterSettings/MakerBot/Replicator 2/config.ini @@ -1,111 +1,159 @@ avoid_crossing_perimeters = 1 -bed_size = 200,200 -bed_temperature = 130 -bottom_solid_layers = 1mm +bed_shape = rectangular +bed_size = 285,150 +bed_temperature = 0 +bottom_clip_amount = 0 +bottom_solid_layers = 3 bridge_acceleration = 0 bridge_fan_speed = 100 bridge_flow_ratio = 0.9 bridge_speed = 20 brim_width = 0 +build_height = 0 +cancel_gcode = M1201 ;Build End Norification MakerBot +center_part_on_bed = 1 complete_objects = 0 +connect_gcode = M92 X88.8 Y88.8 Z400 E101 ;sets steps per mm for x3g driver\nM206 X285 Y150 Z0 ;sets bed offset (opposite values of bed size) +cool_extruder_lift = 0 cooling = 1 +create_raft = 0 default_acceleration = 0 disable_fan_first_layers = 1 -duplicate = 1 -duplicate_distance = 6 -duplicate_grid = 1,1 -end_gcode = M104 S0 ; turn off temperature\nM140 S0 ; turn off bed temperature\nG28 X0\nG28 Z0\nM84 ; disable motors +end_gcode = M104 S0 ; turn off temperature\nM140 S0 ; turn off bed temperature\nG28 X0 Y0\nM84 ; disable motors\nM1201 ;Build End Norification MakerBot external_perimeter_speed = 40 -external_perimeters_first = 0 +external_perimeters_first = 1 extra_perimeters = 1 extruder_clearance_height = 20 extruder_clearance_radius = 20 +extruder_count = 1 extruder_offset = 0x0 +extruder_wipe_temperature = 0 +extruders_share_temperature = 0 extrusion_axis = E -extrusion_multiplier = 1.1 +extrusion_multiplier = 1 extrusion_width = 0 fan_always_on = 0 fan_below_layer_time = 60 -filament_diameter = 3 +filament_diameter = 1.75 fill_angle = 45 fill_density = 0.3 fill_pattern = honeycomb -first_layer_bed_temperature = 130 -first_layer_extrusion_width = 200% -first_layer_height = 0.3 -first_layer_speed = 25 -first_layer_temperature = 230 +first_layer_acceleration = 0 +first_layer_bed_temperature = 70 +first_layer_extrusion_width = 0 +first_layer_height = 0.25 +first_layer_speed = 10 +first_layer_temperature = 205 g0 = 0 gap_fill_speed = 20 gcode_arcs = 0 gcode_comments = 0 gcode_flavor = reprap +gcode_output_type = REPRAP +has_fan = 1 +has_hardware_leveling = 0 +has_heated_bed = 0 +has_power_control = 0 +has_sd_card_reader = 0 +show_reset_connection = 0 +heat_extruder_before_homing = 0 infill_acceleration = 0 infill_every_layers = 1 infill_extruder = 1 infill_extrusion_width = 0 infill_first = 0 infill_only_where_needed = 0 -infill_speed = 80 +infill_overlap_perimeter = .06 +infill_speed = 40 +infill_type = TRIANGLES layer_gcode = -layer_height = 0.3 +layer_height = 0.2 max_fan_speed = 100 +min_extrusion_before_retract = .1 min_fan_speed = 35 min_print_speed = 10 -min_skirt_length = 0 +min_skirt_length = 5 notes = -nozzle_diameter = 0.5 +nozzle_diameter = 0.4 only_retract_when_crossing_perimeters = 1 +ooze_prevention = 0 output_filename_format = [input_filename_base].gcode +overhangs = 1 +pause_gcode = perimeter_acceleration = 0 perimeter_extruder = 1 perimeter_extrusion_width = 0 -perimeter_speed = 70 -perimeters = 3 +perimeter_speed = 40 +perimeters = 2 post_process = -print_center = 0,0 +print_center = 142.5,75 +raft_air_gap = 0.25 +raft_extruder = 0 +raft_extra_distance_around_part = 3 +raft_fan_speed_percent = 100 raft_layers = 0 +raft_print_speed = 100% +bed_remove_part_temperature = 0 randomize_start = 0 +repair_outlines_extensive_stitching = 0 +repair_outlines_keep_open = 0 resolution = 0 -retract_before_travel = 20 +resume_gcode = @restore_xyz_position\n@restore_e_position +retract_before_travel = 50 retract_layer_change = 1 -retract_length = 1 -retract_length_toolchange = 10 +retract_length = 0 +retract_length_tool_change = 10 retract_lift = 0 retract_restart_extra = 0 retract_restart_extra_toolchange = 0 retract_speed = 50 -rotate = 0 -scale = 1 -skirt_distance = 6 +skirt_distance = 3 skirt_height = 1 -skirts = 2 -slowdown_below_layer_time = 30 +skirts = 1 +slowdown_below_layer_time = 15 small_perimeter_speed = 50 solid_fill_pattern = rectilinear solid_infill_below_area = 70 solid_infill_every_layers = 0 solid_infill_extrusion_width = 0 solid_infill_speed = 70 -start_gcode = G28 ; home all axes\nG0 X0Y60Z1 F5000 ; set warming position +solid_shell = 0 +spiral_vase = 0 +standby_temperature_delta = -5 +start_gcode = G28 ; home all axes\nG0 Z5 F5000 ;set warming position\nM1200 MatterControl; Build Start Notification for Makerbot\n +start_perimeters_at_concave_points = 0 +start_perimeters_at_non_overhang = 0 support_material = 0 support_material_angle = 0 +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 = 2 support_material_interface_spacing = 1.5 support_material_pattern = rectilinear support_material_spacing = 2.5 -support_material_speed = 60 +support_material_speed = 40 support_material_threshold = 0 -temperature = 225 +support_material_xy_distance = 0.7 +support_material_z_distance = 0.15 +support_material_z_gap_layers = .3mm +support_type = LINES +temperature = 200 +thin_walls = 1 threads = 2 toolchange_gcode = top_infill_extrusion_width = 0 top_solid_infill_speed = 80 -top_solid_layers = 1mm +top_solid_layers = 4 travel_speed = 110 +use_firmware_retraction = 0 use_relative_e_distances = 0 vibration_limit = 0 +wipe = 0 +wipe_shield_distance = 0 +wipe_tower_size = 0 +z_can_be_negative = 0 z_offset = 0 \ No newline at end of file diff --git a/StaticData/PrinterSettings/MakerBot/Replicator 2/material/ABS.slice b/StaticData/PrinterSettings/MakerBot/Replicator 2/material/ABS.slice deleted file mode 100644 index 9bd634e59..000000000 --- a/StaticData/PrinterSettings/MakerBot/Replicator 2/material/ABS.slice +++ /dev/null @@ -1,4 +0,0 @@ -bed_temperature = 130 -first_layer_bed_temperature = 130 -first_layer_temperature = 230 -temperature = 225 diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 3ba5f14e7..f4251416a 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -3343,3 +3343,18 @@ Translated:Folder Name English:Enter a Folder Name Here Translated:Enter a Folder Name Here +English:Save New Design to Queue +Translated:Save New Design to Queue + +English:Design Name +Translated:Design Name + +English:Enter the name of your design. +Translated:Enter the name of your design. + +English:Enter a Design Name Here +Translated:Enter a Design Name Here + +English:Also save to Library +Translated:Also save to Library + diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index e898dff49..2201debfe 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit e898dff49a5d0edf67741ca5848c714ead3f0fa5 +Subproject commit 2201debfeb52a1b722925d291ff6cdf05009d4b8 diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 5849699ce..106fe3e31 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 5849699cef05ccd1abb7e593fb4f6f70898db133 +Subproject commit 106fe3e31e4ae3239163f1b83fcb3fce30f5b916