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

Merge remote-tracking branch 'origin/1.5.1'

Browse source
This commit is contained in:
Lars Brubaker 2016-03-07 15:38:37 -08:00
commit cd5a4ab5e5
27 changed files with 93 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PrinterControls/ManualPrinterControls.cs
View file

@ -94,7 +94,7 @@ namespace MatterHackers.MatterControl
AddHandlers();
SetVisibleControls();
if (!pluginsQueuedToAdd)
if (!pluginsQueuedToAdd && ActiveSliceSettings.Instance.ShowFirmwareUpdater)
{
UiThread.RunOnIdle(AddPlugins);
pluginsQueuedToAdd = true;

9
SlicerConfiguration/ActiveSliceSettings.cs
View file

@ -294,6 +294,15 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
}
public bool ShowFirmwareUpdater
{
get
{
return GetActiveValue("include_firmware_updater") == "Simple Arduino";
}
}
public int SupportExtruder
{
get

1
SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -263,6 +263,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
"show_reset_connection",
"extruders_share_temperature",
"center_part_on_bed",
"include_firmware_updater",
};
private TextImageButtonFactory buttonFactory = new TextImageButtonFactory();

3
SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs
View file

@ -107,6 +107,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
new VisibleButNotMappedToEngine("manual_probe_paper_width"),
new VisibleButNotMappedToEngine("layer_to_pause"),
//fanSpeedMinPercent=100
new MapItem("fanSpeedMinPercent", "min_fan_speed"),
@ -231,6 +232,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
new VisibleButNotMappedToEngine("show_reset_connection"),
new VisibleButNotMappedToEngine("extruder_wipe_temperature"),
new VisibleButNotMappedToEngine("bed_remove_part_temperature"),
new VisibleButNotMappedToEngine("include_firmware_updater"),
//retractionOnExtruderSwitch=14.5
new MapItem("retractionOnExtruderSwitch", "retract_length_tool_change"),
@ -304,6 +306,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
new VisibleButNotMappedToEngine("temperature"),
new VisibleButNotMappedToEngine("bed_temperature"),
new VisibleButNotMappedToEngine("bed_shape"),
};
public static void WriteMatterSliceSettingsFile(string outputFilename)

1
StaticData/PrinterSettings/3D Stuffmaker/Core/config.ini
View file

@ -61,6 +61,7 @@ has_power_control = 0
has_sd_card_reader = 1
show_reset_connection = 1
heat_extruder_before_homing = 1
include_firmware_updater = Simple Arduino
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

1
StaticData/PrinterSettings/3D Stuffmaker/Creator/config.ini
View file

@ -61,6 +61,7 @@ has_power_control = 0
has_sd_card_reader = 0
show_reset_connection = 1
heat_extruder_before_homing = 1
include_firmware_updater = Simple Arduino
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

1
StaticData/PrinterSettings/3D Stuffmaker/Evolution/config.ini
View file

@ -61,6 +61,7 @@ has_power_control = 0
has_sd_card_reader = 0
show_reset_connection = 1
heat_extruder_before_homing = 1
include_firmware_updater = Simple Arduino
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

1
StaticData/PrinterSettings/3D Stuffmaker/Mega i3/config.ini
View file

@ -52,6 +52,7 @@ has_fan = 1
has_hardware_leveling = 0
has_heated_bed = 0
has_sd_card_reader = 0
include_firmware_updater = Simple Arduino
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

1
StaticData/PrinterSettings/3D Stuffmaker/i3 Plus+/config.ini
View file

@ -52,6 +52,7 @@ has_fan = 1
has_hardware_leveling = 0
has_heated_bed = 0
has_sd_card_reader = 0
include_firmware_updater = Simple Arduino
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

1
StaticData/PrinterSettings/Airwolf 3D/Axiom/config.ini
View file

@ -59,6 +59,7 @@ has_power_control = 0
has_sd_card_reader = 1
show_reset_connection = 0
heat_extruder_before_homing = 0
include_firmware_updater = Simple Arduino
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

