GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 22:29:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/CURA-12371' into test-method-high-speed

Browse Source
This commit is contained in:
Erwan MATHIEU 2025-01-24 10:36:15 +01:00
commit 3588e6a225
2 changed files with 96 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
plugins/MakerbotWriter/MakerbotWriter.py
View File

@ -254,6 +254,78 @@ class MakerbotWriter(MeshWriter):
"printMode": CuraApplication.getInstance().getIntentManager().currentIntentCategory,
}
if file_format == "application/x-makerbot":
accel_overrides = meta["accel_overrides"] = {}
bead_mode_overrides = accel_overrides["bead_mode"] = {}
accel_enabled = global_stack.getProperty('acceleration_enabled', 'value')
if accel_enabled:
global_accel_setting = global_stack.getProperty('acceleration_print', 'value')
accel_overrides["rate_mm_per_s_sq"] = {
"x": global_accel_setting,
"y": global_accel_setting
}
if global_stack.getProperty('acceleration_travel_enabled', 'value'):
travel_accel_setting = global_stack.getProperty('acceleration_travel', 'value')
bead_mode_overrides['Travel Move'] = {
"rate_mm_per_s_sq": {
"x": travel_accel_setting,
"y": travel_accel_setting
}
}
jerk_enabled = global_stack.getProperty('jerk_enabled', 'value')
if jerk_enabled:
global_jerk_setting = global_stack.getProperty('jerk_print', 'value')
accel_overrides["max_speed_change_mm_per_s"] = {
"x": global_jerk_setting,
"y": global_jerk_setting
}
if global_stack.getProperty('jerk_travel_enabled', 'value'):
travel_jerk_setting = global_stack.getProperty('jerk_travel', 'value')
if 'Travel Move' not in bead_mode_overrides:
bead_mode_overrides['Travel Move' ] = {}
bead_mode_overrides['Travel Move'].update({
"max_speed_change_mm_per_s": {
"x": travel_jerk_setting,
"y": travel_jerk_setting
}
})
# Get bead mode settings per extruder
available_bead_modes = {
"infill": "FILL",
"prime_tower": "PRIME_TOWER",
"roofing": "TOP_SURFACE",
"support_infill": "SUPPORT",
"support_interface": "SUPPORT_INTERFACE",
"wall_0": "WALL_OUTER",
"wall_x": "WALL_INNER",
"skirt_brim": "SKIRT"
}
for idx, extruder in enumerate(extruders):
for bead_mode_setting, bead_mode_tag in available_bead_modes.items():
ext_specific_tag = "%s_%s" % (bead_mode_tag, idx)
if accel_enabled or jerk_enabled:
bead_mode_overrides[ext_specific_tag] = {}
if accel_enabled:
accel_val = extruder.getProperty('acceleration_%s' % bead_mode_setting, 'value')
bead_mode_overrides[ext_specific_tag]["rate_mm_per_s_sq"] = {
"x": accel_val,
"y": accel_val
}
if jerk_enabled:
jerk_val = extruder.getProperty('jerk_%s' % bead_mode_setting, 'value')
bead_mode_overrides[ext_specific_tag][ "max_speed_change_mm_per_s"] = {
"x": jerk_val,
"y": jerk_val
}
meta["miracle_config"] = {"gaggles": {"instance0": {}}}
version_info = dict()

24
resources/definitions/ultimaker_method_base.def.json
View File

@ -34,6 +34,9 @@
"acceleration_enabled":
{
"enabled": false,
"settable_per_extruder": false,
"settable_per_mesh": false,
"settable_per_meshgroup": false,
"value": true
},
"acceleration_infill":
@ -54,6 +57,9 @@
"acceleration_print":
{
"enabled": false,
"settable_per_extruder": false,
"settable_per_mesh": false,
"settable_per_meshgroup": false,
"value": 800
},
"acceleration_print_layer_0":
@ -99,11 +105,17 @@
"acceleration_travel":
{
"enabled": false,
"settable_per_extruder": false,
"settable_per_mesh": false,
"settable_per_meshgroup": false,
"value": 5000
},
"acceleration_travel_enabled":
{
"enabled": false,
"settable_per_extruder": false,
"settable_per_mesh": false,
"settable_per_meshgroup": false,
"value": true
},
"acceleration_travel_layer_0":
@ -204,6 +216,9 @@
"jerk_enabled":
{
"enabled": false,
"settable_per_extruder": false,
"settable_per_mesh": false,
"settable_per_meshgroup": false,
"value": true
},
"jerk_infill":
@ -224,6 +239,9 @@
"jerk_print":
{
"enabled": false,
"settable_per_extruder": false,
"settable_per_mesh": false,
"settable_per_meshgroup": false,
"value": 6.25
},
"jerk_print_layer_0":
@ -269,11 +287,17 @@
"jerk_travel":
{
"enabled": false,
"settable_per_extruder": false,
"settable_per_mesh": false,
"settable_per_meshgroup": false,
"value": "jerk_print"
},
"jerk_travel_enabled":
{
"enabled": false,
"settable_per_extruder": false,
"settable_per_mesh": false,
"settable_per_meshgroup": false,
"value": true
},
"jerk_travel_layer_0":