GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 05:58:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.6' into CURA-5857_fix_machine_settings_set_diameter

Browse Source
This commit is contained in:
Diego Prado Gesto 2018-10-25 15:57:26 +02:00
commit 197bf057cc
30 changed files with 430 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cura/Settings/CuraStackBuilder.py
View File

@ -145,7 +145,6 @@ class CuraStackBuilder:
quality_container = application.empty_quality_container
)
new_extruder.setNextStack(global_stack)
global_stack.addExtruder(new_extruder)
registry.addContainer(new_extruder)

2
cura/Settings/ExtruderManager.py
View File

@ -374,8 +374,6 @@ class ExtruderManager(QObject):
extruder_definition = container_registry.findDefinitionContainers(id = expected_extruder_definition_0_id)[0]
extruder_stack_0.definition = extruder_definition
extruder_stack_0.setNextStack(global_stack)
## Get all extruder values for a certain setting.
#
# This is exposed to qml for display purposes

19
plugins/PostProcessingPlugin/scripts/FilamentChange.py
View File

@ -1,5 +1,6 @@
# This PostProcessing Plugin script is released
# under the terms of the AGPLv3 or higher
# Copyright (c) 2018 Ultimaker B.V.
# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher.
from typing import Optional, Tuple
from UM.Logger import Logger
@ -54,17 +55,17 @@ class FilamentChange(Script):
layer_nums = self.getSettingValueByKey("layer_number")
initial_retract = self.getSettingValueByKey("initial_retract")
later_retract = self.getSettingValueByKey("later_retract")
color_change = "M600"
if initial_retract is not None and initial_retract > 0.:
color_change = color_change + (" E-%.2f" % initial_retract)
color_change = color_change + (" E%.2f" % initial_retract)
if later_retract is not None and later_retract > 0.:
color_change = color_change + (" L-%.2f" % later_retract)
color_change = color_change + (" L%.2f" % later_retract)
color_change = color_change + " ; Generated by FilamentChange plugin"
layer_targets = layer_nums.split(",")
if len(layer_targets) > 0:
for layer_num in layer_targets:

88
resources/definitions/anycubic_4max.def.json Normal file
View File

@ -0,0 +1,88 @@
{
"version": 2,
"name": "Anycubic 4Max",
"inherits": "fdmprinter",
"metadata":
{
"visible": true,
"author": "Jason Scurtu",
"manufacturer": "Anycubic",
"category": "Other",
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker2",
"platform": "anycubic_4max_platform.stl",
"has_materials": true,
"quality_definition": "anycubic_4max",
"has_machine_quality": true,
"preferred_quality_type": "normal",
"machine_extruder_trains":
{
"0": "anycubic_4max_extruder_0"
}
},
"overrides":
{
"machine_name": { "default_value": "Anycubic 4Max" },
"machine_heated_bed": { "default_value": true },
"machine_width": { "default_value": 220 },
"machine_height": {"default_value": 300 },
"machine_depth": { "default_value": 220 },
"machine_center_is_zero": { "default_value": false },
"machine_max_feedrate_x": { "default_value": 300 },
"machine_max_feedrate_y": { "default_value": 300 },
"machine_max_feedrate_z": { "default_value": 10 },
"machine_acceleration": { "default_value": 1500 },
"machine_max_acceleration_x": { "default_value": 1500 },
"machine_max_acceleration_y": { "default_value": 1500 },
"machine_max_acceleration_z": { "default_value": 100 },
"machine_max_jerk_xy": { "default_value": 11.0 },
"machine_max_jerk_z": { "default_value": 0.4 },
"machine_max_jerk_e": { "default_value": 11.0 },
"jerk_enabled": { "value": "True" },
"jerk_layer_0": { "value": "jerk_topbottom" },
"jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" },
"jerk_print": { "value": "11" },
"jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" },
"jerk_support_interface": { "value": "jerk_topbottom" },
"jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" },
"jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
"jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
"gantry_height": { "default_value": 25.0 },
"skin_overlap": { "value": "10" },
"acceleration_enabled": { "value": "True" },
"acceleration_layer_0": { "value": "acceleration_topbottom" },
"acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
"acceleration_print": { "value": "900" },
"acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
"acceleration_support_interface": { "value": "acceleration_topbottom" },
"acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
"acceleration_travel": { "value": "acceleration_print" },
"acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
"acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" },
"speed_layer_0": { "value": "20" },
"speed_print": { "value": "40" },
"speed_support": { "value": "speed_wall_0" },
"speed_support_interface": { "value": "speed_topbottom" },
"speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" },
"speed_travel": { "value": "60" },
"speed_wall": { "value": "math.ceil(speed_print * 30 / 35)" },
"speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" },
"speed_wall_x": { "value": "speed_wall" },
"infill_pattern": {"value": "'zigzag'" },
"infill_before_walls": {"value": false },
"adhesion_type": { "default_value": "skirt" },
"material_bed_temperature": { "maximum_value": "150" },
"material_bed_temperature_layer_0": { "maximum_value": "150" },
"machine_gcode_flavor":{"default_value": "RepRap (Marlin/Sprinter)"},
"machine_start_gcode":{"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F{speed_travel} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{speed_travel}\nM117 Printing...\nG5"},
"machine_end_gcode":{"default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle\nto release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops\nso the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000"}
}
}

