diff options
author | jspijker <j.spijker@ultimaker.com> | 2022-07-08 13:37:32 +0300 |
---|---|---|
committer | jspijker <j.spijker@ultimaker.com> | 2022-07-08 13:37:32 +0300 |
commit | f9d4628b950c4bf85895d8e32b1112f7c6be6999 (patch) | |
tree | 37b7dbe01973f707cda1464add78e3d5cb0b0dce /resources/definitions | |
parent | 8750c218db0a0da2705718d8d6614c34f71df31c (diff) | |
parent | d1cd4eec7667572d2abc89c639d0582bd4ed40c8 (diff) |
Merge branch 'main' into CURA-9365
# Conflicts:
# .github/workflows/ci.yml
# .github/workflows/cura-installer.yml
# .github/workflows/requirements-conan-package.txt
# resources/definitions/Mark2_for_Ultimaker2.def.json
# resources/definitions/elegoo_neptune_2.def.json
# resources/definitions/elegoo_neptune_2D.def.json
Diffstat (limited to 'resources/definitions')
-rw-r--r-- | resources/definitions/Mark2_for_Ultimaker2.def.json | 6 | ||||
-rw-r--r-- | resources/definitions/elegoo_neptune_2.def.json | 1 | ||||
-rw-r--r-- | resources/definitions/elegoo_neptune_2D.def.json | 1 |
3 files changed, 4 insertions, 4 deletions
diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json index 6ecc6bbda3..68498db423 100644 --- a/resources/definitions/Mark2_for_Ultimaker2.def.json +++ b/resources/definitions/Mark2_for_Ultimaker2.def.json @@ -158,8 +158,10 @@ "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 500 / 4000)" }, "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 4000)" }, "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 500 / 1000)" }, - "jerk_enabled": { "value": true }, - "jerk_print": {"value": 12 }, + "jerk_enabled": + { + "default_value": true + }, "jerk_travel": { "value": "jerk_print if magic_spiralize else 20" diff --git a/resources/definitions/elegoo_neptune_2.def.json b/resources/definitions/elegoo_neptune_2.def.json index 7f52c0aecf..8e564289f5 100644 --- a/resources/definitions/elegoo_neptune_2.def.json +++ b/resources/definitions/elegoo_neptune_2.def.json @@ -38,7 +38,6 @@ "raft_airgap":{"default_value": 0.25}, "brim_width":{"default_value": 5}, "skin_angles":{"default_value": [45, 135]}, - "infill_pattern":{"value": "gyroid"}, "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, "machine_start_gcode": {"default_value": ";simage\n;gimage\nG28 ;home\nG92 E0 ;Reset Extruder\nG1 Z4.0 F3000 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X1.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X1.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X1.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X1.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up"}, "machine_end_gcode": {"default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F1600 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z"} diff --git a/resources/definitions/elegoo_neptune_2D.def.json b/resources/definitions/elegoo_neptune_2D.def.json index be784223f2..78e87d6f40 100644 --- a/resources/definitions/elegoo_neptune_2D.def.json +++ b/resources/definitions/elegoo_neptune_2D.def.json @@ -47,7 +47,6 @@ "raft_airgap":{"default_value": 0.25}, "brim_width":{"default_value": 5}, "skin_angles":{"default_value": [45, 135]}, - "infill_pattern":{"value": "gyroid"}, "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, "machine_start_gcode": {"default_value": ";simage\n;gimage\nG28 ;home\n;G29 ;Run ABL\n;M420 S1 ;Enable ABL mesh\nG92 E0 ;Reset Extruder\nG1 Z4.0 F3000 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X2.0 Y20 Z0.28 F5000.0 ;Move to start position\nG1 E90 F1200 ;Load filament\nG92 E0 ;Reset Extruder\nG1 X2.0 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X2.3 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X2.3 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up"}, "machine_end_gcode": {"default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-80 Z0.2 F1600 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z"} |