From 6fb8abcd9ff1b428160c0e02b902cb7a8013ad6f Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 21 Mar 2023 20:45:12 +0100 Subject: [PATCH] Fix override default_value Contributes to CURA-10435 --- .../definitions/mixware_hyper_s.def.json | 2 +- resources/definitions/mixware_vulcan.def.json | 18 +++++++-------- resources/definitions/mixware_wand.def.json | 22 +++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/resources/definitions/mixware_hyper_s.def.json b/resources/definitions/mixware_hyper_s.def.json index 549ab7775c..60940b2a3c 100644 --- a/resources/definitions/mixware_hyper_s.def.json +++ b/resources/definitions/mixware_hyper_s.def.json @@ -117,7 +117,7 @@ "speed_wall_x": { "value": "speed_wall" }, "speed_z_hop": { "default_value": 5 }, "support_angle": { "default_value": 60 }, - "support_bottom_stair_step_height": { "default_value": 0.2 }, + "support_bottom_stair_step_height": { "value": 0.2 }, "support_brim_width": { "default_value": 4 }, "support_enable": { "default_value": true }, "support_interface_density": { "default_value": 80 }, diff --git a/resources/definitions/mixware_vulcan.def.json b/resources/definitions/mixware_vulcan.def.json index 1ce3fa2767..a91d28e10f 100644 --- a/resources/definitions/mixware_vulcan.def.json +++ b/resources/definitions/mixware_vulcan.def.json @@ -20,7 +20,7 @@ { "acceleration_enabled": { "default_value": true }, "acceleration_print": { "default_value": 500 }, - "acceleration_travel": { "default_value": 500 }, + "acceleration_travel": { "value": 500 }, "adhesion_type": { "default_value": "raft" }, "brim_width": { @@ -52,7 +52,7 @@ "material_diameter": { "default_value": 1.75 }, "material_print_temperature": { - "default_value": 200, + "value": 200, "maximum_warning_value": "250", "minimum_warning_value": "180" }, @@ -83,13 +83,13 @@ }, "retraction_prime_speed": { - "default_value": 40, + "value": 40, "maximum_warning_value": "55", "minimum_warning_value": "40" }, "retraction_retract_speed": { - "default_value": 40, + "value": 40, "maximum_warning_value": "55", "minimum_warning_value": "40" }, @@ -112,18 +112,18 @@ }, "speed_travel": { - "default_value": 80, + "value": 80, "maximum_warning_value": "150", "minimum_warning_value": "80" }, "support_enable": { "default_value": true }, - "support_infill_rate": { "default_value": 20 }, + "support_infill_rate": { "value": 20 }, "support_interface_enable": { "default_value": true }, - "support_offset": { "default_value": 0.2 }, - "support_roof_enable": { "default_value": true }, + "support_offset": { "value": 0.2 }, + "support_roof_enable": { "value": true }, "support_top_distance": { - "default_value": 0.25, + "value": 0.25, "maximum_warning_value": "0.25", "minimum_warning_value": "0.15" }, diff --git a/resources/definitions/mixware_wand.def.json b/resources/definitions/mixware_wand.def.json index 8bb760cdeb..90f9430000 100644 --- a/resources/definitions/mixware_wand.def.json +++ b/resources/definitions/mixware_wand.def.json @@ -20,7 +20,7 @@ { "acceleration_enabled": { "default_value": true }, "acceleration_print": { "default_value": 500 }, - "acceleration_travel": { "default_value": 500 }, + "acceleration_travel": { "value": 500 }, "adhesion_type": { "default_value": "raft" }, "brim_width": { @@ -41,10 +41,10 @@ "machine_nozzle_size": { "default_value": 0.4 }, "machine_start_gcode": { "default_value": "G28 ;Home\n;Prime the extruder\nM117 Print\nG92 E0\nG1 F1500 X-2 Y0 Z0.28\nG1 F2400 X-2 Y70 Z0.28 E8\nG1 F1500 X-1.7 Y70 Z0.28\nG1 F2400 X-1.7 Y0 Z0.28 E16\nG92 E0\nG92 E0\nG1 Z0.18 F2400 ;Move Z Axis up" }, "machine_width": { "default_value": 102 }, - "material_bed_temperature": { "default_value": 0 }, + "material_bed_temperature": { "value": 0 }, "material_print_temperature": { - "default_value": 200, + "value": 200, "maximum_warning_value": "220", "minimum_warning_value": "180" }, @@ -71,19 +71,19 @@ }, "retraction_extrusion_window": { - "default_value": 3, + "value": 3, "maximum_warning_value": "5.5", "minimum_warning_value": "2" }, "retraction_prime_speed": { - "default_value": 40, + "value": 40, "maximum_warning_value": "55", "minimum_warning_value": "40" }, "retraction_retract_speed": { - "default_value": 40, + "value": 40, "maximum_warning_value": "55", "minimum_warning_value": "40" }, @@ -107,19 +107,19 @@ }, "speed_travel": { - "default_value": 80, + "value": 80, "maximum_warning_value": "120", "minimum_warning_value": "80" }, "support_angle": { "default_value": 60 }, "support_enable": { "default_value": true }, - "support_infill_rate": { "default_value": 20 }, + "support_infill_rate": { "value": 20 }, "support_interface_enable": { "default_value": true }, - "support_offset": { "default_value": 0.2 }, - "support_roof_enable": { "default_value": true }, + "support_offset": { "value": 0.2 }, + "support_roof_enable": { "value": true }, "support_top_distance": { - "default_value": 0.25, + "value": 0.25, "maximum_warning_value": "0.25", "minimum_warning_value": "0.15" },