2
resources/definitions/tizyx_k25.def.json
View File

@ -14,6 +14,8 @@
"preferred_material": "tizyx_pla",
"has_machine_quality": true,
"has_materials": true,
"has_variants": true,
"preferred_variant_name": "0.4 mm",
"machine_extruder_trains":
{
"0": "tizyx_k25_extruder_0"

16
resources/extruders/anycubic_4max_extruder_0.def.json Normal file
View File

@ -0,0 +1,16 @@
{
"id": "anycubic_4max_extruder_0",
"version": 2,
"name": "Extruder 1",
"inherits": "fdmextruder",
"metadata": {
"machine": "anycubic_4max",
"position": "0"
},
"overrides": {
"extruder_nr": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 }
}
}

BIN
resources/meshes/anycubic_4max_platform.stl Normal file
View File

Binary file not shown.

15
resources/quality/anycubic_4max/abs/anycubic_4max_abs_draft.inst.cfg Normal file
View File

@ -0,0 +1,15 @@
[general]
version = 4
name = Draft
definition = anycubic_4max
[metadata]
setting_version = 5
type = quality
quality_type = draft
weight = 0
material = generic_abs
[values]
cool_fan_enabled = False
adhesion_type = brim

15
resources/quality/anycubic_4max/abs/anycubic_4max_abs_high.inst.cfg Normal file
View File

@ -0,0 +1,15 @@
[general]
version = 4
name = High
definition = anycubic_4max
[metadata]
setting_version = 5
type = quality
quality_type = high
weight = 2
material = generic_abs
[values]
cool_fan_enabled = False
adhesion_type = brim

16
resources/quality/anycubic_4max/abs/anycubic_4max_abs_normal.inst.cfg Normal file
View File

@ -0,0 +1,16 @@
[general]
version = 4
name = Normal
definition = anycubic_4max
[metadata]
setting_version = 5
type = quality
quality_type = normal
weight = 1
material = generic_abs
[values]
cool_fan_enabled = False
adhesion_type = brim

15
resources/quality/anycubic_4max/anycubic_4max_draft.inst.cfg Normal file
View File

@ -0,0 +1,15 @@
[general]
version = 4
name = Draft
definition = anycubic_4max
[metadata]
setting_version = 5
type = quality
quality_type = draft
weight = 0
global_quality = True
[values]
layer_height = 0.3

15
resources/quality/anycubic_4max/anycubic_4max_high.inst.cfg Normal file
View File

@ -0,0 +1,15 @@
[general]
version = 4
name = High
definition = anycubic_4max
[metadata]
setting_version = 5
type = quality
quality_type = high
weight = 2
global_quality = True
[values]
layer_height = 0.15

14
resources/quality/anycubic_4max/anycubic_4max_normal.inst.cfg Normal file
View File

@ -0,0 +1,14 @@
[general]
version = 4
name = Normal
definition = anycubic_4max
[metadata]
setting_version = 5
type = quality
quality_type = normal
weight = 1
global_quality = True
[values]
layer_height = 0.2

14
resources/quality/anycubic_4max/hips/anycubic_4max_hips_draft.inst.cfg Normal file
View File

@ -0,0 +1,14 @@
[general]
version = 4
name = Draft
definition = anycubic_4max
[metadata]
setting_version = 5
type = quality
quality_type = draft
weight = 0
material = generic_hips
[values]

14
resources/quality/anycubic_4max/hips/anycubic_4max_hips_high.inst.cfg Normal file
View File

@ -0,0 +1,14 @@
[general]
version = 4
name = High
definition = anycubic_4max
[metadata]
setting_version = 5
type = quality
quality_type = high
weight = 2
material = generic_hips
[values]

14
resources/quality/anycubic_4max/hips/anycubic_4max_hips_normal.inst.cfg Normal file
View File

@ -0,0 +1,14 @@
[general]
version = 4
name = Normal
definition = anycubic_4max
[metadata]
setting_version = 5
type = quality
quality_type = normal
weight = 1
material = generic_hips
[values]

18
resources/quality/anycubic_4max/petg/anycubic_4max_petg_draft.inst.cfg Normal file
View File

