3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/3.5'

Browse source
This commit is contained in:
Lipu Fei 2018-10-09 12:04:53 +02:00
commit 1951391a23
3 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plugins/CuraEngineBackend/StartSliceJob.py
View file

@ -251,7 +251,10 @@ class StartSliceJob(Job):
self._buildGlobalInheritsStackMessage(stack) self._buildGlobalInheritsStackMessage(stack)
# Build messages for extruder stacks # Build messages for extruder stacks
for extruder_stack in ExtruderManager.getInstance().getMachineExtruders(stack.getId()): # Send the extruder settings in the order of extruder positions. Somehow, if you send e.g. extruder 3 first,
# then CuraEngine can slice with the wrong settings. This I think should be fixed in CuraEngine as well.
extruder_stack_list = sorted(list(global_stack.extruders.items()), key = lambda item: int(item[0]))
for _, extruder_stack in extruder_stack_list:
self._buildExtruderMessage(extruder_stack) self._buildExtruderMessage(extruder_stack)
for group in filtered_object_groups: for group in filtered_object_groups:

5
resources/definitions/creality_ender3.def.json
View file

@ -9,7 +9,8 @@
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"platform": "creality_ender3_platform.stl", "platform": "creality_ender3_platform.stl",
"preferred_quality_type": "draft", "preferred_quality_type": "draft",
"machine_extruder_trains": { "machine_extruder_trains":
{
"0": "creality_ender3_extruder_0" "0": "creality_ender3_extruder_0"
} }
}, },
@ -86,4 +87,4 @@
"default_value": "; Ender 3 Custom End G-code\nG4 ; Wait\nM220 S100 ; Reset Speed factor override percentage to default (100%)\nM221 S100 ; Reset Extrude factor override percentage to default (100%)\nG91 ; Set coordinates to relative\nG1 F1800 E-3 ; Retract filament 3 mm to prevent oozing\nG1 F3000 Z10 ; Move Z Axis up 10 mm to allow filament ooze freely\nG90 ; Set coordinates to absolute\nG1 X0 Y{machine_depth} F1000 ; Move Heat Bed to the front for easy print removal\nM104 S0 ; Turn off Extruder temperature\nM140 S0 ; Turn off Heat Bed\nM106 S0 ; Turn off Cooling Fan\nM107 ; Turn off Fan\nM84 ; Disable stepper motors" "default_value": "; Ender 3 Custom End G-code\nG4 ; Wait\nM220 S100 ; Reset Speed factor override percentage to default (100%)\nM221 S100 ; Reset Extrude factor override percentage to default (100%)\nG91 ; Set coordinates to relative\nG1 F1800 E-3 ; Retract filament 3 mm to prevent oozing\nG1 F3000 Z10 ; Move Z Axis up 10 mm to allow filament ooze freely\nG90 ; Set coordinates to absolute\nG1 X0 Y{machine_depth} F1000 ; Move Heat Bed to the front for easy print removal\nM104 S0 ; Turn off Extruder temperature\nM140 S0 ; Turn off Heat Bed\nM106 S0 ; Turn off Cooling Fan\nM107 ; Turn off Fan\nM84 ; Disable stepper motors"
} }
} }
} }

14
resources/extruders/creality_ender3_extruder_0.def.json
View file

@ -9,14 +9,8 @@
}, },
"overrides": { "overrides": {
"extruder_nr": { "extruder_nr": { "default_value": 0 },
"default_value": 0 "machine_nozzle_size": { "default_value": 0.4 },
}, "material_diameter": { "default_value": 1.75 }
"machine_nozzle_size": {
"default_value": 0.4
},
"material_diameter": {
"default_value": 1.75
}
} }
} }