Просмотр исходного кода

JSON fix: moved prime location to category platform_adhesion (CURA-1816)

Tim Kuipers 8 лет назад
Родитель
Сommit
942539981b
2 измененных файлов с 46 добавлено и 36 удалено
  1. 22 12
      resources/definitions/fdmextruder.def.json
  2. 24 24
      resources/definitions/fdmprinter.def.json

+ 22 - 12
resources/definitions/fdmextruder.def.json

@@ -145,6 +145,28 @@
                     "settable_per_meshgroup": false,
                     "settable_globally": false
                 },
+                "extruder_prime_pos_z":
+                {
+                    "label": "Extruder Prime Z Position",
+                    "description": "The Z coordinate of the position where the nozzle primes at the start of printing.",
+                    "type": "float",
+                    "unit": "mm",
+                    "default_value": 0,
+                    "minimum_value_warning": "0",
+                    "maximum_value_warning": "machine_height",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true
+                }
+            }
+        },
+        "platform_adhesion":
+        {
+            "label": "Platform Adhesion",
+            "type": "category",
+            "icon": "category_adhesion",
+            "description": "Adhesion",
+            "children":
+            {
                 "extruder_prime_pos_x":
                 {
                     "label": "Extruder Prime X Position",
@@ -168,18 +190,6 @@
                     "maximum_value_warning": "machine_depth",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
-                },
-                "extruder_prime_pos_z":
-                {
-                    "label": "Extruder Prime Z Position",
-                    "description": "The Z coordinate of the position where the nozzle primes at the start of printing.",
-                    "type": "float",
-                    "unit": "mm",
-                    "default_value": 0,
-                    "minimum_value_warning": "0",
-                    "maximum_value_warning": "machine_height",
-                    "settable_per_mesh": false,
-                    "settable_per_extruder": true
                 }
             }
         }

+ 24 - 24
resources/definitions/fdmprinter.def.json

@@ -326,30 +326,6 @@
                     "settable_per_extruder": false,
                     "settable_per_meshgroup": false
                 },
-                "extruder_prime_pos_x":
-                {
-                    "label": "Extruder Prime X Position",
-                    "description": "The X coordinate of the position where the nozzle primes at the start of printing.",
-                    "type": "float",
-                    "unit": "mm",
-                    "default_value": 0,
-                    "minimum_value_warning": "0",
-                    "maximum_value_warning": "machine_width",
-                    "settable_per_mesh": false,
-                    "settable_per_extruder": true
-                },
-                "extruder_prime_pos_y":
-                {
-                    "label": "Extruder Prime Y Position",
-                    "description": "The Y coordinate of the position where the nozzle primes at the start of printing.",
-                    "type": "float",
-                    "unit": "mm",
-                    "default_value": 0,
-                    "minimum_value_warning": "0",
-                    "maximum_value_warning": "machine_depth",
-                    "settable_per_mesh": false,
-                    "settable_per_extruder": true
-                },
                 "extruder_prime_pos_z":
                 {
                     "label": "Extruder Prime Z Position",
@@ -2448,6 +2424,30 @@
             "description": "Adhesion",
             "children":
             {
+                "extruder_prime_pos_x":
+                {
+                    "label": "Extruder Prime X Position",
+                    "description": "The X coordinate of the position where the nozzle primes at the start of printing.",
+                    "type": "float",
+                    "unit": "mm",
+                    "default_value": 0,
+                    "minimum_value_warning": "0",
+                    "maximum_value_warning": "machine_width",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true
+                },
+                "extruder_prime_pos_y":
+                {
+                    "label": "Extruder Prime Y Position",
+                    "description": "The Y coordinate of the position where the nozzle primes at the start of printing.",
+                    "type": "float",
+                    "unit": "mm",
+                    "default_value": 0,
+                    "minimum_value_warning": "0",
+                    "maximum_value_warning": "machine_depth",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true
+                },
                 "adhesion_type":
                 {
                     "label": "Platform Adhesion Type",