1
StaticData/PrinterSettings/Airwolf 3D/HD-R/config.ini
View file

@ -43,6 +43,7 @@ gcode_comments = 0
gcode_flavor = reprap
has_hardware_leveling = 1
has_sd_card_reader = 1
include_firmware_updater = Simple Arduino
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

1
StaticData/PrinterSettings/Airwolf 3D/HD/config.ini
View file

@ -41,6 +41,7 @@ gcode_comments = 0
gcode_flavor = reprap
has_hardware_leveling = 1
has_sd_card_reader = 1
include_firmware_updater = Simple Arduino
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

1
StaticData/PrinterSettings/Airwolf 3D/HD2x/config.ini
View file

@ -43,6 +43,7 @@ gcode_comments = 0
gcode_flavor = reprap
has_hardware_leveling = 1
has_sd_card_reader = 1
include_firmware_updater = Simple Arduino
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

1
StaticData/PrinterSettings/Airwolf 3D/HDL/config.ini
View file

@ -43,6 +43,7 @@ has_fan = 1
has_hardware_leveling = 1
has_heated_bed = 0
has_sd_card_reader = 1
include_firmware_updater = Simple Arduino
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

1
StaticData/PrinterSettings/Airwolf 3D/HDx/config.ini
View file

@ -41,6 +41,7 @@ gcode_comments = 0
gcode_flavor = reprap
has_hardware_leveling = 1
has_sd_card_reader = 1
include_firmware_updater = Simple Arduino
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

1
StaticData/PrinterSettings/Airwolf 3D/XL/config.ini
View file

@ -39,6 +39,7 @@ gap_fill_speed = 20
gcode_arcs = 0
gcode_comments = 0
gcode_flavor = reprap
include_firmware_updater = Simple Arduino
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

1
StaticData/PrinterSettings/Airwolf 3D/v5.5/config.ini
View file

@ -39,6 +39,7 @@ gap_fill_speed = 20
gcode_arcs = 0
gcode_comments = 0
gcode_flavor = reprap
include_firmware_updater = Simple Arduino
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

1
StaticData/PrinterSettings/JumpStart/V1/config.ini
View file

@ -61,6 +61,7 @@ has_power_control = 0
has_sd_card_reader = 1
show_reset_connection = 0
heat_extruder_before_homing = 1
include_firmware_updater = Simple Arduino
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

1
StaticData/PrinterSettings/MAKEiT/Pro/config.ini
View file

@ -51,6 +51,7 @@ has_hardware_leveling = 0
has_heated_bed = 1
has_sd_card_reader = 1
heat_extruder_before_homing = 1
include_firmware_updater = Simple Arduino
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

91
StaticData/PrinterSettings/OpenBeam/Kossel Pro/config.ini
View file

