Merge branch 'master' into merge_main_20211019

43 files changed, 519 insertions, 29 deletions

diff --git a/resources/variants/arjunpro300_0.2.inst.cfg b/resources/variants/arjunpro300_0.2.inst.cfg
new file mode 100644
index 0000000000..51b359bfab
--- /dev/null
+++ b/resources/variants/arjunpro300_0.2.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = 0.2 mm Nozzle
+version = 4
+definition = arjunpro300
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.2
diff --git a/resources/variants/arjunpro300_0.3.inst.cfg b/resources/variants/arjunpro300_0.3.inst.cfg
new file mode 100644
index 0000000000..4d647df100
--- /dev/null
+++ b/resources/variants/arjunpro300_0.3.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = 0.3 mm Nozzle
+version = 4
+definition = arjunpro300
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.3
diff --git a/resources/variants/arjunpro300_0.4.inst.cfg b/resources/variants/arjunpro300_0.4.inst.cfg
new file mode 100644
index 0000000000..d17e90e245
--- /dev/null
+++ b/resources/variants/arjunpro300_0.4.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = 0.4 mm Nozzle
+version = 4
+definition = arjunpro300
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
diff --git a/resources/variants/arjunpro300_0.5.inst.cfg b/resources/variants/arjunpro300_0.5.inst.cfg
new file mode 100644
index 0000000000..61bdaf0ab9
--- /dev/null
+++ b/resources/variants/arjunpro300_0.5.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = 0.5 mm Nozzle
+version = 4
+definition = arjunpro300
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.5
diff --git a/resources/variants/arjunpro300_0.6.inst.cfg b/resources/variants/arjunpro300_0.6.inst.cfg
new file mode 100644
index 0000000000..905162b547
--- /dev/null
+++ b/resources/variants/arjunpro300_0.6.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = 0.6 mm Nozzle
+version = 4
+definition = arjunpro300
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.6
diff --git a/resources/variants/arjunpro300_0.8.inst.cfg b/resources/variants/arjunpro300_0.8.inst.cfg
new file mode 100644
index 0000000000..f12ef67d30
--- /dev/null
+++ b/resources/variants/arjunpro300_0.8.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = 0.8 mm Nozzle
+version = 4
+definition = arjunpro300
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.8
diff --git a/resources/variants/arjunpro300_dm_0.2.inst.cfg b/resources/variants/arjunpro300_dm_0.2.inst.cfg
new file mode 100644
index 0000000000..6b61519d07
--- /dev/null
+++ b/resources/variants/arjunpro300_dm_0.2.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = 0.2 mm Nozzle
+version = 4
+definition = arjunpro_duplication
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.2
diff --git a/resources/variants/arjunpro300_dm_0.3.inst.cfg b/resources/variants/arjunpro300_dm_0.3.inst.cfg
new file mode 100644
index 0000000000..3570f3b57f
--- /dev/null
+++ b/resources/variants/arjunpro300_dm_0.3.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = 0.3 mm Nozzle
+version = 4
+definition = arjunpro_duplication
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.3
diff --git a/resources/variants/arjunpro300_dm_0.4.inst.cfg b/resources/variants/arjunpro300_dm_0.4.inst.cfg
new file mode 100644
index 0000000000..e3ede604ab
--- /dev/null
+++ b/resources/variants/arjunpro300_dm_0.4.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = 0.4 mm Nozzle
+version = 4
+definition = arjunpro_duplication
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
diff --git a/resources/variants/arjunpro300_dm_0.5.inst.cfg b/resources/variants/arjunpro300_dm_0.5.inst.cfg
new file mode 100644
index 0000000000..ada64e3553
--- /dev/null
+++ b/resources/variants/arjunpro300_dm_0.5.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = 0.5 mm Nozzle
+version = 4
+definition = arjunpro_duplication
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.5
diff --git a/resources/variants/arjunpro300_dm_0.6.inst.cfg b/resources/variants/arjunpro300_dm_0.6.inst.cfg
new file mode 100644
index 0000000000..47d80f5a4f
--- /dev/null
+++ b/resources/variants/arjunpro300_dm_0.6.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = 0.6 mm Nozzle
+version = 4
+definition = arjunpro_duplication
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.6
diff --git a/resources/variants/arjunpro300_dm_0.8.inst.cfg b/resources/variants/arjunpro300_dm_0.8.inst.cfg
new file mode 100644
index 0000000000..a34524e268
--- /dev/null
+++ b/resources/variants/arjunpro300_dm_0.8.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = 0.8 mm Nozzle
+version = 4
+definition = arjunpro_duplication
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.8
diff --git a/resources/variants/arjunpro300_mm_0.2.inst.cfg b/resources/variants/arjunpro300_mm_0.2.inst.cfg
new file mode 100644
index 0000000000..9630a9e30b
--- /dev/null
+++ b/resources/variants/arjunpro300_mm_0.2.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = 0.2 mm Nozzle
+version = 4
+definition = arjunpro_mirrored
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.2
diff --git a/resources/variants/arjunpro300_mm_0.3.inst.cfg b/resources/variants/arjunpro300_mm_0.3.inst.cfg
new file mode 100644
index 0000000000..09d397ddea
--- /dev/null
+++ b/resources/variants/arjunpro300_mm_0.3.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = 0.3 mm Nozzle
+version = 4
+definition = arjunpro_mirrored
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.3
diff --git a/resources/variants/arjunpro300_mm_0.4.inst.cfg b/resources/variants/arjunpro300_mm_0.4.inst.cfg
new file mode 100644
index 0000000000..49b7851df7
--- /dev/null
+++ b/resources/variants/arjunpro300_mm_0.4.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = 0.4 mm Nozzle
+version = 4
+definition = arjunpro_mirrored
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
diff --git a/resources/variants/arjunpro300_mm_0.5.inst.cfg b/resources/variants/arjunpro300_mm_0.5.inst.cfg
new file mode 100644
index 0000000000..dfbf3662c3
--- /dev/null
+++ b/resources/variants/arjunpro300_mm_0.5.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = 0.5 mm Nozzle
+version = 4
+definition = arjunpro_mirrored
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.5
diff --git a/resources/variants/arjunpro300_mm_0.6.inst.cfg b/resources/variants/arjunpro300_mm_0.6.inst.cfg
new file mode 100644
index 0000000000..c13c5cf82b
--- /dev/null
+++ b/resources/variants/arjunpro300_mm_0.6.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = 0.6 mm Nozzle
+version = 4
+definition = arjunpro_mirrored
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.6
diff --git a/resources/variants/arjunpro300_mm_0.8.inst.cfg b/resources/variants/arjunpro300_mm_0.8.inst.cfg
new file mode 100644
index 0000000000..feffb6846c
--- /dev/null
+++ b/resources/variants/arjunpro300_mm_0.8.inst.cfg
@@ -0,0 +1,13 @@
+[general]
+name = 0.8 mm Nozzle
+version = 4
+definition = arjunpro_mirrored
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.8
diff --git a/resources/variants/arjunpro300_pva_0.2.inst.cfg b/resources/variants/arjunpro300_pva_0.2.inst.cfg
new file mode 100644
index 0000000000..1abc708060
--- /dev/null
+++ b/resources/variants/arjunpro300_pva_0.2.inst.cfg
@@ -0,0 +1,32 @@
+[general]
+name = PVA 0.2 mm Nozzle
+version = 4
+definition = arjunpro300
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.2
+support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height
+support_offset = 3
+support_bottom_height = =layer_height * 2
+support_bottom_pattern = zigzag
+support_bottom_stair_step_height = =layer_height
+support_infill_rate = 50
+support_interface_enable = True
+support_interface_height = =layer_height * 5
+support_interface_skip_height = =layer_height
+support_join_distance = 3
+support_xy_distance = =machine_nozzle_size / 2
+support_xy_distance_overhang = =machine_nozzle_size / 2
+support_angle = 45
+support_pattern = triangles
+support_use_towers = False
+support_z_distance = 0
+gradual_support_infill_steps = 2
+support_interface_density = 100
+support_interface_pattern = concentric
\ No newline at end of file
diff --git a/resources/variants/arjunpro300_pva_0.3.inst.cfg b/resources/variants/arjunpro300_pva_0.3.inst.cfg
new file mode 100644
index 0000000000..5cb59930c1
--- /dev/null
+++ b/resources/variants/arjunpro300_pva_0.3.inst.cfg
@@ -0,0 +1,32 @@
+[general]
+name = PVA 0.3 mm Nozzle
+version = 4
+definition = arjunpro300
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.3
+support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height
+support_offset = 3
+support_bottom_height = =layer_height * 2
+support_bottom_pattern = zigzag
+support_bottom_stair_step_height = =layer_height
+support_infill_rate = 50
+support_interface_enable = True
+support_interface_height = =layer_height * 5
+support_interface_skip_height = =layer_height
+support_join_distance = 3
+support_xy_distance = =machine_nozzle_size / 2
+support_xy_distance_overhang = =machine_nozzle_size / 2
+support_angle = 45
+support_pattern = triangles
+support_use_towers = False
+support_z_distance = 0
+gradual_support_infill_steps = 2
+support_interface_density = 100
+support_interface_pattern = concentric
\ No newline at end of file
diff --git a/resources/variants/arjunpro300_pva_0.4.inst.cfg b/resources/variants/arjunpro300_pva_0.4.inst.cfg
new file mode 100644
index 0000000000..c2f5c68480
--- /dev/null
+++ b/resources/variants/arjunpro300_pva_0.4.inst.cfg
@@ -0,0 +1,32 @@
+[general]
+name = PVA 0.4 mm Nozzle
+version = 4
+definition = arjunpro300
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
+support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height
+support_offset = 3
+support_bottom_height = =layer_height * 2
+support_bottom_pattern = zigzag
+support_bottom_stair_step_height = =layer_height
+support_infill_rate = 50
+support_interface_enable = True
+support_interface_height = =layer_height * 5
+support_interface_skip_height = =layer_height
+support_join_distance = 3
+support_xy_distance = =machine_nozzle_size / 2
+support_xy_distance_overhang = =machine_nozzle_size / 2
+support_angle = 45
+support_pattern = triangles
+support_use_towers = False
+support_z_distance = 0
+gradual_support_infill_steps = 2
+support_interface_density = 100
+support_interface_pattern = concentric
\ No newline at end of file
diff --git a/resources/variants/arjunpro300_pva_0.5.inst.cfg b/resources/variants/arjunpro300_pva_0.5.inst.cfg
new file mode 100644
index 0000000000..6b985fb06b
--- /dev/null
+++ b/resources/variants/arjunpro300_pva_0.5.inst.cfg
@@ -0,0 +1,32 @@
+[general]
+name = PVA 0.5 mm Nozzle
+version = 4
+definition = arjunpro300
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.5
+support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height
+support_offset = 3
+support_bottom_height = =layer_height * 2
+support_bottom_pattern = zigzag
+support_bottom_stair_step_height = =layer_height
+support_infill_rate = 50
+support_interface_enable = True
+support_interface_height = =layer_height * 5
+support_interface_skip_height = =layer_height
+support_join_distance = 3
+support_xy_distance = =machine_nozzle_size / 2
+support_xy_distance_overhang = =machine_nozzle_size / 2
+support_angle = 45
+support_pattern = triangles
+support_use_towers = False
+support_z_distance = 0
+gradual_support_infill_steps = 2
+support_interface_density = 100
+support_interface_pattern = concentric
\ No newline at end of file
diff --git a/resources/variants/arjunpro300_pva_0.6.inst.cfg b/resources/variants/arjunpro300_pva_0.6.inst.cfg
new file mode 100644
index 0000000000..6bfea88e1a
--- /dev/null
+++ b/resources/variants/arjunpro300_pva_0.6.inst.cfg
@@ -0,0 +1,32 @@
+[general]
+name = PVA 0.6 mm Nozzle
+version = 4
+definition = arjunpro300
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.6
+support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height
+support_offset = 3
+support_bottom_height = =layer_height * 2
+support_bottom_pattern = zigzag
+support_bottom_stair_step_height = =layer_height
+support_infill_rate = 50
+support_interface_enable = True
+support_interface_height = =layer_height * 5
+support_interface_skip_height = =layer_height
+support_join_distance = 3
+support_xy_distance = =machine_nozzle_size / 2
+support_xy_distance_overhang = =machine_nozzle_size / 2
+support_angle = 45
+support_pattern = triangles
+support_use_towers = False
+support_z_distance = 0
+gradual_support_infill_steps = 2
+support_interface_density = 100
+support_interface_pattern = concentric
\ No newline at end of file
diff --git a/resources/variants/arjunpro300_pva_0.8.inst.cfg b/resources/variants/arjunpro300_pva_0.8.inst.cfg
new file mode 100644
index 0000000000..7cc066e19d
--- /dev/null
+++ b/resources/variants/arjunpro300_pva_0.8.inst.cfg
@@ -0,0 +1,32 @@
+[general]
+name = PVA 0.8 mm Nozzle
+version = 4
+definition = arjunpro300
+
+[metadata]
+
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.8
+support_infill_sparse_thickness = =(layer_height * 2) if (layer_height * 2) <= 0.75 * machine_nozzle_size else layer_height
+support_offset = 3
+support_bottom_height = =layer_height * 2
+support_bottom_pattern = zigzag
+support_bottom_stair_step_height = =layer_height
+support_infill_rate = 50
+support_interface_enable = True
+support_interface_height = =layer_height * 5
+support_interface_skip_height = =layer_height
+support_join_distance = 3
+support_xy_distance = =machine_nozzle_size / 2
+support_xy_distance_overhang = =machine_nozzle_size / 2
+support_angle = 45
+support_pattern = triangles
+support_use_towers = False
+support_z_distance = 0
+gradual_support_infill_steps = 2
+support_interface_density = 100
+support_interface_pattern = concentric
\ No newline at end of file
diff --git a/resources/variants/creality_ender6_0.2.inst.cfg b/resources/variants/creality_ender6_0.2.inst.cfg
new file mode 100644
index 0000000000..ffa4156810
--- /dev/null
+++ b/resources/variants/creality_ender6_0.2.inst.cfg
@@ -0,0 +1,12 @@
+[general]

