Rename creawsome to creality

These are now meant to be the one-and-only Creality profiles, replacing the old profiles originally in Cura.

Contributes to issue CURA-6554.

resources/definitions/creawsome_base.def.json → resources/definitions/creality_base.def.json

@@ -1,9 +1,9 @@
 {
-    "name": "Custom Machine",
+    "name": "Creality Base Printer",
     "version": 2,
     "inherits": "fdmprinter",
     "overrides": {
-        "machine_name": { "default_value": "Creawsome CR-10" },
+        "machine_name": { "default_value": "Creality Base Printer" },
         "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n"},
         "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" },
 
@@ -126,7 +126,7 @@
 
     },
     "metadata": {
-        "visible": true,
+        "visible": false,
         "author": "trouch.com",
         "manufacturer": "CreawsomeMod",
         "category": "CreawsomeMod",
@@ -134,7 +134,7 @@
         "first_start_actions": ["MachineSettingsAction"],
 
         "machine_extruder_trains": {
-            "0": "creawsome_base_extruder_0"
+            "0": "creality_base_extruder_0"
         },
 
         "has_materials": true,

resources/definitions/creality_cr10.def.json

@@ -1,95 +1,32 @@
 {
     "name": "Creality CR-10",
     "version": 2,
-    "inherits": "fdmprinter",
-    "metadata": {
-        "visible": true,
-        "author": "Michael Wildermuth",
-        "manufacturer": "Creality3D",
-        "file_formats": "text/x-gcode",
-        "preferred_quality_type": "draft",
-        "machine_extruder_trains":
-        {
-            "0": "creality_cr10_extruder_0"
-        }
-    },
+    "inherits": "creality_base",
     "overrides": {
-        "machine_width": {
-            "default_value": 300
-        },
-        "machine_height": {
-            "default_value": 400
-        },
-        "machine_depth": {
-            "default_value": 300
-        },
-        "machine_head_polygon": {
-            "default_value": [
-                [-30, 34],
-                [-30, -32],
-                [30, -32],
-                [30, 34]
+        "machine_name": { "default_value": "Creality CR-10" },
+        "machine_width": { "default_value": 300 },
+        "machine_depth": { "default_value": 300 },
+        "machine_height": { "default_value": 400 },
+        "machine_head_polygon": { "default_value": [
+                [-26, 34],
+                [-26, -32],
+                [22, -32],
+                [22, 34]
             ]
         },
-        "layer_height_0": {
-            "default_value": 0.2
-        },
-        "top_bottom_thickness": {
-            "default_value": 0.6
-        },
-        "top_bottom_pattern_0": {
-            "default_value": "concentric"
-        },
-        "infill_pattern": {
-            "value": "'triangles'"
-        },
-        "retraction_enable": {
-            "default_value": true
-        },
-        "retraction_amount": {
-            "default_value": 5
-        },
-        "retraction_speed": {
-            "default_value": 40
-        },
-        "cool_min_layer_time": {
-            "default_value": 10
-        },
-        "adhesion_type": {
-            "default_value": "skirt"
-        },
-        "skirt_line_count": {
-            "default_value": 4
-        },
-        "skirt_gap": {
-            "default_value": 5
-        },
-        "machine_end_gcode": {
-            "default_value": "G91\nG1 F1800 E-3\nG1 F3000 Z10\nG90\nG28 X0 Y0 ; home x and y axis\nM106 S0 ; turn off cooling fan\nM104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors"
-        },
-        "machine_heated_bed": {
-            "default_value": true
-        },
-        "gantry_height": {
-            "value": "30"
-        },
-        "acceleration_enabled": {
-            "default_value": true
-        },
-        "acceleration_print": {
-            "default_value": 500
-        },
-        "acceleration_travel": {
-            "default_value": 500
-        },
-        "jerk_enabled": {
-            "default_value": true
-        },
-        "jerk_print": {
-            "default_value": 8
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-26, 34],
+                [-26, -32],
+                [32, -32],
+                [32, 34]
+            ]
         },
-        "jerk_travel": {
-            "default_value": 8
-        }
+
+        "gantry_height": { "value": 25 }
+
+    },
+    "metadata": {
+        "quality_definition": "creality_base"
+        
     }
 }

resources/definitions/creawsome_cr10mini.def.json → resources/definitions/creality_cr10mini.def.json

@@ -1,9 +1,9 @@
 {
     "name": "Creality CR-10 Mini",
     "version": 2,
-    "inherits": "creawsome_base",
+    "inherits": "creality_base",
     "overrides": {
-        "machine_name": { "default_value": "Creawsome CR-10 Mini" },
+        "machine_name": { "default_value": "Creality CR-10 Mini" },
         "machine_width": { "default_value": 300 },
         "machine_depth": { "default_value": 220 },
         "machine_height": { "default_value": 300 },
@@ -26,7 +26,7 @@
 
     },
     "metadata": {
-        "quality_definition": "creawsome_base"
+        "quality_definition": "creality_base"
 
     }
 }

resources/definitions/creality_cr10s.def.json

@@ -1,5 +1,12 @@
 {
     "name": "Creality CR-10S",
     "version": 2,
-    "inherits": "creality_cr10"
+    "inherits": "creality_cr10",
+    "overrides": {
+        "machine_name": { "default_value": "Creality CR-10S" }
+    },
+    "metadata": {
+        "quality_definition": "creality_base"
+
+    }
 }

resources/definitions/creality_cr10s4.def.json

@@ -1,26 +1,32 @@
 {
-    "name": "Creality CR-10 S4",
+    "name": "Creality CR-10S4",
     "version": 2,
-    "inherits": "creality_cr10",
-    "metadata": {
-        "visible": true,
-        "author": "Michael Wildermuth",
-        "manufacturer": "Creality3D",
-        "file_formats": "text/x-gcode",
-        "machine_extruder_trains":
-        {
-            "0": "creality_cr10s4_extruder_0"
-        }
-    },
+    "inherits": "creality_base",
     "overrides": {
-        "machine_width": {
-            "default_value": 400
+        "machine_name": { "default_value": "Creality CR-10S4" },
+        "machine_width": { "default_value": 400 },
+        "machine_depth": { "default_value": 400 },
+        "machine_height": { "default_value": 400 },
+        "machine_head_polygon": { "default_value": [
+                [-26, 34],
+                [-26, -32],
+                [22, -32],
+                [22, 34]
+            ]
         },
-        "machine_height": {
-            "default_value": 400
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-26, 34],
+                [-26, -32],
+                [32, -32],
+                [32, 34]
+            ]
         },
-        "machine_depth": {
-            "default_value": 400
-        }
+
+        "gantry_height": { "value": 25 }
+
+    },
+    "metadata": {
+        "quality_definition": "creality_base"
+
     }
 }