@ -1,20 +1,21 @@
avoid_crossing_perimeters = 1
bed_shape = circular
bed_size = 240,240
bed_temperature = 0
bed_size = 250,250
bed_temperature = 65
bottom_clip_amount = 0
bottom_solid_layers = 5
bridge_acceleration = 0
bridge_fan_speed = 100
bridge_flow_ratio = 1
bridge_speed = 30
bridge_speed = 120
brim_width = 0
build_height = 280
cancel_gcode = G28
build_height = 0
cancel_gcode =
center_part_on_bed = 1
complete_objects = 0
connect_gcode =
cool_extruder_lift = 0
print_leveling_solution = 7 Point Disk
cool_extruder_lift = 1
print_leveling_solution = 3 Point Plane
print_leveling_method = Manual
print_leveling_required_to_print = 0
manual_probe_paper_width = .1
@ -22,8 +23,8 @@ cooling = 1
create_raft = 0
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 = 30
end_gcode = G28 ; Home to top 3 endstops when done\nG92 E0; Reset Extruder axis\nG01 E-15 F600; Retract filament to prevent blobbing;\nM104 S0; Kill extruder temp\nM140 S0; Kill bed temperature\nM84; Disable motors
external_perimeter_speed = 40
external_perimeters_first = 0
extra_perimeters = 1
extruder_clearance_height = 20
@ -37,14 +38,15 @@ extrusion_multiplier = 1
extrusion_width = 0
fan_always_on = 0
fan_below_layer_time = 60
filament_diameter = 1.75
filament_diameter = 1.72
fill_angle = 45
fill_density = 0.2
fill_density = 25%
fill_pattern = honeycomb
first_layer_acceleration = 0
first_layer_bed_temperature = 75
first_layer_height = 0.25
first_layer_speed = 20
first_layer_extrusion_width = 100%
first_layer_height = 0.2
first_layer_speed = 50%
first_layer_temperature = 205
g0 = 0
gap_fill_speed = 20
@ -65,18 +67,19 @@ infill_extruder = 1
infill_extrusion_width = 0
infill_first = 0
infill_only_where_needed = 0
infill_overlap_perimeter = .06
infill_speed = 65
infill_type = TRIANGLES
infill_overlap_perimeter = 0.08
infill_speed = 40
infill_type = HEXAGON
layer_gcode =
layer_height = 0.2
layer_to_pause =
max_fan_speed = 100
min_extrusion_before_retract = 1.5
min_fan_speed = 50
min_extrusion_before_retract = 4
min_fan_speed = 75
min_print_speed = 10
min_skirt_length = 0
notes =
nozzle_diameter = 0.4
nozzle_diameter = 0.35
only_retract_when_crossing_perimeters = 1
ooze_prevention = 0
output_filename_format = [input_filename_base].gcode
@ -85,13 +88,14 @@ pause_gcode =
perimeter_acceleration = 0
perimeter_extruder = 1
perimeter_extrusion_width = 0
external_perimeter_extrusion_width = 100%
perimeter_speed = 40
perimeters = 3
post_process =
print_center = 0,0
raft_air_gap = .2
raft_extruder = 0
raft_extra_distance_around_part = 3
raft_extra_distance_around_part = 5
raft_fan_speed_percent = 100
raft_layers = 0
raft_print_speed = 100%
@ -101,18 +105,19 @@ repair_outlines_extensive_stitching = 1
repair_outlines_keep_open = 1
resolution = 0
resume_gcode =
retract_before_travel = 10
retract_before_travel = 2
retract_layer_change = 1
retract_length = 3
retract_length_tool_change = 0
retract_lift = 0.3
retract_length = 1
retract_length_tool_change = 1
retract_lift = 0.05
retract_restart_extra = 0
retract_restart_extra_toolchange = 0
retract_speed = 40
skirt_distance = 3
retract_when_changing_islands = 1
retract_speed = 120
skirt_distance = 5
skirt_height = 1
skirts = 1
slowdown_below_layer_time = 20
skirts = 5
slowdown_below_layer_time = 10
small_perimeter_speed = 30
solid_fill_pattern = rectilinear
solid_infill_below_area = 70
@ -122,39 +127,43 @@ solid_infill_speed = 60
solid_shell = 0
spiral_vase = 0
standby_temperature_delta = -5
start_gcode = G28 ; home all axes\nG29 Z0.6\n
start_gcode = M220 S100 ; Set feedmultiply back to normal (100%)\nM104 S225; Start heating up for first layer\nM140 S65; Preheat Bed\nG28 ; Home to top 3 endstops\nM109 S225; Wait until temperature is reached\nG29 Z-0.1 ; Autolevel and adjust first layer slightly thinner - NOTE: FIRMWARE 0.80.33; use Z9.25 as starting value for Firmware 0.80.2\n\n\n\n; Squirt and wipe ;;\n\nM104 S210\nG00 X110 Y-120 Z0.2\nG92 E0; \nG01 E50 F100; Extrude a little bit to replace oozage from auto levelling\nG01 X110 Y-120\nG01 Z0.05\nG01 X75 Y-75 F6000\nG01 Z5\nG01 X110 Y-120\nG01 Z0.05\nG01 X75 Y-75 F6000\nG01 Z5\nG01 X110 Y-120\nG01 Z0.05\nG01 X75 Y-75 F6000\nG01 Z5\nG01 X110 Y-120\nG01 Z0.05\nG01 X75 Y-75 F6000\nG01 Z20\n\n; Now ready to start program G-Code\n\nM107; Turn fan off for the first layer
start_perimeters_at_concave_points = 0
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 = 1
support_material_create_perimeter = 1
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 = 0
support_material_interface_layers = .9mm
support_material_interface_spacing = 0
support_material_pattern = honeycomb
support_material_spacing = 2.5
support_material_speed = 20
support_material_threshold = 45
support_material_xy_distance = 1
support_material_speed = 40
support_material_threshold = 0
support_material_xy_distance = 0.7
support_material_z_distance = 0.15
support_material_z_gap_layers = 0.2mm
support_type = LINES
temperature = 235
support_material_z_gap_layers = .3mm
support_type = GRID
temperature = 210
thin_walls = 1
threads = 2
toolchange_gcode =
top_infill_extrusion_width = 0
top_solid_infill_speed = 50
top_solid_layers = 0.8mm
travel_speed = 200
top_solid_layers = 5
travel_speed = 300
use_firmware_retraction = 0
use_relative_e_distances = 0
vibration_limit = 0
wipe = 0
wipe = 1
wipe_shield_distance = 0
wipe_tower_size = 0
z_can_be_negative = 0
z_offset = 0
z_can_be_negative = 1
z_offset = 0