+name = 0.2mm Nozzle

+version = 4

+definition = creality_ender6

+

+[metadata]

+setting_version = 19

+type = variant

+hardware_type = nozzle

+

+[values]

+machine_nozzle_size = 0.2

diff --git a/resources/variants/creality_ender6_0.3.inst.cfg b/resources/variants/creality_ender6_0.3.inst.cfg
new file mode 100644
index 0000000000..398e975ff9
--- /dev/null
+++ b/resources/variants/creality_ender6_0.3.inst.cfg
@@ -0,0 +1,12 @@
+[general]

+name = 0.3mm Nozzle

+version = 4

+definition = creality_ender6

+

+[metadata]

+setting_version = 19

+type = variant

+hardware_type = nozzle

+

+[values]

+machine_nozzle_size = 0.3

diff --git a/resources/variants/creality_ender6_0.4.inst.cfg b/resources/variants/creality_ender6_0.4.inst.cfg
new file mode 100644
index 0000000000..93e4fb982c
--- /dev/null
+++ b/resources/variants/creality_ender6_0.4.inst.cfg
@@ -0,0 +1,12 @@
+[general]

+name = 0.4mm Nozzle

+version = 4

+definition = creality_ender6

+

+[metadata]

+setting_version = 19

+type = variant

+hardware_type = nozzle

