From 96f989c33bab31059709ac097a90a37b05c39879 Mon Sep 17 00:00:00 2001
From: Konstantinos Karmas <konskarm@gmail.com>
Date: Tue, 28 Sep 2021 14:06:25 +0200
Subject: [PATCH 1/7] Add "No outer surfaces" combing option

CURA-7976
---
 resources/definitions/fdmprinter.def.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 35f36df216..bd1b749878 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -3850,11 +3850,12 @@
                     {
                         "off": "Off",
                         "all": "All",
+                        "no_outer_surfaces": "Not on Outer Surface",
                         "noskin": "Not in Skin",
                         "infill": "Within Infill"
                     },
                     "default_value": "all",
-                    "resolve": "'noskin' if 'noskin' in extruderValues('retraction_combing') else ('infill' if 'infill' in extruderValues('retraction_combing') else ('all' if 'all' in extruderValues('retraction_combing') else 'off'))",
+                    "resolve": "'noskin' if 'noskin' in extruderValues('retraction_combing') else ('infill' if 'infill' in extruderValues('retraction_combing') else ('all' if 'all' in extruderValues('retraction_combing') else ('no_outer_surfaces' if 'no_outer_surfaces' in extruderValues('retraction_combing') else 'off')))",
                     "settable_per_mesh": false,
                     "settable_per_extruder": false
                 },

From f1174cb7f6f2c26bee408525bfde7cdc374a0bf5 Mon Sep 17 00:00:00 2001
From: Konstantinos Karmas <konskarm@gmail.com>
Date: Tue, 28 Sep 2021 15:15:37 +0200
Subject: [PATCH 2/7] Enable the "Not on outer surfaces" combing mode if
 monotonic or ironing

The "Combing": "Not in outer surfaces" option will be activated for all extruders in the following cases:

1. Monotonic Top/Bottom Order is enabled (in any extruder)
2. Ironing is enabled (in any extruder)
3. Top Surface Skin Layers > 0 and Monotonic Top Surface Order is enabled (in any extruder)

CURA-7976
---
 resources/definitions/fdmprinter.def.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index bd1b749878..708f6105db 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -3855,6 +3855,7 @@
                         "infill": "Within Infill"
                     },
                     "default_value": "all",
+                    "value": "'no_outer_surfaces' if (any(extruderValues('skin_monotonic')) or any(extruderValues('ironing_enabled')) or (any(extruderValues('roofing_monotonic')) and any(extruderValues('roofing_layer_count')))) else 'all'",
                     "resolve": "'noskin' if 'noskin' in extruderValues('retraction_combing') else ('infill' if 'infill' in extruderValues('retraction_combing') else ('all' if 'all' in extruderValues('retraction_combing') else ('no_outer_surfaces' if 'no_outer_surfaces' in extruderValues('retraction_combing') else 'off')))",
                     "settable_per_mesh": false,
                     "settable_per_extruder": false

From e1b56f918810c8863c88189ec858e665bda09f0d Mon Sep 17 00:00:00 2001
From: Konstantinos Karmas <konskarm@gmail.com>
Date: Tue, 28 Sep 2021 15:38:39 +0200
Subject: [PATCH 3/7] Remove "default_value" since the "value" overrides it

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/julia.def.json                    | 2 +-
 resources/definitions/leapfrog_bolt_pro.def.json        | 2 +-
 resources/definitions/liquid.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/ultimaker_s3.def.json             | 2 +-
 resources/definitions/ultimaker_s5.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 b0c3132858..ff37b87061 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": { "default_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 774c179a34..947b2935e6 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":                           { "default_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 864e25301f..14c787bb1b 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": { "default_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 254257036a..c596a45a1a 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" :               { "default_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/julia.def.json b/resources/definitions/julia.def.json
index 15e5057a55..cbcb827ee8 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": { "default_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 904215853b..cb12b12b93 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": { "default_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 744cbb9f3c..c25aa81a93 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": { "default_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/monoprice_select_mini_v2.def.json b/resources/definitions/monoprice_select_mini_v2.def.json
index d671f319ad..688a096656 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": { "default_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 0f0c4eed97..213c54f9a4 100644
--- a/resources/definitions/renkforce_rf100.def.json
+++ b/resources/definitions/renkforce_rf100.def.json
@@ -153,7 +153,7 @@
             "value": "5.0"
         },
         "retraction_combing": {
-            "default_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 218e6e1feb..8443e0fcad 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": {
-            "default_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 5ab40d7e7f..d29445e233 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": {
-            "default_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 e72b0a2688..8fbc80bcf3 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": { "default_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 89fc9e4993..e67fff3a65 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": { "default_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 06414f0b1d..37457e99b3 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": { "default_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 f46213dde7..636b52293d 100644
--- a/resources/definitions/skriware_2.def.json
+++ b/resources/definitions/skriware_2.def.json
@@ -417,7 +417,7 @@
       "value": "1"
     },
     "retraction_combing": {
-      "default_value": "infill"
+      "value": "infill"
     },
     "acceleration_prime_tower": {
       "value": "250"
diff --git a/resources/definitions/strateo3d.def.json b/resources/definitions/strateo3d.def.json
index 9c865fe233..6d6f51dc56 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": { "default_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 7776007f41..1113d3b3e2 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": {"default_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 3b6892682a..fa18970f7e 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": {"default_value": "off"}
+        "retraction_combing": {"value": "off"}
     }
 }
diff --git a/resources/definitions/tizyx_k25.def.json b/resources/definitions/tizyx_k25.def.json
index ccaa6fff0b..a74b51b57a 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": {"default_value": "off"}
+        "retraction_combing": {"value": "off"}
     }
 }
diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
index 3b61a18120..af079d3484 100644
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@@ -158,7 +158,7 @@
         "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" },
         "meshfix_maximum_deviation": { "value": "layer_height / 4" },
         "optimize_wall_printing_order": { "value": "True" },
-        "retraction_combing": { "default_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/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
index 8e701eeff4..e439ffea86 100644
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@@ -160,7 +160,7 @@
         "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" },
         "meshfix_maximum_deviation": { "value": "layer_height / 4" },
         "optimize_wall_printing_order": { "value": "True" },
-        "retraction_combing": { "default_value": "all" },
+        "retraction_combing": { "value": "all" },
         "initial_layer_line_width_factor": { "value": "120" },
         "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" },
         "build_volume_temperature": { "maximum_value": 50 }