1
StaticData/PrinterSettings/Organic Thinking System/DeltaBot-K/config.ini
View file

@ -49,6 +49,7 @@ gcode_output_type = REPRAP
has_fan = 1
has_heated_bed = 1
has_sd_card_reader = 1
include_firmware_updater = Simple Arduino
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

1
StaticData/PrinterSettings/ROBO 3D/R1 & R1 +Plus/config.ini
View file

@ -48,6 +48,7 @@ gcode_flavor = reprap
gcode_output_type = REPRAP
has_sd_card_reader = 1
has_hardware_leveling = 1
include_firmware_updater = Simple Arduino
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

1
StaticData/PrinterSettings/Revolution 3D Printers/INF3D-AF1-DE/config.ini
View file

@ -52,6 +52,7 @@ has_heated_bed = 1
has_sd_card_reader = 1
show_reset_connection = 1
heat_extruder_before_homing = 0
include_firmware_updater = Simple Arduino
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

1
StaticData/PrinterSettings/Revolution 3D Printers/INF3D-AF1-SE/config.ini
View file

@ -52,6 +52,7 @@ has_heated_bed = 1
has_sd_card_reader = 1
show_reset_connection = 1
heat_extruder_before_homing = 0
include_firmware_updater = Simple Arduino
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

1
StaticData/PrinterSettings/config.ini
View file

@ -61,6 +61,7 @@ has_power_control=0
has_sd_card_reader = 0
show_reset_connection = 0
heat_extruder_before_homing = 0
include_firmware_updater = None
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1

1
StaticData/SliceSettings/Layouts.txt
View file

@ -265,6 +265,7 @@ Advanced
has_sd_card_reader
has_power_control
show_reset_connection
include_firmware_updater
extruder_count
heat_extruder_before_homing
extruders_share_temperature

8
StaticData/SliceSettings/Properties.json
View file

@ -427,6 +427,14 @@
"DataEditType": "HARDWARE_PRESENT",
"ExtraSettings": ""
},
{
"SlicerConfigName": "include_firmware_updater",
"PresentationName": "Show Firmware Updater",
"HelpText": "This will only work on specific hardware. Do not use unless you are sure your printer controller supports this feature",
"DataEditType": "LIST",
"ExtraSettings": "None,Simple Arduino"
},
{
"SlicerConfigName": "has_power_control",
"PresentationName": "Has Power Control",