From 13fd588451a29de4dccfc5da33d122663ea3712b Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 14 Jun 2016 15:47:29 +0200 Subject: [PATCH 1/2] =?UTF-8?q?JSON=20fix:=20unit=20of=20jerk:=20mm/s?= =?UTF-8?q?=C2=B3=20=3D=3D>=20mm/s=20(CURA-1646)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/definitions/fdmprinter.def.json | 34 +++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 6e6474053f..5ede74aac7 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1512,7 +1512,7 @@ "jerk_print": { "label": "Print Jerk", "description": "The maximal allowed jerk of the print head when starting to move or when changing direction.", - "unit": "mm/s³", + "unit": "mm/s", "type": "float", "minimum_value": "0.1", "minimum_value_warning": "5", @@ -1524,7 +1524,7 @@ "jerk_infill": { "label": "Infill Jerk", "description": "The jerk with which infill is printed.", - "unit": "mm/s³", + "unit": "mm/s", "type": "float", "minimum_value": "0.1", "minimum_value_warning": "5", @@ -1537,7 +1537,7 @@ "jerk_wall": { "label": "Wall Jerk", "description": "The jerk with which the walls are printed.", - "unit": "mm/s³", + "unit": "mm/s", "type": "float", "minimum_value": "0.1", "minimum_value_warning": "5", @@ -1550,7 +1550,7 @@ "jerk_wall_0": { "label": "Outer Wall Jerk", "description": "The jerk with which the outermost walls are printed.", - "unit": "mm/s³", + "unit": "mm/s", "type": "float", "minimum_value": "0.1", "minimum_value_warning": "5", @@ -1563,7 +1563,7 @@ "jerk_wall_x": { "label": "Inner Wall Jerk", "description": "The jerk with which all inner walls are printed.", - "unit": "mm/s³", + "unit": "mm/s", "type": "float", "minimum_value": "0.1", "minimum_value_warning": "5", @@ -1578,7 +1578,7 @@ "jerk_topbottom": { "label": "Top/Bottom Jerk", "description": "The jerk with which top/bottom layers are printed.", - "unit": "mm/s³", + "unit": "mm/s", "type": "float", "minimum_value": "0.1", "minimum_value_warning": "5", @@ -1591,7 +1591,7 @@ "jerk_support": { "label": "Support Jerk", "description": "The jerk with which the support structure is printed.", - "unit": "mm/s³", + "unit": "mm/s", "type": "float", "minimum_value": "0.1", "minimum_value_warning": "5", @@ -1605,7 +1605,7 @@ "jerk_support_infill": { "label": "Support Infill Jerk", "description": "The jerk with which the infill of support is printed.", - "unit": "mm/s³", + "unit": "mm/s", "type": "float", "default_value": 20, "value": "jerk_support", @@ -1619,7 +1619,7 @@ "jerk_support_roof": { "label": "Support Roof Jerk", "description": "The jerk with which the roofs of support are printed.", - "unit": "mm/s³", + "unit": "mm/s", "type": "float", "default_value": 20, "value": "jerk_support", @@ -1635,7 +1635,7 @@ "jerk_prime_tower": { "label": "Prime Tower Jerk", "description": "The jerk with which the prime tower is printed.", - "unit": "mm/s³", + "unit": "mm/s", "type": "float", "minimum_value": "0.1", "minimum_value_warning": "5", @@ -1650,7 +1650,7 @@ "jerk_travel": { "label": "Travel Jerk", "description": "The jerk with which travel moves are made.", - "unit": "mm/s³", + "unit": "mm/s", "type": "float", "default_value": 30, "minimum_value": "0.1", @@ -1663,7 +1663,7 @@ "jerk_layer_0": { "label": "Initial Layer Jerk", "description": "The print jerk for the initial layer.", - "unit": "mm/s³", + "unit": "mm/s", "type": "float", "default_value": 20, "value": "jerk_print", @@ -1676,7 +1676,7 @@ "jerk_skirt": { "label": "Skirt Jerk", "description": "The jerk with which the skirt and brim are printed.", - "unit": "mm/s³", + "unit": "mm/s", "type": "float", "default_value": 20, "minimum_value": "0.1", @@ -2599,7 +2599,7 @@ "raft_jerk": { "label": "Raft Print Jerk", "description": "The jerk with which the raft is printed.", - "unit": "mm/s³", + "unit": "mm/s", "type": "float", "default_value": 20, "minimum_value": "0.1", @@ -2612,7 +2612,7 @@ "raft_surface_jerk": { "label": "Raft Top Print Jerk", "description": "The jerk with which the top raft layers are printed.", - "unit": "mm/s³", + "unit": "mm/s", "type": "float", "default_value": 20, "value": "raft_jerk", @@ -2625,7 +2625,7 @@ "raft_interface_jerk": { "label": "Raft Middle Print Jerk", "description": "The jerk with which the middle raft layer is printed.", - "unit": "mm/s³", + "unit": "mm/s", "type": "float", "default_value": 20, "value": "raft_jerk", @@ -2638,7 +2638,7 @@ "raft_base_jerk": { "label": "Raft Base Print Jerk", "description": "The jerk with which the base raft layer is printed.", - "unit": "mm/s³", + "unit": "mm/s", "type": "float", "default_value": 20, "value": "raft_jerk", From 12915870017588aa3d3f56956e1c639eba18fe2f Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 14 Jun 2016 17:06:46 +0200 Subject: [PATCH 2/2] 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 } } }