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

Makerbot replicator2 settings and agg-sharp update

Browse source
This commit is contained in:
Matt Moening 2015-06-25 12:19:23 -07:00
parent 4c0bf8995f
commit 9828a78e13
5 changed files with 118 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

30
MatterControl.sln
View file

@ -130,8 +130,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterSlice.Tests", "Submod
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "X3GDriver", "..\X3GDriver\X3GDriver\X3GDriver.csproj", "{26164CC3-29AD-4384-861C-181440934B00}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatterSlice.Tests", "Submodules\MatterSlice\Tests\MatterSlice.Tests\MatterSlice.Tests.csproj", "{8CD15B23-D30F-470E-99BA-9276FB7CABD4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -1154,6 +1152,34 @@ Global
{8CD15B23-D30F-470E-99BA-9276FB7CABD4}.Release64|Mixed Platforms.Build.0 = Release|Any CPU
{8CD15B23-D30F-470E-99BA-9276FB7CABD4}.Release64|x64.ActiveCfg = Release|Any CPU
{8CD15B23-D30F-470E-99BA-9276FB7CABD4}.Release64|x86.ActiveCfg = Release|Any CPU
{26164CC3-29AD-4384-861C-181440934B00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{26164CC3-29AD-4384-861C-181440934B00}.Debug|Any CPU.Build.0 = Debug|Any CPU
{26164CC3-29AD-4384-861C-181440934B00}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{26164CC3-29AD-4384-861C-181440934B00}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{26164CC3-29AD-4384-861C-181440934B00}.Debug|x64.ActiveCfg = Debug|x64
{26164CC3-29AD-4384-861C-181440934B00}.Debug|x64.Build.0 = Debug|x64
{26164CC3-29AD-4384-861C-181440934B00}.Debug|x86.ActiveCfg = Debug|Any CPU
{26164CC3-29AD-4384-861C-181440934B00}.Debug64|Any CPU.ActiveCfg = Debug64|Any CPU
{26164CC3-29AD-4384-861C-181440934B00}.Debug64|Any CPU.Build.0 = Debug64|Any CPU
{26164CC3-29AD-4384-861C-181440934B00}.Debug64|Mixed Platforms.ActiveCfg = Debug64|Any CPU
{26164CC3-29AD-4384-861C-181440934B00}.Debug64|Mixed Platforms.Build.0 = Debug64|Any CPU
{26164CC3-29AD-4384-861C-181440934B00}.Debug64|x64.ActiveCfg = Debug64|x64
{26164CC3-29AD-4384-861C-181440934B00}.Debug64|x64.Build.0 = Debug64|x64
{26164CC3-29AD-4384-861C-181440934B00}.Debug64|x86.ActiveCfg = Debug64|Any CPU
{26164CC3-29AD-4384-861C-181440934B00}.Release|Any CPU.ActiveCfg = Release|Any CPU
{26164CC3-29AD-4384-861C-181440934B00}.Release|Any CPU.Build.0 = Release|Any CPU
{26164CC3-29AD-4384-861C-181440934B00}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{26164CC3-29AD-4384-861C-181440934B00}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{26164CC3-29AD-4384-861C-181440934B00}.Release|x64.ActiveCfg = Release|x64
{26164CC3-29AD-4384-861C-181440934B00}.Release|x64.Build.0 = Release|x64
{26164CC3-29AD-4384-861C-181440934B00}.Release|x86.ActiveCfg = Release|Any CPU
{26164CC3-29AD-4384-861C-181440934B00}.Release64|Any CPU.ActiveCfg = Release64|Any CPU
{26164CC3-29AD-4384-861C-181440934B00}.Release64|Any CPU.Build.0 = Release64|Any CPU
{26164CC3-29AD-4384-861C-181440934B00}.Release64|Mixed Platforms.ActiveCfg = Release64|Any CPU
{26164CC3-29AD-4384-861C-181440934B00}.Release64|Mixed Platforms.Build.0 = Release64|Any CPU
{26164CC3-29AD-4384-861C-181440934B00}.Release64|x64.ActiveCfg = Release64|x64
{26164CC3-29AD-4384-861C-181440934B00}.Release64|x64.Build.0 = Release64|x64
{26164CC3-29AD-4384-861C-181440934B00}.Release64|x86.ActiveCfg = Release64|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

21
PrinterCommunication/PrinterConnectionAndCommunication.cs
View file

@ -1246,7 +1246,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication
&& (!timeWaitingForTemperature.IsRunning || timeWaitingForTemperature.Elapsed.TotalSeconds > 60))
{
timeWaitingForTemperature.Restart();
// SendLineToPrinterNow("M105");
SendLineToPrinterNow("M105");
}
if (CommunicationState == CommunicationStates.PrintingFromSd
@ -1490,11 +1490,8 @@ namespace MatterHackers.MatterControl.PrinterCommunication
&& readThreadHolder.IsCurrentThread())
{
using (TimedLock.Lock(this, "ReadFromPrinter"))
{
byte[] response = new byte[serialPort.BytesToRead];
serialPort.Read(response, 0, serialPort.BytesToRead);
string allDataRead = X3GReader.translate(response);
// string allDataRead = serialPort.ReadExisting();
{
string allDataRead = serialPort.ReadExisting();
//Debug.Write("r: " + allDataRead);
//Console.Write(indata);
dataLastRead += allDataRead.Replace('\r', '\n');
@ -2880,14 +2877,10 @@ namespace MatterHackers.MatterControl.PrinterCommunication
{
using (TimedLock.Lock(this, "serialPort.Write"))
{
bool sendToPrinter;
byte[] x3gCommand = X3GWriter.translate(lineToWrite, out sendToPrinter);
if (sendToPrinter)
{
serialPort.Write(x3gCommand, 0, x3gCommand.Length);
timeSinceLastWrite.Restart();
timeHaveBeenWaitingForOK.Restart();
}
serialPort.Write(lineToWrite);
timeSinceLastWrite.Restart();
timeHaveBeenWaitingForOK.Restart();
}
//Debug.Write("w: " + lineToWrite);
}

116
StaticData/PrinterSettings/MakerBot/Replicator 2/config.ini
View file

@ -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 X-285 Y-150 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.3
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

4
StaticData/PrinterSettings/MakerBot/Replicator 2/material/ABS.slice
View file

@ -1,4 +0,0 @@
bed_temperature = 130
first_layer_bed_temperature = 130
first_layer_temperature = 230
temperature = 225

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit c6b7b43313bb2f899277066c8a89c48b70ecf42b
Subproject commit 106fe3e31e4ae3239163f1b83fcb3fce30f5b916