resources/definitions/creality_cr10s5.def.json

@@ -1,26 +1,32 @@
 {
-    "name": "Creality CR-10 S5",
+    "name": "Creality CR-10S5",
     "version": 2,
-    "inherits": "creality_cr10",
-    "metadata": {
-        "visible": true,
-        "author": "Michael Wildermuth",
-        "manufacturer": "Creality3D",
-        "file_formats": "text/x-gcode",
-        "machine_extruder_trains":
-        {
-            "0": "creality_cr10s5_extruder_0"
-        }
-    },
+    "inherits": "creality_base",
     "overrides": {
-        "machine_width": {
-            "default_value": 500
+        "machine_name": { "default_value": "Creality CR-10S5" },
+        "machine_width": { "default_value": 500 },
+        "machine_depth": { "default_value": 500 },
+        "machine_height": { "default_value": 500 },
+        "machine_head_polygon": { "default_value": [
+                [-26, 34],
+                [-26, -32],
+                [22, -32],
+                [22, 34]
+            ]
         },
-        "machine_height": {
-            "default_value": 500
+        "machine_head_with_fans_polygon": { "default_value": [
+                [-26, 34],
+                [-26, -32],
+                [32, -32],
+                [32, 34]
+            ]
         },
-        "machine_depth": {
-            "default_value": 500
-        }
+
+        "gantry_height": { "value": 25 }
+
+    },
+    "metadata": {
+        "quality_definition": "creality_base"
+
     }
 }

resources/definitions/creawsome_cr10spro.def.json → resources/definitions/creality_cr10spro.def.json

@@ -1,9 +1,9 @@
 {
     "name": "Creality CR-10S Pro",
     "version": 2,
-    "inherits": "creawsome_cr10",
+    "inherits": "creality_cr10",
     "overrides": {
-        "machine_name": { "default_value": "Creawsome CR-10S Pro" },
+        "machine_name": { "default_value": "Creality CR-10S Pro" },
         "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nM420 S1 Z2 ;Enable ABL using saved Mesh and Fade Height\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n"},
         "machine_head_polygon": { "default_value": [
                 [-44, 34],
@@ -24,8 +24,8 @@
 
     },
     "metadata": {
-        "quality_definition": "creawsome_base",
-        "platform": "creawsome_cr10spro.stl",
+        "quality_definition": "creality_base",
+        "platform": "creality_cr10spro.stl",
         "platform_offset": [ -150, 0, 150]
     }
 }

resources/definitions/creawsome_cr20.def.json → resources/definitions/creality_cr20.def.json

@@ -1,9 +1,9 @@
 {
     "name": "Creality CR-20",
     "version": 2,
-    "inherits": "creawsome_base",
+    "inherits": "creality_base",
     "overrides": {
-        "machine_name": { "default_value": "Creawsome CR-20" },
+        "machine_name": { "default_value": "Creality CR-20" },
         "machine_width": { "default_value": 220 },
         "machine_depth": { "default_value": 220 },
         "machine_height": { "default_value": 250 },
@@ -26,7 +26,7 @@
 
     },
     "metadata": {
-        "quality_definition": "creawsome_base"
+        "quality_definition": "creality_base"
 
     }
 }

resources/definitions/creawsome_cr20pro.def.json → resources/definitions/creality_cr20pro.def.json

@@ -1,14 +1,14 @@
 {
     "name": "Creality CR-20 Pro",
     "version": 2,
-    "inherits": "creawsome_cr20",
+    "inherits": "creality_cr20",
     "overrides": {
-        "machine_name": { "default_value": "Creawsome CR-20 Pro" },
+        "machine_name": { "default_value": "Creality CR-20 Pro" },
         "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nM420 S1 Z2 ;Enable ABL using saved Mesh and Fade Height\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n"}
 
     },
     "metadata": {
-        "quality_definition": "creawsome_base"
+        "quality_definition": "creality_base"
 
     }
 }

resources/definitions/creawsome_ender2.def.json → resources/definitions/creality_ender2.def.json

@@ -1,9 +1,9 @@
 {
     "name": "Creality Ender-2",
     "version": 2,
-    "inherits": "creawsome_base",
+    "inherits": "creality_base",
     "overrides": {
-        "machine_name": { "default_value": "Creawsome Ender-2" },
+        "machine_name": { "default_value": "Creality Ender-2" },
         "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y100.0 Z0.28 F1500.0 E8 ;Draw the first line\nG1 X10.4 Y100.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E15 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n"},
         "machine_width": { "default_value": 150 },
         "machine_depth": { "default_value": 150 },
@@ -27,7 +27,7 @@
 
     },
     "metadata": {
-        "quality_definition": "creawsome_base"
+        "quality_definition": "creality_base"
 
     }
 }