3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 05:23:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'CURA-7318_Ironing_offsets_with_half_a_skin_line_width'

Browse source
This commit is contained in:
Ghostkeeper 2020-05-25 11:48:05 +02:00
commit be9029b33e
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/definitions/fdmprinter.def.json
View file

@ -1575,7 +1575,7 @@
"type": "float",
"unit": "mm",
"default_value": 0.35,
"value": "wall_line_width_0 / 2 + skin_line_width * (1.0 - ironing_flow) / 2",
"value": "wall_line_width_0 / 2 + (ironing_line_spacing - skin_line_width * (1.0 + ironing_flow / 100) / 2 if ironing_pattern == 'concentric' else skin_line_width * (1.0 - ironing_flow / 100) / 2)",
"minimum_value_warning": "0",
"maximum_value_warning": "wall_line_width_0",
"enabled": "ironing_enabled",

2
resources/definitions/hms434.def.json
View file

@ -104,7 +104,7 @@
"skin_outline_count": {"value": "0"},
"ironing_line_spacing": {"value": "line_width / 4 * 3"},
"ironing_flow": {"value": "0"},
"ironing_inset": {"value": "ironing_line_spacing + skin_line_width * (1.0 - ironing_flow) / 2"},
"ironing_inset": {"value": "ironing_line_spacing + (ironing_line_spacing - skin_line_width * (1.0 + ironing_flow / 100) / 2 if ironing_pattern == 'concentric' else skin_line_width * (1.0 - ironing_flow / 100) / 2)"},
"speed_ironing": {"value": "150"},
"infill_sparse_density": {"value": 30},

2
resources/definitions/skriware_2.def.json
View file

@ -345,7 +345,7 @@
"value": "0.8"
},
"ironing_inset": {
"value": "0.2 + skin_line_width * (1.0 - ironing_flow) / 2"
"value": "0.2 + (ironing_line_spacing - skin_line_width * (1.0 + ironing_flow / 100) / 2 if ironing_pattern == 'concentric' else skin_line_width * (1.0 - ironing_flow / 100) / 2)"
},
"jerk_travel": {
"value": "10"