3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-06-26 09:25:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge remote-tracking branch 'origin/main' into CURA-12543_painting_ux
Some checks failed
conan-package-resources / conan-package (push) Has been cancelled
Details
conan-package / conan-package (push) Has been cancelled
Details
printer-linter-format / Printer linter auto format (push) Has been cancelled
Details
unit-test / Run unit tests (push) Has been cancelled
Details
conan-package-resources / signal-curator (push) Has been cancelled
Details

Browse source
This commit is contained in:
Erwan MATHIEU 2025-06-24 13:37:23 +02:00
commit a1d1dc2ea0
13 changed files with 240 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
.github/workflows/find-packages.yml vendored Normal file
View file

@ -0,0 +1,25 @@
name: Conan Package Discovery by Jira Ticket
on:
workflow_dispatch:
inputs:
jira_ticket_number:
description: 'Jira ticket number for Conan package discovery (e.g., cura_12345)'
required: true
type: string
start_builds:
default: false
required: false
type: boolean
permissions:
contents: read
jobs:
find-packages:
name: Find packages for Jira ticket
uses: ultimaker/cura-workflows/.github/workflows/find-package-by-ticket.yml@jira_find_package
with:
jira_ticket_number: ${{ inputs.jira_ticket_number }}
start_builds: ${{ inputs.start_builds }}
secrets: inherit

4
cura/LayerPolygon.py
View file

