Merge remote-tracking branch 'origin/CURA-12096_move_gradual_flow_plu…

…gin_back_into_the_engine_core' into CURA-12096_move_gradual_flow_plugin_back_into_the_engine_core

resources/definitions/fdmprinter.def.json

@@ -766,7 +766,8 @@
                     "settable_per_extruder": false,
                     "settable_per_meshgroup": false
                 },
-                "reset_flow_duration": {
+                "reset_flow_duration":
+                {
                     "enabled": "gradual_flow_enabled",
                     "value": 2.0,
                     "label": "Reset flow duration",
@@ -3149,20 +3150,22 @@
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
-                "gradual_flow_enabled": {
+                "gradual_flow_enabled":
+                {
                     "label": "Gradual flow enabled",
                     "description": "Enable gradual flow changes. When enabled, the flow is gradually increased/decreased to the target flow. This is useful for printers with a bowden tube where the flow is not immediately changed when the extruder motor starts/stops.",
                     "type": "bool",
                     "default_value": false,
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
-                "max_flow_acceleration": {
+                "max_flow_acceleration":
+                {
                     "enabled": "gradual_flow_enabled",
                     "label": "Gradual flow max acceleration",
                     "description": "Maximum acceleration for gradual flow changes",
                     "type": "float",
-                    "unit": "mm\u00b3\/s\u00b2",
+                    "unit": "mm\u00b3/s\u00b2",
                     "default_value": 1,
                     "minimum_value_warning": 0.1,
                     "maximum_value_warning": 99999,
@@ -3171,21 +3174,23 @@
                     "settable_per_extruder": true,
                     "comments": "when enabled, each second the flow will at max be increased/decreased by this value"
                 },
-                "layer_0_max_flow_acceleration": {
+                "layer_0_max_flow_acceleration":
+                {
                     "enabled": "gradual_flow_enabled",
                     "value": "max_flow_acceleration",
                     "label": "Initial layer max flow acceleration",
                     "description": "Minimum speed for gradual flow changes for the first layer",
                     "type": "float",
-                    "unit": "mm\u00b3\/s\u00b2",
+                    "unit": "mm\u00b3/s\u00b2",
                     "default_value": 1,
                     "minimum_value_warning": 0.1,
                     "maximum_value_warning": 99999,
                     "minimum_value": 0.01,
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
-                "gradual_flow_discretisation_step_size": {
+                "gradual_flow_discretisation_step_size":
+                {
                     "enabled": "gradual_flow_enabled",
                     "label": "Gradual flow discretisation step size",
                     "description": "Duration of each step in the gradual flow change",

resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.06mm_visual.inst.cfg

@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))

resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm_engineering.inst.cfg

@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom

resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.15mm_visual.inst.cfg

@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))

resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm_engineering.inst.cfg

@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom

resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.1mm_visual.inst.cfg

@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))

resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm_engineering.inst.cfg

@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom

resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm_quick.inst.cfg

@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40

resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.2mm_visual.inst.cfg

@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))

resources/intent/ultimaker_s3/um_s3_aa0.4_um-abs_0.3mm_quick.inst.cfg

@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40

resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.06mm_visual.inst.cfg

@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))

resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm_engineering.inst.cfg

@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom

resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.15mm_visual.inst.cfg

@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))

resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm_engineering.inst.cfg

@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom

resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.1mm_visual.inst.cfg

@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))

resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm_engineering.inst.cfg

@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom

resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm_quick.inst.cfg

@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40

resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.2mm_visual.inst.cfg

@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))

resources/intent/ultimaker_s3/um_s3_aa0.4_um-petg_0.3mm_quick.inst.cfg

@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40

resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm_visual.inst.cfg

@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))

resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm_engineering.inst.cfg

@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom

resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm_visual.inst.cfg

@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))

resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm_engineering.inst.cfg

@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom

resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm_visual.inst.cfg

@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))

resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm_engineering.inst.cfg

@@ -12,10 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 1
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'
 infill_sparse_density = 20
 jerk_print = 30
+max_flow_acceleration = 1
 speed_infill = =speed_print
 speed_print = 35
 speed_roofing = =speed_topbottom

resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm_quick.inst.cfg

@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40

resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm_visual.inst.cfg

@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))

resources/intent/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm_quick.inst.cfg

@@ -12,8 +12,8 @@ type = intent
 variant = AA 0.4
 
 [values]
-gradual_flow_enabled = False
 acceleration_wall_0 = 2000
+gradual_flow_enabled = False
 gradual_infill_step_height = =4 * layer_height
 gradual_infill_steps = 3
 infill_sparse_density = 40

resources/intent/ultimaker_s3/um_s3_aa0.4_um-tough-pla_0.06mm_visual.inst.cfg

@@ -12,11 +12,11 @@ type = intent
 variant = AA 0.4
 
 [values]
-max_flow_acceleration = 0.5
 acceleration_print = 2500
 acceleration_wall_0 = 1000
 inset_direction = inside_out
 jerk_wall_0 = 20
+max_flow_acceleration = 0.5
 speed_print = 50
 speed_roofing = =math.ceil(speed_wall*(35/50))
 speed_wall_0 = =math.ceil(speed_wall*(20/50))