Merge branch 'master' of https://github.com/baldaaaa/Cura

9 files changed, 125 insertions, 0 deletions

diff --git a/resources/definitions/creality_ender3max.def.json b/resources/definitions/creality_ender3max.def.json
new file mode 100644
index 0000000000..0902f00f29
--- /dev/null
+++ b/resources/definitions/creality_ender3max.def.json
@@ -0,0 +1,41 @@
+{
+    "name": "Creality Ender-3 Max",
+    "version": 2,
+    "inherits": "creality_base",
+    "metadata": {
+        "author": "Radlab Ecuador",
+        "quality_definition": "creality_base",
+        "visible": true,
+        "platform": "creality_ender3max.stl"
+    },
+    "overrides": {
+        "machine_name": { "default_value": "Creality Ender-3 Max" },
+        "machine_width": { "default_value": 300 },
+        "machine_depth": { "default_value": 300 },
+        "machine_height": { "default_value": 340 },
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-42.5, 30],
+                [-42.5, -40],
+                [42.5, -40],
+                [42.5, 30]
+            ]
+        },
+        "machine_start_gcode": {
+            "default_value": "; Ender 3 Max Custom Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish"
+        },
+
+        "machine_max_feedrate_z": { "value": 5 },
+        "machine_max_feedrate_e": { "value": 25 },
+
+        "machine_max_acceleration_x": { "value": 500 },
+        "machine_max_acceleration_y": { "value": 500 },
+        "machine_max_acceleration_z": { "value": 100 },
+        "machine_max_acceleration_e": { "value": 1000 },
+
+        "acceleration_travel": { "value": 1000 },
+
+        "machine_max_jerk_z": { "value": 0.3 },
+
+        "gantry_height": { "value": 35 }
+    }
+}
diff --git a/resources/meshes/creality_ender3max.stl b/resources/meshes/creality_ender3max.stl
new file mode 100644
index 0000000000..a2eb11378e
--- /dev/null
+++ b/resources/meshes/creality_ender3max.stl
diff --git a/resources/variants/creality_ender3max_0.2.inst.cfg b/resources/variants/creality_ender3max_0.2.inst.cfg
new file mode 100644
index 0000000000..f90b9ad40a
--- /dev/null
+++ b/resources/variants/creality_ender3max_0.2.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.2mm Nozzle
+version = 4
+definition = creality_ender3max
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.2
\ No newline at end of file
diff --git a/resources/variants/creality_ender3max_0.3.inst.cfg b/resources/variants/creality_ender3max_0.3.inst.cfg
new file mode 100644
index 0000000000..24a99d42ab
--- /dev/null
+++ b/resources/variants/creality_ender3max_0.3.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.3mm Nozzle
+version = 4
+definition = creality_ender3max
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.3
\ No newline at end of file
diff --git a/resources/variants/creality_ender3max_0.4.inst.cfg b/resources/variants/creality_ender3max_0.4.inst.cfg
new file mode 100644
index 0000000000..d050f61480
--- /dev/null
+++ b/resources/variants/creality_ender3max_0.4.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.4mm Nozzle
+version = 4
+definition = creality_ender3max
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
\ No newline at end of file
diff --git a/resources/variants/creality_ender3max_0.5.inst.cfg b/resources/variants/creality_ender3max_0.5.inst.cfg
new file mode 100644
index 0000000000..c85d287936
--- /dev/null
+++ b/resources/variants/creality_ender3max_0.5.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.5mm Nozzle
+version = 4
+definition = creality_ender3max
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.5
\ No newline at end of file
diff --git a/resources/variants/creality_ender3max_0.6.inst.cfg b/resources/variants/creality_ender3max_0.6.inst.cfg
new file mode 100644
index 0000000000..f179a02cd2
--- /dev/null
+++ b/resources/variants/creality_ender3max_0.6.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.6mm Nozzle
+version = 4
+definition = creality_ender3max
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.6
\ No newline at end of file
diff --git a/resources/variants/creality_ender3max_0.8.inst.cfg b/resources/variants/creality_ender3max_0.8.inst.cfg
new file mode 100644
index 0000000000..c5206e404f
--- /dev/null
+++ b/resources/variants/creality_ender3max_0.8.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 0.8mm Nozzle
+version = 4
+definition = creality_ender3max
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.8
\ No newline at end of file
diff --git a/resources/variants/creality_ender3max_1.0.inst.cfg b/resources/variants/creality_ender3max_1.0.inst.cfg
new file mode 100644
index 0000000000..da6d0448db
--- /dev/null
+++ b/resources/variants/creality_ender3max_1.0.inst.cfg
@@ -0,0 +1,12 @@
+[general]
+name = 1.0mm Nozzle
+version = 4
+definition = creality_ender3max
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 1.0
\ No newline at end of file