Rename brand (without final S) and add A1 mini

CURA-12074

resources/definitions/bambulab_x1.def.json

@@ -1,14 +1,14 @@
 {
     "version": 2,
-    "name": "BambuLabs X1",
+    "name": "BambuLab X1",
     "inherits": "fdmprinter",
     "metadata":
     {
         "visible": true,
         "author": "Mariska",
-        "manufacturer": "BambuLabs",
+        "manufacturer": "BambuLab",
         "file_formats": "text/x-gcode",
-        "platform": "bambulabs-3dp-X1.obj",
+        "platform": "bambulab_x1.obj",
         "has_machine_quality": true,
         "has_material": true,
         "has_textured_buildplate": true,
@@ -16,17 +16,17 @@
         "has_variants": true,
         "machine_extruder_trains":
         {
-            "0": "bambulabs_x1_extruder_0",
-            "1": "bambulabs_x1_extruder_1",
-            "2": "bambulabs_x1_extruder_2",
-            "3": "bambulabs_x1_extruder_3"
+            "0": "bambulab_x1_extruder_0",
+            "1": "bambulab_x1_extruder_1",
+            "2": "bambulab_x1_extruder_2",
+            "3": "bambulab_x1_extruder_3"
         },
         "platform_offset": [
             -130,
             0,
             130
         ],
-        "platform_texture": "bambulabs-3dp-logo.png",
+        "platform_texture": "bambulab-buildplate.png",
         "preferred_variant_name": "X1C 0.4mm",
         "weight": 3
     },

resources/extruders/bambulab_a1mini_extruder_0.def.json

@@ -0,0 +1,18 @@
+{
+    "version": 2,
+    "name": "Extruder",
+    "inherits": "fdmextruder",
+    "metadata":
+    {
+        "machine": "bambulabs_a1mini",
+        "position": "0"
+    },
+    "overrides":
+    {
+        "extruder_nr": { "default_value": 0 },
+        "machine_extruder_change_duration": { "default_value": 29 },
+        "machine_extruder_end_code": { "default_value": "M104 S{material_standby_temperature}\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
+        "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nG91\nG0 Z-0.4 F600\nG90" },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

resources/extruders/bambulab_a1mini_extruder_1.def.json

@@ -0,0 +1,18 @@
+{
+    "version": 2,
+    "name": "Extruder",
+    "inherits": "fdmextruder",
+    "metadata":
+    {
+        "machine": "bambulabs_a1mini",
+        "position": "1"
+    },
+    "overrides":
+    {
+        "extruder_nr": { "default_value": 0 },
+        "machine_extruder_change_duration": { "default_value": 29 },
+        "machine_extruder_end_code": { "default_value": "M104 S{material_standby_temperature}\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
+        "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nG91\nG0 Z-0.4 F600\nG90" },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

resources/extruders/bambulab_a1mini_extruder_2.def.json

@@ -0,0 +1,18 @@
+{
+    "version": 2,
+    "name": "Extruder",
+    "inherits": "fdmextruder",
+    "metadata":
+    {
+        "machine": "bambulabs_a1mini",
+        "position": "2"
+    },
+    "overrides":
+    {
+        "extruder_nr": { "default_value": 0 },
+        "machine_extruder_change_duration": { "default_value": 29 },
+        "machine_extruder_end_code": { "default_value": "M104 S{material_standby_temperature}\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
+        "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nG91\nG0 Z-0.4 F600\nG90" },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

resources/extruders/bambulab_a1mini_extruder_3.def.json

@@ -0,0 +1,18 @@
+{
+    "version": 2,
+    "name": "Extruder",
+    "inherits": "fdmextruder",
+    "metadata":
+    {
+        "machine": "bambulabs_a1mini",
+        "position": "3"
+    },
+    "overrides":
+    {
+        "extruder_nr": { "default_value": 0 },
+        "machine_extruder_change_duration": { "default_value": 29 },
+        "machine_extruder_end_code": { "default_value": "M104 S{material_standby_temperature}\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
+        "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nG91\nG0 Z-0.4 F600\nG90" },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

resources/extruders/bambulab_x1_extruder_0.def.json

@@ -0,0 +1,18 @@
+{
+    "version": 2,
+    "name": "Extruder",
+    "inherits": "fdmextruder",
+    "metadata":
+    {
+        "machine": "bambulab_x1",
+        "position": "0"
+    },
+    "overrides":
+    {
+        "extruder_nr": { "default_value": 0 },
+        "machine_extruder_change_duration": { "default_value": 29 },
+        "machine_extruder_end_code": { "default_value": "M104 S{material_standby_temperature}\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" },
+        "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nG91\nG0 Z-0.4 F600\nG90" },
+        "material_diameter": { "default_value": 1.75 }
+    }
+}

resources/extruders/bambulab_x1_extruder_1.def.json

@@ -4,7 +4,7 @@
     "inherits": "fdmextruder",
     "metadata":
     {
-        "machine": "bambulabs_x1",
+        "machine": "bambulab_x1",
         "position": "1"
     },
     "overrides":

resources/extruders/bambulab_x1_extruder_2.def.json

@@ -4,7 +4,7 @@
     "inherits": "fdmextruder",
     "metadata":
     {
-        "machine": "bambulabs_x1",
+        "machine": "bambulab_x1",
         "position": "2"
     },
     "overrides":

resources/extruders/bambulab_x1_extruder_3.def.json

@@ -4,7 +4,7 @@
     "inherits": "fdmextruder",
     "metadata":
     {
-        "machine": "bambulabs_x1",
+        "machine": "bambulab_x1",
         "position": "3"
     },
     "overrides":

resources/extruders/bambulabs_x1_extruder_0.def.json

@@ -1,16 +0,0 @@
-{
-    "version": 2,
-    "name": "Extruder",
-    "inherits": "fdmextruder",
-    "metadata":
-    {
-        "machine": "bambulabs_x1",
-        "position": "0"
-    },
-    "overrides":
-    {
-        "extruder_nr": { "default_value": 0 },
-        "machine_extruder_change_duration": { "default_value": 29 },
-        "material_diameter": { "default_value": 1.75 }
-    }
-}

resources/quality/bambu/bambulab_a1mini_0.4_PLA_standard.inst.cfg

@@ -0,0 +1,14 @@
+[general]
+definition = bambulab_a1mini
+name = Standard
+version = 4
+
+[metadata]
+material = generic_pla
+quality_type = normal
+setting_version = 23
+type = quality
+variant = A1 0.4mm
+
+[values]
+

resources/quality/bambu/bambulab_a1mini_normal.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+definition = bambulab_a1mini
+name = Normal
+version = 4
+
+[metadata]
+global_quality = True
+quality_type = normal
+setting_version = 22
+type = quality
+weight = 0
+
+[values]
+layer_height = 0.2
+

resources/quality/bambu/bambulab_x1_0.4_PLA_standard.inst.cfg

@@ -1,5 +1,5 @@
 [general]
-definition = bambulabs_x1
+definition = bambulab_x1
 name = Standard
 version = 4
 

resources/quality/bambu/bambulab_x1_normal.inst.cfg

@@ -1,5 +1,5 @@
 [general]
-definition = bambulabs_x1
+definition = bambulab_x1
 name = Normal
 version = 4
 

resources/quality/bambu/bambulab_x1c_0.4_PLA_standard.inst.cfg

@@ -1,5 +1,5 @@
 [general]
-definition = bambulabs_x1
+definition = bambulab_x1
 name = Standard
 version = 4
 

resources/variants/bambu/bambulab_a1_0.4.inst.cfg

@@ -0,0 +1,13 @@
+[general]
+definition = bambulab_a1mini
+name = A1 0.4mm
+version = 4
+
+[metadata]
+hardware_type = nozzle
+setting_version = 23
+type = variant
+
+[values]
+machine_nozzle_size = 0.4
+

resources/variants/bambu/bambulab_p1p_0.4.inst.cfg

@@ -1,5 +1,5 @@
 [general]
-definition = bambulabs_x1
+definition = bambulab_x1
 name = P1P 0.4mm
 version = 4
 

resources/variants/bambu/bambulab_p1s_0.4.inst.cfg

@@ -1,5 +1,5 @@
 [general]
-definition = bambulabs_x1
+definition = bambulab_x1
 name = P1P 0.4mm
 version = 4
 

resources/variants/bambu/bambulab_x1_0.4.inst.cfg

@@ -1,5 +1,5 @@
 [general]
-definition = bambulabs_x1
+definition = bambulab_x1
 name = X1 0.4mm
 version = 4
 

resources/variants/bambu/bambulab_x1c_0.4.inst.cfg

@@ -1,5 +1,5 @@
 [general]
-definition = bambulabs_x1
+definition = bambulab_x1
 name = X1C 0.4mm
 version = 4