+

+[values]

+machine_nozzle_size = 0.4

diff --git a/resources/variants/creality_ender6_0.5.inst.cfg b/resources/variants/creality_ender6_0.5.inst.cfg
new file mode 100644
index 0000000000..017d1f4e6c
--- /dev/null
+++ b/resources/variants/creality_ender6_0.5.inst.cfg
@@ -0,0 +1,12 @@
+[general]

+name = 0.5mm Nozzle

+version = 4

+definition = creality_ender6

+

+[metadata]

+setting_version = 19

+type = variant

+hardware_type = nozzle

+

+[values]

+machine_nozzle_size = 0.5

diff --git a/resources/variants/creality_ender6_0.6.inst.cfg b/resources/variants/creality_ender6_0.6.inst.cfg
new file mode 100644
index 0000000000..795c209d37
--- /dev/null
+++ b/resources/variants/creality_ender6_0.6.inst.cfg
@@ -0,0 +1,12 @@
+[general]

+name = 0.6mm Nozzle

+version = 4

+definition = creality_ender6

+

+[metadata]

+setting_version = 19

+type = variant

+hardware_type = nozzle

+

+[values]

+machine_nozzle_size = 0.6

diff --git a/resources/variants/creality_ender6_0.8.inst.cfg b/resources/variants/creality_ender6_0.8.inst.cfg
new file mode 100644
index 0000000000..1c91f353d8
--- /dev/null
+++ b/resources/variants/creality_ender6_0.8.inst.cfg
@@ -0,0 +1,12 @@
+[general]

