From 12915870017588aa3d3f56956e1c639eba18fe2f Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 14 Jun 2016 17:06:46 +0200 Subject: [PATCH] JSON feat: firmware acceleration and jerk settings for ultimaker printers (CURA-1646) --- resources/definitions/fdmprinter.def.json | 131 ++++++++++++++++++ resources/definitions/ultimaker2.def.json | 15 ++ .../ultimaker_original_plus.def.json | 3 + 3 files changed, 149 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 5ede74aac7..f7acaf36b7 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -303,6 +303,137 @@ "settable_per_mesh": false, "settable_per_extruder": false, "settable_per_meshgroup": false + }, + + "machine_max_feedrate_x": { + "label": "Maximum Speed X", + "description": "The maximum speed for the motor of the X-direction.", + "unit": "mm/s", + "type": "float", + "default_value": 500, + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, + "machine_max_feedrate_y": { + "label": "Maximum Speed Y", + "description": "The maximum speed for the motor of the Y-direction.", + "unit": "mm/s", + "type": "float", + "default_value": 500, + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, + "machine_max_feedrate_z": { + "label": "Maximum Speed Z", + "description": "The maximum speed for the motor of the Z-direction.", + "unit": "mm/s", + "type": "float", + "default_value": 5, + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, + "machine_max_feedrate_e": { + "label": "Maximum Feedrate", + "description": "The maximum speed of the filament.", + "unit": "mm/s", + "type": "float", + "default_value": 25, + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, + "machine_max_acceleration_x": { + "label": "Maximum Acceleration X", + "description": "Maximum acceleration for the motor of the X-direction", + "unit": "mm/s²", + "type": "float", + "default_value": 9000, + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, + "machine_max_acceleration_y": { + "label": "Maximum Acceleration Y", + "description": "Maximum acceleration for the motor of the Y-direction.", + "unit": "mm/s²", + "type": "float", + "default_value": 9000, + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, + "machine_max_acceleration_z": { + "label": "Maximum Acceleration Z", + "description": "Maximum acceleration for the motor of the Z-direction.", + "unit": "mm/s²", + "type": "float", + "default_value": 100, + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, + "machine_max_acceleration_e": { + "label": "Maximum Filament Acceleration", + "description": "Maximum acceleration for the motor of the filament.", + "unit": "mm/s²", + "type": "float", + "default_value": 10000, + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, + "machine_acceleration": { + "label": "Default Acceleration", + "description": "The default acceleration of print head movement.", + "unit": "mm/s²", + "type": "float", + "default_value": 4000, + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, + "machine_max_jerk_xy": { + "label": "Default X-Y Jerk", + "description": "Default jerk for movement in the horizontal plane.", + "unit": "mm/s", + "type": "float", + "default_value": 20.0, + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, + "machine_max_jerk_z": { + "label": "Default Z Jerk", + "description": "Default jerk for the motor of the Z-direction.", + "unit": "mm/s", + "type": "float", + "default_value": 0.4, + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, + "machine_max_jerk_e": { + "label": "Default Filament Jerk", + "description": "Default jerk for the motor of the filament.", + "unit": "mm/s", + "type": "float", + "default_value": 5.0, + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, + "machine_minimum_feedrate": { + "label": "Minimum Feedrate", + "description": "The minimal movement speed of the print head.", + "unit": "mm/s", + "type": "float", + "default_value": 0.0, + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false } } }, diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index 7b2222e5b3..a1ffcc8226 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -86,6 +86,21 @@ "material_bed_temperature": { "enabled": "False" }, + "machine_max_feedrate_x": { + "default_value": 300 + }, + "machine_max_feedrate_y": { + "default_value": 300 + }, + "machine_max_feedrate_z": { + "default_value": 40 + }, + "machine_max_feedrate_e": { + "default_value": 45 + }, + "machine_acceleration": { + "default_value": 3000 + }, "material_diameter": { "enabled": "False" }, diff --git a/resources/definitions/ultimaker_original_plus.def.json b/resources/definitions/ultimaker_original_plus.def.json index 830050beb0..e4bb24ec6f 100644 --- a/resources/definitions/ultimaker_original_plus.def.json +++ b/resources/definitions/ultimaker_original_plus.def.json @@ -21,6 +21,9 @@ "overrides": { "machine_heated_bed": { "default_value": true + }, + "machine_max_feedrate_z": { + "default_value": 30 } } }