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

Merge pull request #245 from gregory-diaz/development

Browse source 
Development
This commit is contained in:
Lars Brubaker 2015-04-30 15:49:46 -07:00
commit f73cacca93
4 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
SlicerConfiguration/SlicerMapping/EngineMappingMatterSlice.cs
View file

@ -213,6 +213,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
new VisibleButNotMappedToEngine("", "has_sd_card_reader"), new VisibleButNotMappedToEngine("", "has_sd_card_reader"),
new VisibleButNotMappedToEngine("", "z_can_be_negative"), new VisibleButNotMappedToEngine("", "z_can_be_negative"),
new VisibleButNotMappedToEngine("", "show_reset_connection"), new VisibleButNotMappedToEngine("", "show_reset_connection"),
new VisibleButNotMappedToEngine("", "extruder_wipe_temperature"),
new VisibleButNotMappedToEngine("", "bed_remove_part_temperature"),
//retractionOnExtruderSwitch=14.5 //retractionOnExtruderSwitch=14.5
new MapItem("retractionOnExtruderSwitch", "retract_length_tool_change"), new MapItem("retractionOnExtruderSwitch", "retract_length_tool_change"),

2
StaticData/PrinterSettings/config.ini
View file

@ -26,6 +26,7 @@ extruder_clearance_height = 20
extruder_clearance_radius = 20 extruder_clearance_radius = 20
extruder_count = 1 extruder_count = 1
extruder_offset = 0x0,0x0,0x0,0x0 extruder_offset = 0x0,0x0,0x0,0x0
extruder_wipe_temperature = 0
extruders_share_temperature = 0 extruders_share_temperature = 0
extrusion_axis = E extrusion_axis = E
extrusion_multiplier = 1 extrusion_multiplier = 1
@ -90,6 +91,7 @@ raft_extra_distance_around_part = 5
raft_fan_speed_percent = 100 raft_fan_speed_percent = 100
raft_layers = 0 raft_layers = 0
raft_print_speed = 100% raft_print_speed = 100%
bed_remove_part_temperature = 0
randomize_start = 0 randomize_start = 0
repair_outlines_extensive_stitching = 0 repair_outlines_extensive_stitching = 0
repair_outlines_keep_open = 0 repair_outlines_keep_open = 0

7
StaticData/SliceSettings/Layouts.txt
View file

@ -43,11 +43,14 @@ Intermediate
Filament Filament
Filament Filament
filament_diameter filament_diameter
Temperature (°C) Extruder Temperature (°C)
first_layer_temperature first_layer_temperature
temperature temperature
extruder_wipe_temperature
Bed Temperature (°C)
first_layer_bed_temperature first_layer_bed_temperature
bed_temperature bed_temperature
bed_remove_part_temperature
Retraction Retraction
retract_length retract_length
retract_speed retract_speed
@ -197,9 +200,11 @@ Advanced
Extruder Temperature (°C) Extruder Temperature (°C)
first_layer_temperature first_layer_temperature
temperature temperature
extruder_wipe_temperature
Bed Temperature (°C) Bed Temperature (°C)
first_layer_bed_temperature first_layer_bed_temperature
bed_temperature bed_temperature
bed_remove_part_temperature
Retraction Retraction
retract_length retract_length
retract_length_tool_change retract_length_tool_change

14
StaticData/SliceSettings/Properties.json
View file

@ -976,6 +976,20 @@
"DataEditType": "POSITIVE_DOUBLE", "DataEditType": "POSITIVE_DOUBLE",
"ExtraSettings": "degrees" "ExtraSettings": "degrees"
}, },
{
"SlicerConfigName": "extruder_wipe_temperature",
"PresentationName": "Extruder Wipe Temperature",
"HelpText": "The temperature the extruder will be when extruder wipes.",
"DataEditType": "POSITIVE_DOUBLE",
"ExtraSettings": "degrees"
},
{
"SlicerConfigName": "bed_remove_part_temperature",
"PresentationName": "Bed Remove Part Temperature",
"HelpText": "The temperature the bed temperature will be set to when part is to be removed.",
"DataEditType": "POSITIVE_DOUBLE",
"ExtraSettings": "degrees"
},
{ {
"SlicerConfigName": "thin_walls", "SlicerConfigName": "thin_walls",
"PresentationName": "Thin Walls", "PresentationName": "Thin Walls",