+name = 0.8mm Nozzle

+version = 4

+definition = creality_ender6

+

+[metadata]

+setting_version = 19

+type = variant

+hardware_type = nozzle

+

+[values]

+machine_nozzle_size = 0.8

diff --git a/resources/variants/creality_ender6_1.0.inst.cfg b/resources/variants/creality_ender6_1.0.inst.cfg
new file mode 100644
index 0000000000..df3527ff2a
--- /dev/null
+++ b/resources/variants/creality_ender6_1.0.inst.cfg
@@ -0,0 +1,12 @@
+[general]

+name = 1.0mm Nozzle

+version = 4

+definition = creality_ender6

+

+[metadata]

+setting_version = 19

+type = variant

+hardware_type = nozzle

+

+[values]

+machine_nozzle_size = 1.0

diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg
index 899651d56e..557f89fb07 100644
--- a/resources/variants/ultimaker3_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_aa0.8.inst.cfg
@@ -19,9 +19,6 @@ infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
 jerk_print = 25
-jerk_topbottom = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 25 / 25), 200
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg
index 1eb76c11d7..5976d140d2 100644
--- a/resources/variants/ultimaker3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_bb0.8.inst.cfg
@@ -23,7 +23,6 @@ infill_overlap = 0
 infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
-jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20)
 jerk_print = 25
 jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
 jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg
