Browse Source

Fix Biqu definition files

There were a number of problems with it:
* There were duplicate JSON keys. One of the duplicates gets ignored then according to the JSON implementation in Python.
* There were some 'value' properties that contained undefined variables since the setting type was a string and the value is a string containing a Python expression that should result in a string, not a plain string.
* There was one instance in which a 'default_value' property contained a formula.

Contributes to issue CURA-7752.
Ghostkeeper 4 years ago
parent
commit
9b5005fc90

+ 2 - 15
resources/definitions/biqu_b1.def.json

@@ -14,32 +14,19 @@
         ]
     },
     "overrides": {
-        "coasting_enable": { "default_value": true },
         "coasting_enable": { "value": true },
-        "retraction_amount": { "default_value": 7 },
         "retraction_amount": { "value": 7 },
-        "retraction_speed": { "default_value": 70 },
         "retraction_speed": { "value": 70 },
-        "support_enable": { "default_value": true },
         "support_enable": { "value": true },
-        "support_structure": { "default_value": "normal" },
-        "support_structure": { "value": "normal" },
-        "support_type": { "default_value": "buildplate" },
-        "support_type": { "value": "buildplate" },
-        "support_angle": { "default_value": 45 },
+        "support_structure": { "value": "'normal'" },
+        "support_type": { "value": "'buildplate'" },
         "support_angle": { "value": 45 },
-        "support_infill_rate": { "default_value": 15 },
         "support_infill_rate": { "value": 15 },
-        "infill_overlap_mm": { "default_value": 0.06 },
         "infill_overlap_mm": { "value": 0.06 },
-        "speed_print": { "default_value": 60 },
         "speed_print": { "value": 60 },
         "machine_name": { "default_value": "BIQU B1" },
-        "machine_width": { "default_value": 235 },
         "machine_width": { "value": 235 },
-        "machine_depth": { "default_value": 235 },
         "machine_depth": { "value": 235 },
-        "machine_height": { "default_value": 270 },
         "machine_height": { "value": 270 },
         "machine_head_with_fans_polygon": { "default_value": [
                 [-33, 35],

+ 2 - 15
resources/definitions/biqu_b1_abl.def.json

@@ -14,32 +14,19 @@
         ]
     },
     "overrides": {
-        "coasting_enable": { "default_value": true },
         "coasting_enable": { "value": true },
-        "retraction_amount": { "default_value": 7 },
         "retraction_amount": { "value": 7 },
-        "retraction_speed": { "default_value": 70 },
         "retraction_speed": { "value": 70 },
-        "support_enable": { "default_value": true },
         "support_enable": { "value": true },
-        "support_structure": { "default_value": "normal" },
-        "support_structure": { "value": "normal" },
-        "support_type": { "default_value": "buildplate" },
-        "support_type": { "value": "buildplate" },
-        "support_angle": { "default_value": 45 },
+        "support_structure": { "value": "'normal'" },
+        "support_type": { "value": "'buildplate'" },
         "support_angle": { "value": 45 },
-        "support_infill_rate": { "default_value": 15 },
         "support_infill_rate": { "value": 15 },
-        "infill_overlap_mm": { "default_value": 0.06 },
         "infill_overlap_mm": { "value": 0.06 },
-        "speed_print": { "default_value": 60 },
         "speed_print": { "value": 60 },
         "machine_name": { "default_value": "BIQU B1 ABL" },
-        "machine_width": { "default_value": 235 },
         "machine_width": { "value": 235 },
-        "machine_depth": { "default_value": 235 },
         "machine_depth": { "value": 235 },
-        "machine_height": { "default_value": 270 },
         "machine_height": { "value": 270 },
         "machine_head_with_fans_polygon": { "default_value": [
                 [-33, 35],

+ 3 - 5
resources/definitions/biqu_base.def.json

@@ -9,9 +9,9 @@
         "file_formats": "text/x-gcode",
         "first_start_actions": ["MachineSettingsAction"],
 
-    	"machine_extruder_trains": {
-        	"0": "biqu_base_extruder_0"
-    	},
+        "machine_extruder_trains": {
+            "0": "biqu_base_extruder_0"
+        },
 
         "has_materials": true,
         "has_variants": true,
@@ -88,7 +88,6 @@
         "z_seam_type": { "value": "'back'" },
         "z_seam_corner": { "value": "'z_seam_corner_weighted'" },
 
-        "infill_line_width": { "default_value": "line_width * 1.2" },
         "infill_line_width": { "value": "line_width * 1.2" },
         "infill_sparse_density": { "value": "20" },
         "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
@@ -164,6 +163,5 @@
         "minimum_interface_area": { "value": 10 },
         "top_bottom_thickness": {"value":  "layer_height_0 + layer_height * 3" },
         "wall_thickness": {"value": "line_width * 2" }
-
     }
 }