diff --git a/resources/definitions/voron2_base.def.json b/resources/definitions/voron2_base.def.json
index b6938ad991..a12c75d03a 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":                           { "default_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 },

From 54aaa91bfc0be0110085446fb68c85e54ea5697b Mon Sep 17 00:00:00 2001
From: Konstantinos Karmas <konskarm@gmail.com>
Date: Tue, 28 Sep 2021 15:42:22 +0200
Subject: [PATCH 4/7] Change "default_value" to "value" in
 malayan_m200.def.json

CURA-7976
---
 resources/definitions/malyan_m200.def.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/definitions/malyan_m200.def.json b/resources/definitions/malyan_m200.def.json
index e9980724cb..4748c4d229 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": { "default_value": "noskin" },
+        "retraction_combing": { "value": "noskin" },
         "retraction_amount" : { "default_value": 4.5},
         "retraction_speed" : { "default_value": 40},
         "coasting_enable": { "default_value": true },

From 61d18f22b2e1cfefc32a3457f302a5ed21b8b1a0 Mon Sep 17 00:00:00 2001
From: Konstantinos Karmas <konskarm@gmail.com>
Date: Wed, 29 Sep 2021 13:35:21 +0200
Subject: [PATCH 5/7] 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 },

From 22e281f36865dde0fc6121523b954f3896b3fd60 Mon Sep 17 00:00:00 2001
From: Konstantinos Karmas <konskarm@gmail.com>
Date: Wed, 29 Sep 2021 13:36:29 +0200
Subject: [PATCH 6/7] Fix using the wrong combing enum value in maker_made_300x

The correct enum value should be 'infill'. 'Within infill' is the display name of that enum value.

CURA-7976
---
 resources/definitions/maker_made_300x.def.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/definitions/maker_made_300x.def.json b/resources/definitions/maker_made_300x.def.json
index ae112af5d1..ddb936cd36 100644
--- a/resources/definitions/maker_made_300x.def.json
+++ b/resources/definitions/maker_made_300x.def.json
@@ -101,7 +101,7 @@
         "acceleration_enabled": {"value": false },
         "acceleration_roofing":  {"value": 3000 },
         "jerk_enabled":  {"value": false },
-        "retraction_combing":  {"value": "'within infill'" },
+        "retraction_combing":  {"value": "'infill'" },
         "travel_retract_before_outer_wall": {"value": false },
         "travel_avoid_other_parts": {"value": true },
         "retraction_hop_enabled": {"value": false },

From a9b792d693769e75457fabb1d98dffc82f147cb0 Mon Sep 17 00:00:00 2001
From: Konstantinos Karmas <konskarm@gmail.com>
Date: Wed, 29 Sep 2021 13:37:21 +0200
Subject: [PATCH 7/7] Remove the value of retraction combing in S3 and S5

So that they can inherit the formula of calculating the retraction combing from the fdmprinter. This way, the combing will be changed according to whether the monotonic top/bottom order and ironing are used.

CURA-7976
---
 resources/definitions/ultimaker_s3.def.json | 1 -
 resources/definitions/ultimaker_s5.def.json | 1 -
 2 files changed, 2 deletions(-)

diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
index af079d3484..2a17f212d2 100644
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@@ -158,7 +158,6 @@
         "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" },
         "meshfix_maximum_deviation": { "value": "layer_height / 4" },
         "optimize_wall_printing_order": { "value": "True" },
-        "retraction_combing": { "value": "all" },
         "initial_layer_line_width_factor": { "value": "120" },
         "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }
     }
diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
index e439ffea86..74f0f305cb 100644
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@@ -160,7 +160,6 @@
         "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" },
         "meshfix_maximum_deviation": { "value": "layer_height / 4" },
         "optimize_wall_printing_order": { "value": "True" },
-        "retraction_combing": { "value": "all" },
         "initial_layer_line_width_factor": { "value": "120" },
         "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" },
         "build_volume_temperature": { "maximum_value": 50 }