index e734ea9f25..89c5430af5 100644
--- a/resources/variants/ultimaker3_bb04.inst.cfg
+++ b/resources/variants/ultimaker3_bb04.inst.cfg
@@ -15,10 +15,9 @@ acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500)
 cool_fan_speed_max = =cool_fan_speed
 gradual_support_infill_steps = 2
-jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
-jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
-jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20)
+jerk_support = =math.ceil(jerk_print * 15 / 25)
+jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
+jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
index b8d26292b4..59549a28cc 100644
--- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
@@ -19,9 +19,6 @@ infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
 jerk_print = 25
-jerk_topbottom = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 25 / 25), 20)
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
index 041823e774..5393c14eb4 100644
--- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
@@ -23,7 +23,6 @@ infill_overlap = 0
 infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
-jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20)
 jerk_print = 25
 jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
 jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg
index 405db38c85..79a7441256 100644
--- a/resources/variants/ultimaker3_extended_bb04.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg
@@ -15,7 +15,6 @@ acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500)
 cool_fan_speed_max = =cool_fan_speed
 gradual_support_infill_steps = 2
-jerk_prime_tower = =math.ceil(jerk_print * 2 / 25)
 jerk_support = =math.ceil(jerk_print * 15 / 25)
 jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
 jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
diff --git a/resources/variants/ultimaker_s3_aa0.8.inst.cfg b/resources/variants/ultimaker_s3_aa0.8.inst.cfg
index f612d43c17..3e0aa20e73 100644
--- a/resources/variants/ultimaker_s3_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa0.8.inst.cfg
@@ -19,9 +19,6 @@ infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
 jerk_print = 25
-jerk_topbottom = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 25 / 25), 20)
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
index 3a9097fffb..f9504753ac 100644
--- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
@@ -22,7 +22,6 @@ infill_overlap = 0
 infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
-jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20)
 jerk_print = 25
 jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
 jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
diff --git a/resources/variants/ultimaker_s3_bb04.inst.cfg b/resources/variants/ultimaker_s3_bb04.inst.cfg
index 4bf99d35a2..cd33dbfe1b 100644
--- a/resources/variants/ultimaker_s3_bb04.inst.cfg
+++ b/resources/variants/ultimaker_s3_bb04.inst.cfg
@@ -15,10 +15,9 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 /
 acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500)
 cool_fan_speed_max = =cool_fan_speed
 gradual_support_infill_steps = 2
-jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
-jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
-jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20)
+jerk_support = =math.ceil(jerk_print * 15 / 25)
+jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
+jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
diff --git a/resources/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg
index b62fb9f37f..7a6398ee56 100644
--- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg
@@ -19,9 +19,6 @@ infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
 jerk_print = 25
-jerk_topbottom = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 25 / 25), 20)
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
index 011b567f22..34faf7d254 100644
--- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
@@ -22,7 +22,6 @@ infill_overlap = 0
 infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
-jerk_prime_tower = =math.ceil(jerk_print * 2 / 25)
 jerk_print = 25
 jerk_support = =math.ceil(jerk_print * 15 / 25)
 jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg
index 90c11e53f3..3a4d937620 100644
--- a/resources/variants/ultimaker_s5_bb04.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb04.inst.cfg
@@ -15,10 +15,9 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 /
 acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500)
 cool_fan_speed_max = =cool_fan_speed
 gradual_support_infill_steps = 2
-jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
-jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
-jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20)
+jerk_support = =math.ceil(jerk_print * 15 / 25)
+jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
+jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0