From 1919c63f0c113127b7e5c53f0aa1c36f14c222ad Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 9 May 2016 18:48:45 +0200 Subject: [PATCH] JSON feat: prime tower and raft acceleration and jerk (CURA-1443) --- .../machines/dual_extrusion_printer.json | 34 +++++ resources/machines/fdmprinter.json | 122 +++++++++++++++++- 2 files changed, 154 insertions(+), 2 deletions(-) diff --git a/resources/machines/dual_extrusion_printer.json b/resources/machines/dual_extrusion_printer.json index 2977345bcb..ccb1d4e96c 100644 --- a/resources/machines/dual_extrusion_printer.json +++ b/resources/machines/dual_extrusion_printer.json @@ -49,6 +49,40 @@ } } }, + "acceleration_print": { + "children": { + "acceleration_prime_tower": { + "label": "Prime Tower Acceleration", + "description": "The acceleration with which the prime tower is printed.", + "unit": "mm/s²", + "type": "float", + "min_value": "0.1", + "min_value_warning": "100", + "max_value_warning": "10000", + "default": 3000, + "visible": false, + "enabled": "prime_tower_enable and acceleration_enabled", + "global_only": true + } + } + }, + "jerk_print": { + "children": { + "jerk_prime_tower": { + "label": "Prime Tower Jerk", + "description": "The jerk with which the prime tower is printed.", + "unit": "mm/s³", + "type": "float", + "min_value": "0.1", + "min_value_warning": "5", + "max_value_warning": "50", + "default": 20, + "visible": false, + "enabled": "prime_tower_enable and jerk_enabled", + "global_only": true + } + } + }, "line_width": { "children": { "prime_tower_line_width": { diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index f8d00d1b5b..e0b19eb6b5 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1022,13 +1022,13 @@ "global_only": "True" }, "acceleration_print": { - "label": "Print Head Acceleration", + "label": "Print Acceleration", "description": "The acceleration with which printing happens.", "unit": "mm/s²", "type": "float", "min_value": "0.1", - "max_value_warning": "10000", "min_value_warning": "100", + "max_value_warning": "10000", "default": 3000, "visible": true, "enabled_WTF": "acceleration_enabled", @@ -2097,6 +2097,124 @@ } } }, + + + + "raft_acceleration": { + "label": "Raft Print Acceleration", + "description": "The acceleration with which the raft is printed.", + "unit": "mm/s²", + "type": "float", + "default": 3000, + "min_value": "0.1", + "min_value_warning": "100", + "max_value_warning": "10000", + "inherit_function": "acceleration_print", + "global_only": "True", + "visible": false, + "enabled": "adhesion_type == \"raft\" and acceleration_enabled", + "children": { + "raft_surface_acceleration": { + "label": "Raft Surface Print Acceleration", + "description": "The acceleration with which the surface raft layers are printed.", + "unit": "mm/s²", + "type": "float", + "default": 3000, + "min_value": "0.1", + "min_value_warning": "100", + "max_value_warning": "10000", + "global_only": "True", + "visible": false, + "enabled": "adhesion_type == \"raft\" and acceleration_enabled" + }, + "raft_interface_acceleration": { + "label": "Raft Interface Print Acceleration", + "description": "The acceleration with which the interface raft layer is printed.", + "unit": "mm/s²", + "type": "float", + "default": 3000, + "min_value": "0.1", + "min_value_warning": "100", + "max_value_warning": "10000", + "global_only": "True", + "visible": false, + "enabled": "adhesion_type == \"raft\" and acceleration_enabled" + }, + "raft_base_acceleration": { + "label": "Raft Base Print Acceleration", + "description": "The acceleration with which the base raft layer is printed.", + "unit": "mm/s²", + "type": "float", + "default": 3000, + "min_value": "0.1", + "min_value_warning": "100", + "max_value_warning": "10000", + "global_only": "True", + "visible": false, + "enabled": "adhesion_type == \"raft\" and acceleration_enabled" + } + } + }, + + + + "raft_jerk": { + "label": "Raft Print Jerk", + "description": "The jerk with which the raft is printed.", + "unit": "mm/s³", + "type": "float", + "default": 20, + "min_value": "0.1", + "min_value_warning": "5", + "max_value_warning": "50", + "inherit_function": "jerk_print", + "global_only": "True", + "visible": false, + "enabled": "adhesion_type == \"raft\" and jerk_enabled", + "children": { + "raft_surface_jerk": { + "label": "Raft Surface Print Jerk", + "description": "The jerk with which the surface raft layers are printed.", + "unit": "mm/s³", + "type": "float", + "default": 20, + "min_value": "0.1", + "min_value_warning": "5", + "max_value_warning": "100", + "global_only": "True", + "visible": false, + "enabled": "adhesion_type == \"raft\" and jerk_enabled" + }, + "raft_interface_jerk": { + "label": "Raft Interface Print Jerk", + "description": "The jerk with which the interface raft layer is printed.", + "unit": "mm/s³", + "type": "float", + "default": 20, + "min_value": "0.1", + "min_value_warning": "5", + "max_value_warning": "50", + "global_only": "True", + "visible": false, + "enabled": "adhesion_type == \"raft\" and jerk_enabled" + }, + "raft_base_jerk": { + "label": "Raft Base Print Jerk", + "description": "The jerk with which the base raft layer is printed.", + "unit": "mm/s³", + "type": "float", + "default": 20, + "min_value": "0.1", + "min_value_warning": "5", + "max_value_warning": "50", + "global_only": "True", + "visible": false, + "enabled": "adhesion_type == \"raft\" and jerk_enabled" + } + } + }, + + "raft_fan_speed": { "label": "Raft Fan Speed", "description": "The fan speed for the raft.",