diff options
| author | Jaime van Kessel <nallath@gmail.com> | 2022-05-18 17:32:50 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-18 17:32:50 +0300 |
| commit | c41c59da131eb9762a49043d4e20389c5d61aba4 (patch) | |
| tree | b25fa6cf8e8083ae0b1bbf9ef25ea15d237405a5 | |
| parent | 8b02b4161b92e37e12cc27cdcfde20a3dc2ef85f (diff) | |
| parent | acc8b511d03e5cdd467724d7e2c3dd28d14fb795 (diff) | |
Merge pull request #12188 from Ultimaker/CURA-8708_remove_travel_acceleration_jerk9296
Add setting to no longer use different jerk/acc for travels
| -rw-r--r-- | resources/definitions/fdmprinter.def.json | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 9e12d7f7e1..c411162359 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3322,6 +3322,17 @@ "settable_per_mesh": false, "settable_per_extruder": false }, + "acceleration_travel_enabled": + { + "label": "Enable Travel Acceleration", + "description": "Use a separate acceleration rate for travel moves. If disabled, travel moves will use the acceleration value of the printed line at their destination.", + "type": "bool", + "default_value": true, + "resolve": "any(extruderValues('acceleration_travel_enabled'))", + "enabled": "acceleration_enabled", + "settable_per_mesh": false, + "settable_per_extruder": false + }, "acceleration_print": { "label": "Print Acceleration", @@ -3541,7 +3552,7 @@ "minimum_value_warning": "100", "maximum_value_warning": "10000", "value": "acceleration_print if magic_spiralize else 5000", - "enabled": "resolveOrValue('acceleration_enabled')", + "enabled": "resolveOrValue('acceleration_enabled') and resolveOrValue('acceleration_travel_enabled')", "settable_per_mesh": false }, "acceleration_layer_0": @@ -3584,7 +3595,7 @@ "minimum_value": "0.1", "minimum_value_warning": "100", "maximum_value_warning": "10000", - "enabled": "resolveOrValue('acceleration_enabled')", + "enabled": "resolveOrValue('acceleration_enabled') and resolveOrValue('acceleration_travel_enabled')", "settable_per_extruder": true, "settable_per_mesh": false } @@ -3615,6 +3626,17 @@ "settable_per_mesh": false, "settable_per_extruder": false }, + "jerk_travel_enabled": + { + "label": "Enable Travel Jerk", + "description": "Use a separate acceleration rate for travel moves. If disabled, travel moves will use the acceleration value of the printed line at their destination.", + "type": "bool", + "default_value": true, + "resolve": "any(extruderValues('jerk_travel_enabled'))", + "enabled": "jerk_enabled", + "settable_per_mesh": false, + "settable_per_extruder": false + }, "jerk_print": { "label": "Print Jerk", @@ -3820,7 +3842,7 @@ "minimum_value": "0", "maximum_value_warning": "50", "value": "jerk_print if magic_spiralize else 30", - "enabled": "resolveOrValue('jerk_enabled')", + "enabled": "resolveOrValue('jerk_enabled') and resolveOrValue('jerk_travel_enabled')", "settable_per_mesh": false }, "jerk_layer_0": @@ -3860,7 +3882,7 @@ "value": "jerk_layer_0 * jerk_travel / jerk_print", "minimum_value": "0", "maximum_value_warning": "50", - "enabled": "resolveOrValue('jerk_enabled')", + "enabled": "resolveOrValue('jerk_enabled') and resolveOrValue('jerk_travel_enabled')", "settable_per_extruder": true, "settable_per_mesh": false } |