@ -0,0 +1,18 @@
[general]
version = 4
name = Draft
definition = anycubic_4max
[metadata]
setting_version = 5
type = quality
quality_type = draft
weight = 0
material = generic_petg
[values]
material_print_temperature = =default_material_print_temperature + 35
material_bed_temperature = 70
cool_fan_enabled = False
speed_print = 30

18
resources/quality/anycubic_4max/petg/anycubic_4max_petg_high.inst.cfg Normal file
View File

@ -0,0 +1,18 @@
[general]
version = 4
name = High
definition = anycubic_4max
[metadata]
setting_version = 5
type = quality
quality_type = high
weight = 2
material = generic_petg
[values]
material_print_temperature = =default_material_print_temperature + 35
material_bed_temperature = 70
cool_fan_enabled = False
speed_print = 30

18
resources/quality/anycubic_4max/petg/anycubic_4max_petg_normal.inst.cfg Normal file
View File

@ -0,0 +1,18 @@
[general]
version = 4
name = Normal
definition = anycubic_4max
[metadata]
setting_version = 5
type = quality
quality_type = normal
weight = 1
material = generic_petg
[values]
material_print_temperature = =default_material_print_temperature + 35
material_bed_temperature = 70
cool_fan_enabled = False
speed_print = 30

15
resources/quality/anycubic_4max/pla/anycubic_4max_pla_draft.inst.cfg Normal file
View File

@ -0,0 +1,15 @@
[general]
version = 4
name = Draft
definition = anycubic_4max
[metadata]
setting_version = 5
type = quality
quality_type = draft
weight = 0
material = generic_pla
[values]

14
resources/quality/anycubic_4max/pla/anycubic_4max_pla_high.inst.cfg Normal file
View File

@ -0,0 +1,14 @@
[general]
version = 4
name = High
definition = anycubic_4max
[metadata]
setting_version = 5
type = quality
quality_type = high
weight = 2
material = generic_pla
[values]

14
resources/quality/anycubic_4max/pla/anycubic_4max_pla_normal.inst.cfg Normal file
View File

@ -0,0 +1,14 @@
[general]
version = 4
name = Normal
definition = anycubic_4max
[metadata]
setting_version = 5
type = quality
quality_type = normal
weight = 1
material = generic_pla
[values]

2
resources/quality/tizyx_k25/tizyx_k25_normal.inst.cfg
View File

@ -17,8 +17,6 @@ cool_fan_speed_0 = 100
fill_outline_gaps = True
infill_angles = [0,90 ]
infill_sparse_density = 15
layer_height = 0.2
layer_height_0 = 0.25
material_diameter = 1.75
retraction_amount = 2.5
retraction_min_travel = 2

12
resources/variants/tizyx_k25_0.2.inst.cfg Normal file
View File

@ -0,0 +1,12 @@
[general]
name = 0.2 mm
version = 4
definition = tizyx_k25
[metadata]
setting_version = 5
type = variant
hardware_type = nozzle
[values]
machine_nozzle_size = 0.2

12
resources/variants/tizyx_k25_0.3.inst.cfg Normal file
View File

@ -0,0 +1,12 @@
[general]
name = 0.3 mm
version = 4
definition = tizyx_k25
[metadata]
setting_version = 5
type = variant
hardware_type = nozzle
[values]
machine_nozzle_size = 0.3

12
resources/variants/tizyx_k25_0.4.inst.cfg Normal file
View File

@ -0,0 +1,12 @@
[general]
name = 0.4 mm
version = 4
definition = tizyx_k25
[metadata]
setting_version = 5
type = variant
hardware_type = nozzle
[values]
machine_nozzle_size = 0.4

13
resources/variants/tizyx_k25_0.5.inst.cfg Normal file
View File

@ -0,0 +1,13 @@
[general]
name = 0.5 mm
version = 4
definition = tizyx_k25
[metadata]
setting_version = 5
type = variant
hardware_type = nozzle
[values]
machine_nozzle_size = 0.5

12
resources/variants/tizyx_k25_0.6.inst.cfg Normal file
View File

@ -0,0 +1,12 @@
[general]
name = 0.6 mm
version = 4
definition = tizyx_k25
[metadata]
setting_version = 5
type = variant
hardware_type = nozzle
[values]
machine_nozzle_size = 0.6

12
resources/variants/tizyx_k25_0.8.inst.cfg Normal file
View File

@ -0,0 +1,12 @@
[general]
name = 0.8 mm
version = 4
definition = tizyx_k25
[metadata]
setting_version = 5
type = variant
hardware_type = nozzle
[values]
machine_nozzle_size = 0.8

12
resources/variants/tizyx_k25_1.0.inst.cfg Normal file
View File

@ -0,0 +1,12 @@
[general]
name = 1.0 mm
version = 4
definition = tizyx_k25
[metadata]
setting_version = 5
type = variant
hardware_type = nozzle
[values]
machine_nozzle_size = 1.0