From 61d18f22b2e1cfefc32a3457f302a5ed21b8b1a0 Mon Sep 17 00:00:00 2001 From: Konstantinos Karmas Date: Wed, 29 Sep 2021 13:35:21 +0200 Subject: [PATCH] Fix combing value not being recognized The value of an enum needs to be in single quotes when it is in the "value" field or else it won't be recognized. CURA-7976 --- resources/definitions/anycubic_mega_zero.def.json | 2 +- resources/definitions/atmat_signal_pro_base.def.json | 2 +- resources/definitions/creatable_d3.def.json | 2 +- resources/definitions/deltacomb_base.def.json | 2 +- resources/definitions/inat_base.def.json | 2 +- resources/definitions/julia.def.json | 2 +- resources/definitions/leapfrog_bolt_pro.def.json | 2 +- resources/definitions/liquid.def.json | 2 +- resources/definitions/malyan_m200.def.json | 2 +- resources/definitions/monoprice_select_mini_v2.def.json | 2 +- resources/definitions/renkforce_rf100.def.json | 2 +- resources/definitions/renkforce_rf100_v2.def.json | 2 +- resources/definitions/renkforce_rf100_xl.def.json | 2 +- resources/definitions/robo_3d_r1.def.json | 2 +- resources/definitions/seemecnc_artemis.def.json | 2 +- resources/definitions/seemecnc_v32.def.json | 2 +- resources/definitions/skriware_2.def.json | 2 +- resources/definitions/strateo3d.def.json | 2 +- resources/definitions/tizyx_evy.def.json | 2 +- resources/definitions/tizyx_evy_dual.def.json | 2 +- resources/definitions/tizyx_k25.def.json | 2 +- resources/definitions/voron2_base.def.json | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/resources/definitions/anycubic_mega_zero.def.json b/resources/definitions/anycubic_mega_zero.def.json index ff37b87061..5f71d243ab 100644 --- a/resources/definitions/anycubic_mega_zero.def.json +++ b/resources/definitions/anycubic_mega_zero.def.json @@ -92,7 +92,7 @@ "retraction_hop_enabled": { "value": "True" }, "retraction_hop": { "value": 0.2 }, - "retraction_combing": { "value": "noskin" }, + "retraction_combing": { "value": "'noskin'" }, "retraction_combing_max_distance": { "value": 30 }, "travel_avoid_other_parts": { "value": true }, diff --git a/resources/definitions/atmat_signal_pro_base.def.json b/resources/definitions/atmat_signal_pro_base.def.json index 947b2935e6..187ef50646 100644 --- a/resources/definitions/atmat_signal_pro_base.def.json +++ b/resources/definitions/atmat_signal_pro_base.def.json @@ -225,7 +225,7 @@ "retraction_prime_speed": { "value": "math.ceil(retraction_speed * 0.4)", "maximum_value_warning": "130" }, "retraction_hop_enabled": { "value": "True" }, "retraction_hop": { "value": "0.5" }, - "retraction_combing": { "value": "noskin" }, + "retraction_combing": { "value": "'noskin'" }, "retraction_combing_max_distance": { "value": "10" }, "travel_avoid_other_parts": { "value": "True" }, "travel_avoid_supports": { "value": "True" }, diff --git a/resources/definitions/creatable_d3.def.json b/resources/definitions/creatable_d3.def.json index 14c787bb1b..a95fe44ff1 100644 --- a/resources/definitions/creatable_d3.def.json +++ b/resources/definitions/creatable_d3.def.json @@ -27,7 +27,7 @@ "gantry_height": {"value": "43"}, "layer_height": { "default_value": 0.1 }, "relative_extrusion": { "value": "False" }, - "retraction_combing": { "value": "off" }, + "retraction_combing": { "value": "'off'" }, "retraction_hop_enabled": { "default_value": true }, "retraction_hop_only_when_collides": { "default_value": false }, "retraction_speed": { "default_value": 100 }, diff --git a/resources/definitions/deltacomb_base.def.json b/resources/definitions/deltacomb_base.def.json index c596a45a1a..a977dee663 100644 --- a/resources/definitions/deltacomb_base.def.json +++ b/resources/definitions/deltacomb_base.def.json @@ -64,7 +64,7 @@ "retraction_hop": { "default_value": 1.0 }, "retraction_amount" : { "default_value": 3.5 }, "retraction_speed" : { "default_value": 40 }, - "retraction_combing" : { "value": "noskin" }, + "retraction_combing" : { "value": "'noskin'" }, "travel_avoid_distance": { "value": "1" }, "travel_avoid_supports": { "value": "True" }, "retraction_hop_only_when_collides": { "value": "1" }, diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json index 974ae9ac5a..61a543c9cc 100644 --- a/resources/definitions/inat_base.def.json +++ b/resources/definitions/inat_base.def.json @@ -369,7 +369,7 @@ "value": 45 }, "retraction_combing": { - "value": "infill" + "value": "'infill'" }, "retraction_hop_enabled": { "value": true diff --git a/resources/definitions/julia.def.json b/resources/definitions/julia.def.json index cbcb827ee8..43c62a46b2 100644 --- a/resources/definitions/julia.def.json +++ b/resources/definitions/julia.def.json @@ -30,7 +30,7 @@ "support_pattern": { "default_value": "grid" }, "infill_sparse_density": { "default_value": 10 }, "machine_extruder_count": { "default_value": 1 }, - "retraction_combing": { "value": "off" }, + "retraction_combing": { "value": "'off'" }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, "machine_height": { "default_value": 260 }, diff --git a/resources/definitions/leapfrog_bolt_pro.def.json b/resources/definitions/leapfrog_bolt_pro.def.json index cb12b12b93..e7ccc76735 100644 --- a/resources/definitions/leapfrog_bolt_pro.def.json +++ b/resources/definitions/leapfrog_bolt_pro.def.json @@ -97,7 +97,7 @@ "material_final_print_temperature": {"value": "default_material_print_temperature" }, "material_initial_print_temperature": {"value": "default_material_print_temperature" }, "gantry_height": {"value": "20"}, - "retraction_combing": { "value": "all" }, + "retraction_combing": { "value": "'all'" }, "retraction_amount": {"default_value": 2}, "adhesion_type": {"default_value": "skirt"}, "skirt_line_count": {"default_value": 3}, diff --git a/resources/definitions/liquid.def.json b/resources/definitions/liquid.def.json index c25aa81a93..77262a494f 100644 --- a/resources/definitions/liquid.def.json +++ b/resources/definitions/liquid.def.json @@ -172,7 +172,7 @@ "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 100" }, "meshfix_maximum_deviation": { "value": "layer_height / 4" }, "optimize_wall_printing_order": { "value": "True" }, - "retraction_combing": { "value": "all" }, + "retraction_combing": { "value": "'all'" }, "initial_layer_line_width_factor": { "value": "120" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } diff --git a/resources/definitions/malyan_m200.def.json b/resources/definitions/malyan_m200.def.json index 4748c4d229..c8eb4eb654 100644 --- a/resources/definitions/malyan_m200.def.json +++ b/resources/definitions/malyan_m200.def.json @@ -76,7 +76,7 @@ "raft_surface_layers": { "default_value": 1 }, "skirt_line_count": { "default_value": 2}, "brim_width" : { "default_value": 5}, - "retraction_combing": { "value": "noskin" }, + "retraction_combing": { "value": "'noskin'" }, "retraction_amount" : { "default_value": 4.5}, "retraction_speed" : { "default_value": 40}, "coasting_enable": { "default_value": true }, diff --git a/resources/definitions/monoprice_select_mini_v2.def.json b/resources/definitions/monoprice_select_mini_v2.def.json index 688a096656..004de649f1 100644 --- a/resources/definitions/monoprice_select_mini_v2.def.json +++ b/resources/definitions/monoprice_select_mini_v2.def.json @@ -23,7 +23,7 @@ "default_value": "G0 X0 Y120;(Stick out the part)\nM190 S0;(Turn off heat bed, don't wait.)\nG92 E10;(Set extruder to 10)\nG1 E7 F200;(retract 3mm)\nM104 S0;(Turn off nozzle, don't wait)\nG4 S300;(Delay 5 minutes)\nM107;(Turn off part fan)\nM84;(Turn off stepper motors.)" }, "adhesion_type": { "default_value": "brim" }, - "retraction_combing": { "value": "noskin" }, + "retraction_combing": { "value": "'noskin'" }, "retraction_amount" : { "default_value": 2.5}, "retraction_speed" : { "default_value": 40}, "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" } diff --git a/resources/definitions/renkforce_rf100.def.json b/resources/definitions/renkforce_rf100.def.json index 213c54f9a4..7ad092ce8f 100644 --- a/resources/definitions/renkforce_rf100.def.json +++ b/resources/definitions/renkforce_rf100.def.json @@ -153,7 +153,7 @@ "value": "5.0" }, "retraction_combing": { - "value": "all" + "value": "'all'" }, "retraction_enable": { "value": "True" diff --git a/resources/definitions/renkforce_rf100_v2.def.json b/resources/definitions/renkforce_rf100_v2.def.json index 8443e0fcad..05907a1c20 100644 --- a/resources/definitions/renkforce_rf100_v2.def.json +++ b/resources/definitions/renkforce_rf100_v2.def.json @@ -153,7 +153,7 @@ "value": "5.0" }, "retraction_combing": { - "value": "all" + "value": "'all'" }, "retraction_enable": { "value": "True" diff --git a/resources/definitions/renkforce_rf100_xl.def.json b/resources/definitions/renkforce_rf100_xl.def.json index d29445e233..f0e8644ae4 100644 --- a/resources/definitions/renkforce_rf100_xl.def.json +++ b/resources/definitions/renkforce_rf100_xl.def.json @@ -141,7 +141,7 @@ "value": "5.0" }, "retraction_combing": { - "value": "all" + "value": "'all'" }, "retraction_enable": { "value": "True" diff --git a/resources/definitions/robo_3d_r1.def.json b/resources/definitions/robo_3d_r1.def.json index 8fbc80bcf3..5ef21cef8b 100644 --- a/resources/definitions/robo_3d_r1.def.json +++ b/resources/definitions/robo_3d_r1.def.json @@ -36,7 +36,7 @@ "layer_height": { "default_value": 0.2 }, "speed_print": { "default_value": 40 }, "machine_extruder_count": { "default_value": 1 }, - "retraction_combing": { "value": "off" }, + "retraction_combing": { "value": "'off'" }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, "machine_height": { "default_value": 210 }, diff --git a/resources/definitions/seemecnc_artemis.def.json b/resources/definitions/seemecnc_artemis.def.json index e67fff3a65..1501d2c68d 100644 --- a/resources/definitions/seemecnc_artemis.def.json +++ b/resources/definitions/seemecnc_artemis.def.json @@ -29,7 +29,7 @@ "machine_width": { "default_value": 290 }, "relative_extrusion": { "value": "False" }, "retraction_amount": { "default_value": 3.2 }, - "retraction_combing": { "value": "off" }, + "retraction_combing": { "value": "'off'" }, "retraction_hop_enabled": { "default_value": true }, "retraction_hop_only_when_collides": { "default_value": false }, "retraction_speed": { "default_value": 45 }, diff --git a/resources/definitions/seemecnc_v32.def.json b/resources/definitions/seemecnc_v32.def.json index 37457e99b3..46a5e63f01 100644 --- a/resources/definitions/seemecnc_v32.def.json +++ b/resources/definitions/seemecnc_v32.def.json @@ -29,7 +29,7 @@ "machine_width": { "default_value": 265 }, "relative_extrusion": { "value": "False" }, "retraction_amount": { "default_value": 3.2 }, - "retraction_combing": { "value": "off" }, + "retraction_combing": { "value": "'off'" }, "retraction_hop_enabled": { "default_value": true }, "retraction_hop_only_when_collides": { "default_value": false }, "retraction_speed": { "default_value": 45 }, diff --git a/resources/definitions/skriware_2.def.json b/resources/definitions/skriware_2.def.json index 636b52293d..ed047eb637 100644 --- a/resources/definitions/skriware_2.def.json +++ b/resources/definitions/skriware_2.def.json @@ -417,7 +417,7 @@ "value": "1" }, "retraction_combing": { - "value": "infill" + "value": "'infill'" }, "acceleration_prime_tower": { "value": "250" diff --git a/resources/definitions/strateo3d.def.json b/resources/definitions/strateo3d.def.json index 6d6f51dc56..cc4038586c 100644 --- a/resources/definitions/strateo3d.def.json +++ b/resources/definitions/strateo3d.def.json @@ -116,7 +116,7 @@ "prime_tower_position_x": { "value": "machine_width/2 + prime_tower_size/2" }, "prime_tower_position_y": { "value": "machine_depth - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" }, "retraction_amount": { "default_value": 1.5 }, - "retraction_combing": { "value": "all" }, + "retraction_combing": { "value": "'all'" }, "retraction_combing_max_distance": { "default_value": 5 }, "retraction_count_max": { "default_value": 15 }, "retraction_hop": { "value": "2" }, diff --git a/resources/definitions/tizyx_evy.def.json b/resources/definitions/tizyx_evy.def.json index 1113d3b3e2..5032ee16d7 100644 --- a/resources/definitions/tizyx_evy.def.json +++ b/resources/definitions/tizyx_evy.def.json @@ -70,6 +70,6 @@ "z_seam_type": {"default_value": "back"}, "z_seam_x": {"value": "127.5"}, "z_seam_y": {"value": "250"}, - "retraction_combing": {"value": "off"} + "retraction_combing": {"value": "'off'"} } } diff --git a/resources/definitions/tizyx_evy_dual.def.json b/resources/definitions/tizyx_evy_dual.def.json index fa18970f7e..2aafa5cecc 100644 --- a/resources/definitions/tizyx_evy_dual.def.json +++ b/resources/definitions/tizyx_evy_dual.def.json @@ -58,6 +58,6 @@ "z_seam_type": {"default_value": "back"}, "z_seam_x": {"value": "127.5"}, "z_seam_y": {"value": "250"}, - "retraction_combing": {"value": "off"} + "retraction_combing": {"value": "'off'"} } } diff --git a/resources/definitions/tizyx_k25.def.json b/resources/definitions/tizyx_k25.def.json index a74b51b57a..9f65d67313 100644 --- a/resources/definitions/tizyx_k25.def.json +++ b/resources/definitions/tizyx_k25.def.json @@ -55,6 +55,6 @@ "z_seam_type": {"default_value": "back"}, "z_seam_x": {"value": "127.5"}, "z_seam_y": {"value": "250"}, - "retraction_combing": {"value": "off"} + "retraction_combing": {"value": "'off'"} } } diff --git a/resources/definitions/voron2_base.def.json b/resources/definitions/voron2_base.def.json index a12c75d03a..ef1e79cc78 100644 --- a/resources/definitions/voron2_base.def.json +++ b/resources/definitions/voron2_base.def.json @@ -104,7 +104,7 @@ "retraction_prime_speed": { "value": "math.ceil(retraction_speed * 0.4)", "maximum_value_warning": 130 }, "retraction_hop_enabled": { "default_value": true }, "retraction_hop": { "default_value": 0.2 }, - "retraction_combing": { "value": "noskin" }, + "retraction_combing": { "value": "'noskin'" }, "retraction_combing_max_distance": { "default_value": 10 }, "travel_avoid_other_parts": { "default_value": false }, "speed_travel": { "maximum_value": 300, "value": 300, "maximum_value_warning": 501 },