@ -25,7 +25,8 @@ class LayerPolygon:
PrimeTowerType = 11
MoveWhileRetractingType = 12
MoveWhileUnretractingType = 13
__number_of_types = 14
StationaryRetractUnretract = 14
__number_of_types = 15
__jump_map = numpy.logical_or(numpy.logical_or(numpy.logical_or(
numpy.arange(__number_of_types) == NoneType,
@ -281,6 +282,7 @@ class LayerPolygon:
theme.getColor("layerview_prime_tower").getRgbF(), # PrimeTowerType
theme.getColor("layerview_move_while_retracting").getRgbF(), # MoveWhileRetracting
theme.getColor("layerview_move_while_unretracting").getRgbF(), # MoveWhileUnretracting
theme.getColor("layerview_move_retraction").getRgbF(), # StationaryRetractUnretract
])
return cls.__color_map

8
plugins/CuraEngineBackend/Cura.proto
View file

@ -80,10 +80,14 @@ message Polygon {
SkirtType = 5;
InfillType = 6;
SupportInfillType = 7;
MoveUnretractedType = 8;
MoveRetractedType = 9;
MoveUnretracted = 8;
MoveRetracted = 9;
SupportInterfaceType = 10;
PrimeTowerType = 11;
MoveWhileRetracting = 12;
MoveWhileUnretracting = 13;
StationaryRetractUnretract = 14;
NumPrintFeatureTypes = 15;
}
Type type = 1; // Type of move
bytes points = 2; // The points of the polygon, or two points if only a line segment (Currently only line segments are used)

6
plugins/SimulationView/SimulationViewMenuComponent.qml
View file

@ -229,7 +229,7 @@ Cura.ExpandableComponent
{
const travelsTypesModel = [
{
label: catalog.i18nc("@label", "Unretracted"),
label: catalog.i18nc("@label", "Not retracted"),
colorId: "layerview_move_combing"
},
{
@ -241,7 +241,7 @@ Cura.ExpandableComponent
colorId: "layerview_move_while_retracting"
},
{
label: catalog.i18nc("@label", "Unretracting"),
label: catalog.i18nc("@label", "Priming"),
colorId: "layerview_move_while_unretracting"
}
];
@ -339,7 +339,7 @@ Cura.ExpandableComponent
height: UM.Theme.getSize("layerview_row").height + UM.Theme.getSize("default_lining").height
width: UM.Theme.getSize("layerview_menu_size").width
color: UM.Theme.getColor("setting_control_text")
color: UM.Theme.getColor("tooltip_text")
Rectangle
{
anchors.verticalCenter: parent.verticalCenter

52
resources/definitions/anycubic_kobra3v2.def.json Normal file
View file

@ -0,0 +1,52 @@
{
"version": 2,
"name": "Anycubic Kobra 3 v2",
"inherits": "fdmprinter",
"metadata":
{
"visible": true,
"author": "Sam Bonnekamp",
"manufacturer": "Anycubic",
"file_formats": "text/x-gcode",
"platform": "anycubic_kobra3v2_buildplate.stl",
"has_textured_buildplate": true,
"machine_extruder_trains": { "0": "anycubic_kobra3v2_extruder_0" }
},
"overrides":
{
"adhesion_type": { "value": "'skirt'" },
"layer_height": { "default_value": 0.2 },
"machine_buildplate_type": { "default_value": "PEI Spring Steel" },
"machine_center_is_zero": { "default_value": false },
"machine_depth": { "default_value": 250 },
"machine_end_gcode": { "default_value": "G1 X5 Y{machine_depth*0.95} F{speed_travel*60} ; present print\nM140 S0 ; turn off heat bed\nM104 S0 ; turn off temperature\nM84; disable motors ; disable stepper motors" },
"machine_heated_bed": { "default_value": true },
"machine_height": { "default_value": 260 },
"machine_name":
{
"default_value": "Anycubic Kobra 3 v2",
"description": "Anycubic Kobra 3 v2"
},
"machine_start_gcode": { "default_value": "; thumbnail begin 32x32\n; iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAX\n; NSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAARWSURBVHgB1Vc7bx1FFD5n/cC+YOQ4RBTXlg0STfIH\n; gM78h0SAhGgQjyqARO8eFEQFBaKhCHIoKagcOkJJQUWBI19XJLaJgp+5M8x5zZzdO+sg0ZCR1zM7u3\n; e+73znMbMAT0KLMVqPdKVhvuze+o2NjUafget7Gz4GeO3s7Ow29YiYiXSJ2TPft0BwEmZ2dpYnp+Ec\n; 8NPT09tpyOAhhF4CXSBPwhOvEZk+B/ynNFzd2QvwxlfHMEq9PqR//mVaWcegmqKCIf9FKGS2Px30Ey\n; A/Hh8fE/gWgRPomww+VkxVgYFoWcz3xXpUJo2QsXvEFu8qAQJvmobA13b3I1u+Q+AhQuRfB1kTBDS6\n; FUVmVBx5iwmqNIgNv9ONkUzg4ODgBQNn2b80yyNbCzFQqMsC4MCNg/eveSQGdQM6glhXYDAYbJHvRw\n; q+ux90dQ8eeBxacaD+5T5ZSdLbfIcT61hTgCZTuq1R/zqDjxMOva6SKzBdMQRoO1OsovcLZrpPkmOO\n; ytibCdPejOQCGJHl5l+zlEGNxBiuvjxI1zNwZTgDzw4a6LbV6/fTT8eqSGD/G3hVgTQRT05OOv6Nyl\n; zBwxgW5iN8/e4leOWlOTivESjAlNhvYJoEvTEA6gq7wIqMyZ76zevPw5XlWdi5/wi+2foLNu88hAeH\n; QQKQJG/ScjjFY1cUFD3mYKxmgeef+1z9AstO4KMEfu3zXdi594gXlHIj3hYFY6su5fVQU7OjgAvZNg\n; kpaDFn8jvrC9zf+GEvgZ+16HqX5QRVctl6FmAyXhq3TmHnROBhWuBysp7aj7/+rS+IWybKO8oPWTns\n; zFX2kxalEKTe+6pZXR9kx0X3olhXdmqJ+GIF6lyfC8ArUCnZ8PPvJ9xfXn4KLMCkuBlo306payJMWD\n; 9BoGspE9LrVop4ajfevgQrz82U5xkQyg7onyEWfpUzxSQBlUnjWRZM8t66cwi/jU5h5eIMbH40hKuv\n; LqS6UFwh7mhv1RL4AYojY9VQbqkQRWL34icPtQ5o6dXqR9fwQlLgrYuPLUSrH96TvZDigsg1UwxFc3\n; c/e5rfsRNRI/JFNNns8MBy8QKNvJYKzGgf4NoXf8LH3+5xTDw4jP0szH16ZvBlybdcitMhpJzrwKUB\n; jcmCiDkDvv/liK92qRWLeTdsZYSsQaPhhXOOZD44uLJhqXAIxYKIQUIaSqBGg+Di09CuBiUYxQ0E/t\n; 0Hc2bk9gQB26kiYJEK7a6kJyqdvL/bKSiKOmx9dGumfpnA35/jnsDH4/H6BAH7Qba3dobTTQYrOY0N\n; usOnbr9JieEiCPgSzzH4/Pz8dpVASw3T2OY0Y2V7FkBrdjDOarErkLPmpgNPkb/u5e8l4CqHG1IqhU\n; xEoQuZztlwuIRw8705WFma8uB3a0jcUhb05pQ/zdp+Ufso8R8hdLqygDs6OnptcXHxD+gx9V8R6H6a\n; dQ8WrSwq81XZ/1NToLztuY9T8D3U687/r/0D2siIlZoKRzIAAAAASUVORK5CYII=\n; thumbnail end\n; external perimeters extrusion width = 0.42mm\n; perimeters extrusion width = 0.45mm\n; infill extrusion width = 0.45mm\n; solid infill extrusion width = 0.45mm\n; top infill extrusion width = 0.42mm\n; support material extrusion width = 0.42mm\n; first layer extrusion width = 0.50mm\n;TYPE:Custom\nG9111 bedTemp={material_bed_temperature} extruderTemp={material_print_temperature}\nM117 ;display LCD message\nM900 K0.05 ;linear advance factor, ive only seen this set to k0.05\n;START HEADER\nG21 ; set units to millimeters\nG90 ; use absolute coordinates\nT0 ;set or report the current extruder or other tool\nM107 ; turn fan off" },
"machine_start_gcode_first": { "default_value": true },
"machine_width": { "default_value": 250 },
"material_bed_temperature":
{
"maximum_value": "110",
"maximum_value_warning": "90"
},
"material_diameter": { "default_value": 1.75 },
"material_initial_print_temperature":
{
"maximum_value_warning": 295,
"value": "material_print_temperature + 5"
},
"material_print_temperature": { "maximum_value_warning": 250 },
"material_print_temperature_layer_0":
{
"maximum_value_warning": 295,
"value": "material_print_temperature + 5"
},
"relative_extrusion": { "value": true }
}
}

61
resources/definitions/anycubic_kobra3v2_ACE_PRO.def.json Normal file
View file

@ -0,0 +1,61 @@
{
"version": 2,
"name": "Anycubic Kobra 3 v2 ACE PRO",
"inherits": "fdmprinter",
"metadata":
{
"visible": true,
"author": "Sam Bonnekamp",
"manufacturer": "Anycubic",
"file_formats": "text/x-gcode",
"platform": "anycubic_kobra3v2_buildplate.stl",
"has_textured_buildplate": true,
"machine_extruder_trains":
{
"0": "anycubic_kobra3v2_ACEPRO_extruder_0",
"1": "anycubic_kobra3v2_ACEPRO_extruder_1",
"2": "anycubic_kobra3v2_ACEPRO_extruder_2",
"3": "anycubic_kobra3v2_ACEPRO_extruder_3"
}
},
"overrides":
{
"adhesion_type": { "value": "'skirt'" },
"layer_height": { "default_value": 0.2 },
"machine_buildplate_type": { "default_value": "PEI Spring Steel" },
"machine_center_is_zero": { "default_value": false },
"machine_depth": { "default_value": 250 },
"machine_end_gcode": { "default_value": "G1 X5 Y{machine_depth*0.95} F{speed_travel*60} ; present print\nM140 S0 ; turn off heat bed\nM104 S0 ; turn off temperature\nM84; disable motors ; disable stepper motors" },
"machine_extruder_count": { "default_value": 4 },
"machine_heated_bed": { "default_value": true },
"machine_height": { "default_value": 260 },
"machine_name":
{
"default_value": "Anycubic Kobra 3 v2",
"description": "Anycubic Kobra 3 v2"
},
"machine_start_gcode": { "default_value": "; thumbnail begin 32x32\n; iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAX\n; NSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAARWSURBVHgB1Vc7bx1FFD5n/cC+YOQ4RBTXlg0STfIH\n; gM78h0SAhGgQjyqARO8eFEQFBaKhCHIoKagcOkJJQUWBI19XJLaJgp+5M8x5zZzdO+sg0ZCR1zM7u3\n; e+73znMbMAT0KLMVqPdKVhvuze+o2NjUafget7Gz4GeO3s7Ow29YiYiXSJ2TPft0BwEmZ2dpYnp+Ec\n; 8NPT09tpyOAhhF4CXSBPwhOvEZk+B/ynNFzd2QvwxlfHMEq9PqR//mVaWcegmqKCIf9FKGS2Px30Ey\n; A/Hh8fE/gWgRPomww+VkxVgYFoWcz3xXpUJo2QsXvEFu8qAQJvmobA13b3I1u+Q+AhQuRfB1kTBDS6\n; FUVmVBx5iwmqNIgNv9ONkUzg4ODgBQNn2b80yyNbCzFQqMsC4MCNg/eveSQGdQM6glhXYDAYbJHvRw\n; q+ux90dQ8eeBxacaD+5T5ZSdLbfIcT61hTgCZTuq1R/zqDjxMOva6SKzBdMQRoO1OsovcLZrpPkmOO\n; ytibCdPejOQCGJHl5l+zlEGNxBiuvjxI1zNwZTgDzw4a6LbV6/fTT8eqSGD/G3hVgTQRT05OOv6Nyl\n; zBwxgW5iN8/e4leOWlOTivESjAlNhvYJoEvTEA6gq7wIqMyZ76zevPw5XlWdi5/wi+2foLNu88hAeH\n; QQKQJG/ScjjFY1cUFD3mYKxmgeef+1z9AstO4KMEfu3zXdi594gXlHIj3hYFY6su5fVQU7OjgAvZNg\n; kpaDFn8jvrC9zf+GEvgZ+16HqX5QRVctl6FmAyXhq3TmHnROBhWuBysp7aj7/+rS+IWybKO8oPWTns\n; zFX2kxalEKTe+6pZXR9kx0X3olhXdmqJ+GIF6lyfC8ArUCnZ8PPvJ9xfXn4KLMCkuBlo306payJMWD\n; 9BoGspE9LrVop4ajfevgQrz82U5xkQyg7onyEWfpUzxSQBlUnjWRZM8t66cwi/jU5h5eIMbH40hKuv\n; LqS6UFwh7mhv1RL4AYojY9VQbqkQRWL34icPtQ5o6dXqR9fwQlLgrYuPLUSrH96TvZDigsg1UwxFc3\n; c/e5rfsRNRI/JFNNns8MBy8QKNvJYKzGgf4NoXf8LH3+5xTDw4jP0szH16ZvBlybdcitMhpJzrwKUB\n; jcmCiDkDvv/liK92qRWLeTdsZYSsQaPhhXOOZD44uLJhqXAIxYKIQUIaSqBGg+Di09CuBiUYxQ0E/t\n; 0Hc2bk9gQB26kiYJEK7a6kJyqdvL/bKSiKOmx9dGumfpnA35/jnsDH4/H6BAH7Qba3dobTTQYrOY0N\n; usOnbr9JieEiCPgSzzH4/Pz8dpVASw3T2OY0Y2V7FkBrdjDOarErkLPmpgNPkb/u5e8l4CqHG1IqhU\n; xEoQuZztlwuIRw8705WFma8uB3a0jcUhb05pQ/zdp+Ufso8R8hdLqygDs6OnptcXHxD+gx9V8R6H6a\n; dQ8WrSwq81XZ/1NToLztuY9T8D3U687/r/0D2siIlZoKRzIAAAAASUVORK5CYII=\n; thumbnail end\n; external perimeters extrusion width = 0.42mm\n; perimeters extrusion width = 0.45mm\n; infill extrusion width = 0.45mm\n; solid infill extrusion width = 0.45mm\n; top infill extrusion width = 0.42mm\n; support material extrusion width = 0.42mm\n; first layer extrusion width = 0.50mm\n;TYPE:Custom\nG9111 bedTemp={material_bed_temperature} extruderTemp={material_print_temperature}\nM117 ;display LCD message\nM900 K0.05 ;linear advance factor, ive only seen this set to k0.05\n;START HEADER\nG21 ; set units to millimeters\nG90 ; use absolute coordinates\nT0 ;set or report the current extruder or other tool\nM107 ; turn fan off" },
"machine_start_gcode_first": { "default_value": true },
"machine_width": { "default_value": 250 },
"material_bed_temperature":
{
"maximum_value": "110",
"maximum_value_warning": "90"
},
"material_diameter": { "default_value": 1.75 },
"material_initial_print_temperature":
{
"maximum_value_warning": 295,
"value": "material_print_temperature + 5"
},
"material_print_temp_wait": { "value": true },
"material_print_temperature": { "maximum_value": 300 },
"material_print_temperature_layer_0":
{
"maximum_value_warning": 295,
"value": "material_print_temperature + 5"
},
"material_standby_temperature": { "default_value": "material_print_temperature" },
"relative_extrusion": { "value": true }
}
}

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

@ -9324,6 +9324,16 @@
"settable_per_mesh": false,
"settable_per_extruder": true
},
"keep_retracting_during_travel":
{
"label": "Keep Retracting During Travel",
"description": "When retraction during travel is enabled, and there is more than enough time to perform a full retract during a travel move, spread the retraction over the whole travel move with a lower retraction speed, so that we do not travel with a non-retracting nozzle. This can help reducing oozing.",
"type": "bool",
"default_value": false,
"enabled": "retraction_enable and not machine_firmware_retract and machine_gcode_flavor != \"UltiGCode\" and machine_gcode_flavor != \"BFB\" and retraction_during_travel_ratio > 0",
"settable_per_mesh": false,
"settable_per_extruder": true
},
"prime_during_travel_ratio":
{
"label": "Prime During Travel Move",

16
resources/extruders/anycubic_kobra3v2_ACEPRO_extruder_0.def.json Normal file
View file

@ -0,0 +1,16 @@
{
"version": 2,
"name": "ACE Pro Color 1",
"inherits": "fdmextruder",
"metadata":
{
"machine": "anycubic_kobra3v2_ACE_PRO",
"position": "0"
},
"overrides":
{
"extruder_nr": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 }
}
}

16
resources/extruders/anycubic_kobra3v2_ACEPRO_extruder_1.def.json Normal file
View file

@ -0,0 +1,16 @@
{
"version": 2,
"name": "ACE Pro Color 2",
"inherits": "fdmextruder",
"metadata":
{
"machine": "anycubic_kobra3v2_ACE_PRO",
"position": "1"
},
"overrides":
{
"extruder_nr": { "default_value": 1 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 }
}
}

16
resources/extruders/anycubic_kobra3v2_ACEPRO_extruder_2.def.json Normal file
View file

@ -0,0 +1,16 @@
{
"version": 2,
"name": "ACE Pro Color 3",
"inherits": "fdmextruder",
"metadata":
{
"machine": "anycubic_kobra3v2_ACE_PRO",
"position": "2"
},
"overrides":
{
"extruder_nr": { "default_value": 2 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 }
}
}

16
resources/extruders/anycubic_kobra3v2_ACEPRO_extruder_3.def.json Normal file
View file

@ -0,0 +1,16 @@
{
"version": 2,
"name": "ACE Pro Color 4",
"inherits": "fdmextruder",
"metadata":
{
"machine": "anycubic_kobra3v2_ACE_PRO",
"position": "3"
},
"overrides":
{
"extruder_nr": { "default_value": 3 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 }
}
}

16
resources/extruders/anycubic_kobra3v2_extruder_0.def.json Normal file
View file

@ -0,0 +1,16 @@
{
"version": 2,
"name": "Extruder 1",
"inherits": "fdmextruder",
"metadata":
{
"machine": "anycubic_kobra3v2",
"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_kobra3v2_buildplate.stl Normal file
View file

Binary file not shown.