Clean up a lot of duplicate settings from machine profiles

These were errors that were copy pasted from other definitions. So leaving them as is would
continue to decrease the quality of third party profiles.

resources/definitions/Mark2_for_Ultimaker2.def.json

@@ -63,9 +63,6 @@
         "machine_heated_bed": {
             "default_value": true
         },
-        "speed_infill": {
-            "value": "speed_print"
-        },
         "speed_wall_x": {
             "value": "speed_wall"
         },

resources/definitions/SV01.def.json

@@ -45,16 +45,12 @@
         "acceleration_enabled": { "value": false },
         "jerk_enabled": { "value": false },
         "speed_print": { "value": 50.0 } ,
-        "speed_infill": { "value": "speed_print" },
         "skirt_brim_speed": { "value": "speed_layer_0" },
-        "line_width": { "value": "machine_nozzle_size" },
         "optimize_wall_printing_order": { "value": "True" },
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature": { "value": "material_print_temperature" },
-        "material_flow": { "value": 100 },
         "z_seam_type": { "value": "'back'" },
         "z_seam_corner": { "value": "'z_seam_corner_weighted'" },
-        "infill_sparse_density": { "value": "20" },
         "infill_pattern": { "value": "'lines'" },
         "infill_before_walls": { "value": false },
         "infill_overlap": { "value": 30.0 },

resources/definitions/SV03.def.json

@@ -45,16 +45,12 @@
         "acceleration_enabled": { "value": false },
         "jerk_enabled": { "value": false },
         "speed_print": { "value": 50.0 } ,
-        "speed_infill": { "value": "speed_print" },
         "skirt_brim_speed": { "value": "speed_layer_0" },
-        "line_width": { "value": "machine_nozzle_size" },
         "optimize_wall_printing_order": { "value": "True" },
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature": { "value": "material_print_temperature" },
-        "material_flow": { "value": 100 },
         "z_seam_type": { "value": "'back'" },
-        "z_seam_corner": { "value": "'z_seam_corner_weighted'" },       
+        "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, ,
-        "infill_sparse_density": { "value": "20" },
         "infill_pattern": { "value": "'lines'" },
         "infill_before_walls": { "value": false },
         "infill_overlap": { "value": 30.0 },

resources/definitions/anet3d.def.json

@@ -51,14 +51,11 @@
 
         "speed_print": { "value": 50.0 } ,
         "speed_infill": { "value": "speed_print * 2" },
-        "speed_wall": { "value": "speed_print / 2" },
+
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_roofing": { "value": "speed_topbottom" },
         "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
         "speed_layer_0": { "value": "speed_print / 2" },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
         "speed_prime_tower": { "value": "speed_print" },
         "speed_support": { "value": "speed_print" },
@@ -67,18 +64,14 @@
 
         "skirt_brim_speed": { "value": "speed_layer_0" },
 
-        "line_width": { "value": "machine_nozzle_size" },
-
         "optimize_wall_printing_order": { "value": true },
 
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature": { "value": "material_print_temperature" },
-        "material_flow": { "value": 100 },
 
         "z_seam_type": { "value": "'back'" },
         "z_seam_corner": { "value": "'z_seam_corner_weighted'" },
 
-        "infill_sparse_density": { "value": "20" },
         "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
         "infill_before_walls": { "value": true },
         "infill_overlap": { "value": 30.0 },
@@ -88,20 +81,22 @@
 
         "fill_outline_gaps": { "value": false },
 
-        "retraction_speed": {
+        "retraction_speed":
+        {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
             "maximum_value": 200
         },
-        "retraction_retract_speed": {
+        "retraction_retract_speed":
+        {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
             "maximum_value": 200
         },
-        "retraction_prime_speed": {
+        "retraction_prime_speed":
+        {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
             "maximum_value": 200
         },
 
-        "retraction_hop_enabled": { "value": "False" },
         "retraction_hop": { "value": 1 },
         "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
         "retraction_combing_max_distance": { "value": 30 },
@@ -109,13 +104,11 @@
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
 
-        "retraction_enable": { "value": true },
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
         "retraction_min_travel": { "value": 1.5 },
 
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
         "adaptive_layer_height_variation": { "value": 0.04 },
@@ -138,11 +131,7 @@
         "machine_use_extruder_offset_to_offset_coords": {"default_value": true},
         "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"},
         
-        "machine_center_is_zero": {
+        "machine_center_is_zero": { "default_value": false },
-            "default_value": false
+        "gantry_height": { "value": "0"}
-        },
-        "gantry_height": {
-            "value": "0"
-        }
     }
 }

resources/definitions/anycubic_4max.def.json

@@ -51,7 +51,6 @@
         "gantry_height": { "value": "25.0" },
         "skin_overlap": { "value": "10" },
 
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_print": { "value": "900" },

resources/definitions/anycubic_i3_mega_s.def.json

@@ -53,8 +53,6 @@
         "material_bed_temperature": { "maximum_value_warning": 110 },
         "material_bed_temperature_layer_0": { "maximum_value_warning": 110 },
 
-        "material_flow": { "value": 100 },
-
         "top_bottom_thickness": { "value":  "layer_height_0 + layer_height * math.floor(1.2 / layer_height)" },
         "wall_thickness": { "value": "line_width * 3 if line_width < 0.6 else line_width * 2" },
 
@@ -70,15 +68,11 @@
         "jerk_enabled": { "value": true },
 
         "speed_print": { "value": 50.0 } ,
-        "speed_infill": { "value": "speed_print" },
+
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_roofing": { "value": "speed_topbottom" },
         "speed_travel": { "value": 100.0, "maximum_value_warning": 150.0, "maximum_value": 200.0 },
         "speed_layer_0": { "value": "speed_topbottom if speed_topbottom < 20 else 20" },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "speed_travel" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
@@ -101,7 +95,7 @@
         "retraction_hop": { "value": 0.075 },
         "retraction_hop_only_when_collides": { "value": true },
         "retraction_amount": { "value": 6 },
-        "retraction_enable": { "value": true },
+
         "retraction_min_travel": { "value": 1.5 },
         "retraction_combing": { "value": "'off'" },
         "retraction_combing_max_distance": { "value": 30 },
@@ -114,7 +108,6 @@
         "cool_fan_speed": { "value": 100 },
         "cool_fan_speed_0": { "value": 30 },
 
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
         "adhesion_type": { "value": "'none' if support_enable else 'skirt'" },

resources/definitions/anycubic_mega_zero.def.json

@@ -99,7 +99,6 @@
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
 
-        "retraction_enable": { "value": true },
         "retraction_speed": { "value": 30 },
         "retraction_amount": { "value": 7 },
         "retraction_count_max": { "value": 100 },

resources/definitions/artillery_base.def.json

@@ -159,7 +159,7 @@
         "travel_retract_before_outer_wall": { "value": true },
         
 		"retraction_amount": { "value": 2 },
-        "retraction_enable": { "value": true },
+
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
         "retraction_min_travel": { "value": 1.5 },

resources/definitions/biqu_base.def.json

@@ -59,15 +59,11 @@
         "jerk_enabled": { "value": false },
 
         "speed_print": { "value": 50.0 } ,
-        "speed_infill": { "value": "speed_print" },
+
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_roofing": { "value": "speed_topbottom" },
         "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
         "speed_layer_0": { "value": 20.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
@@ -76,19 +72,16 @@
 
         "skirt_brim_speed": { "value": "speed_layer_0" },
 
-        "line_width": { "value": "machine_nozzle_size" },
 
         "optimize_wall_printing_order": { "value": "True" },
 
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature": { "value": "material_print_temperature" },
-        "material_flow": { "value": 100 },
 
         "z_seam_type": { "value": "'sharpest_corner'" },
         "z_seam_corner": { "value": "'z_seam_corner_inner'" },
 
         "infill_line_width": { "value": "line_width * 1.2" },
-        "infill_sparse_density": { "value": "20" },
         "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
         "infill_before_walls": { "value": false },
         "infill_overlap": { "value": 30.0 },
@@ -111,7 +104,6 @@
             "maximum_value": 200
         },
 
-        "retraction_hop_enabled": { "value": "False" },
         "retraction_hop": { "value": 0.2 },
         "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
         "retraction_combing_max_distance": { "value": 30 },
@@ -119,13 +111,11 @@
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
 
-        "retraction_enable": { "value": true },
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
         "retraction_min_travel": { "value": 1.5 },
 
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
         "adhesion_type": { "value": "'skirt'" },

resources/definitions/blv_mgn_cube_base.def.json

@@ -165,9 +165,6 @@
     "skin_overlap": {
       "value": 10.0
     },
-    "speed_infill": {
-      "value": "speed_print"
-    },
     "speed_travel_layer_0": {
       "value": "math.ceil(speed_travel * 0.4)"
     },

resources/definitions/builder_premium_large.def.json

@@ -54,7 +54,6 @@
 
         "prime_blob_enable": { "enabled": true },
 
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_print": { "value": "3000" },

resources/definitions/builder_premium_medium.def.json

@@ -54,7 +54,6 @@
 
         "prime_blob_enable": { "enabled": true },
 
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_print": { "value": "3000" },

resources/definitions/builder_premium_small.def.json

@@ -53,7 +53,6 @@
 
         "prime_blob_enable": { "enabled": true },
 
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_print": { "value": "3000" },

resources/definitions/cartesio.def.json

@@ -41,7 +41,6 @@
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
         "material_print_temp_wait": { "default_value": false },
         "material_bed_temp_wait": { "default_value": false },
-        "prime_tower_enable": { "default_value": false },
         "prime_tower_min_volume": { "value": "0.7" },
         "prime_tower_size": { "value": 24.0 },
         "prime_tower_position_x": { "value": "125" },

resources/definitions/creality_base.def.json

@@ -73,7 +73,8 @@
             "zyyx_pro_pla"
         ]
     },
-    "overrides": {
+    "overrides":
+    {
         "machine_name": { "default_value": "Creawsome Base Printer" },
         "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n" },
         "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" },
@@ -110,35 +111,24 @@
         "jerk_enabled": { "value": false },
 
         "speed_print": { "value": 50.0 },
-        "speed_infill": { "value": "speed_print" },
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_roofing": { "value": "speed_topbottom" },
         "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
         "speed_layer_0": { "value": 20.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
         "speed_support_interface": { "value": "speed_topbottom" },
         "speed_z_hop": { "value": 5 },
 
-        "skirt_brim_speed": { "value": "speed_layer_0" },
-
-        "line_width": { "value": "machine_nozzle_size" },
-
         "optimize_wall_printing_order": { "value": "True" },
 
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature": { "value": "material_print_temperature" },
-        "material_flow": { "value": 100 },
 
         "z_seam_type": { "value": "'back'" },
         "z_seam_corner": { "value": "'z_seam_corner_weighted'" },
 
-        "infill_sparse_density": { "value": "20" },
         "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
         "infill_before_walls": { "value": false },
         "infill_overlap": { "value": 30.0 },
@@ -148,20 +138,21 @@
 
         "fill_outline_gaps": { "value": false },
 
-        "retraction_speed": {
+        "retraction_speed":
+        {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
             "maximum_value": 200
         },
-        "retraction_retract_speed": {
+        "retraction_retract_speed":
+        {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
             "maximum_value": 200
         },
-        "retraction_prime_speed": {
+        "retraction_prime_speed":
+        {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
             "maximum_value": 200
         },
-        
-        "retraction_hop_enabled": { "value": "False" },
         "retraction_hop": { "value": 0.2 },
         "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
         "retraction_combing_max_distance": { "value": 30 },
@@ -169,13 +160,11 @@
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
 
-        "retraction_enable": { "value": true },
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
         "retraction_min_travel": { "value": 1.5 },
 
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
         "adhesion_type": { "value": "'skirt'" },

resources/definitions/dagoma_pro_430_bowden.def.json

@@ -25,7 +25,6 @@
         "machine_max_jerk_e": { "value": 5 },
         "machine_max_feedrate_e": { "default_value": 200 },
         "machine_steps_per_mm_e": { "default_value": 139.5 },
-        "acceleration_enabled": { "value": "True" },
         "acceleration_print": { "value": "1250", "maximum_value": 1500 },
         "acceleration_layer_0": { "value": "acceleration_topbottom", "maximum_value": 1500 },
         "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 1250)", "maximum_value": 1500 },

resources/definitions/deltacomb_dc20flux.def.json

@@ -25,7 +25,7 @@
         "machine_end_gcode":                  { "default_value": ";---------------------------------------\n;Deltacomb end script\n;---------------------------------------\nG91 ;relative positioning\nG1 X8.0 E-10 F6000 ;wipe filament+material retraction\nG1 Z2 E9 ;Lift and start filament shaping\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG28 ;home all axes (max endstops)\nM84 ;steppers off" },
         "switch_extruder_retraction_amount":  { "value": "0" },
         "prime_tower_min_volume":             { "value": "50" },
-        "prime_tower_enable":                 { "value": "1" },
+        "prime_tower_enable":                 { "value": true },
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature":   { "value": "material_print_temperature" },
         "material_standby_temperature":       { "value": "material_print_temperature" }

resources/definitions/deltacomb_dc21flux.def.json

@@ -25,7 +25,7 @@
         "machine_end_gcode":                  { "default_value": ";---------------------------------------\n;Deltacomb end script\n;---------------------------------------\nG91 ;relative positioning\nG1 X8.0 E-10 F6000 ;wipe filament+material retraction\nG1 Z2 E9 ;Lift and start filament shaping\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG28 ;home all axes (max endstops)\nM84 ;steppers off" },
         "switch_extruder_retraction_amount":  { "value": "0" },
         "prime_tower_min_volume":             { "value": "50" },
-        "prime_tower_enable":                 { "value": "1" },
+        "prime_tower_enable":                 { "value": true },
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature":   { "value": "material_print_temperature" },
         "material_standby_temperature":       { "value": "material_print_temperature" }

resources/definitions/dxu.def.json

@@ -70,9 +70,6 @@
         "machine_heated_bed": {
             "default_value": true
         },
-        "speed_infill": {
-            "value": "speed_print"
-        },
         "speed_wall_x": {
             "value": "speed_wall"
         },

resources/definitions/eryone_er20.def.json

@@ -156,9 +156,6 @@
         "skirt_line_count": {
             "value": 3
         },
-        "speed_infill": {
-            "value": "speed_print"
-        },
         "speed_topbottom": {
             "value": "math.ceil(speed_print * 20 / 50)"
         },

resources/definitions/eryone_thinker.def.json

@@ -143,9 +143,6 @@
         "material_bed_temperature_layer_0": {
             "value": "material_bed_temperature"
         },
-        "speed_infill": {
-            "value": "speed_print"
-        },
         "speed_wall": {
             "value": "speed_print"
         },

resources/definitions/flyingbear_base.def.json

@@ -116,7 +116,6 @@
         "material_diameter": { "default_value": 1.75 },
 
         "layer_height_0": { "value": 0.2 },
-        "line_width": { "value": "machine_nozzle_size" },
         "skin_line_width": { "value": "machine_nozzle_size" },
         "infill_line_width": { "value": "line_width + 0.1" },
         "skirt_brim_line_width": { "value": "line_width + 0.1" },
@@ -140,25 +139,19 @@
 
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature": { "value": "material_print_temperature" },
-        "material_flow": { "value": 100 },
-        "retraction_enable": { "value": true },
         "retraction_min_travel": { "value": 1.5 },
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
 
         "speed_print": { "value": 60 } ,
         "speed_infill": { "value": "speed_print * 1.5" },
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_print" },
         "speed_roofing": { "value": "speed_topbottom" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_support": { "value": "speed_print" },
         "speed_support_interface": { "value": "speed_topbottom" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
         "speed_layer_0": { "value": "speed_print / 2" },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
         "skirt_brim_speed": { "value": "speed_layer_0" },
         "speed_z_hop": { "value": 5 },
@@ -171,7 +164,6 @@
         "retraction_hop_enabled": { "value": false },
         "retraction_hop": { "value": 0.2 },
 
-        "cool_fan_enabled": { "value": true },
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
         "cool_min_layer_time": { "value": 10 },
 

resources/definitions/goofoo_base.def.json

@@ -60,15 +60,12 @@
         "jerk_enabled": { "value": false },
 
         "speed_print": { "value": 40.0 },
-        "speed_infill": { "value": "speed_print" },
         "speed_wall": { "value": "speed_print" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
         "speed_topbottom": { "value": "speed_print" },
         "speed_roofing": { "value": "speed_topbottom" },
         "speed_travel": { "value": "80" },
         "speed_layer_0": { "value": 20.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "60" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
@@ -77,18 +74,15 @@
 
         "skirt_brim_speed": { "value": "speed_layer_0" },
 
-        "line_width": { "value": "machine_nozzle_size" },
 
         "optimize_wall_printing_order": { "value": "True" },
 
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature": { "value": "material_print_temperature" },
-        "material_flow": { "value": 100 },
 
         "z_seam_type": { "value": "'back'" },
         "z_seam_corner": { "value": "'z_seam_corner_weighted'" },
 
-        "infill_sparse_density": { "value": "20" },
         "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
         "infill_before_walls": { "value": false },
         "infill_overlap": { "value": 30.0 },
@@ -111,7 +105,6 @@
             "maximum_value": 200
         },
 
-        "retraction_hop_enabled": { "value": "False" },
         "retraction_hop": { "value": 0.2 },
         "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
         "retraction_combing_max_distance": { "value": 30 },
@@ -119,18 +112,13 @@
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
 
-        "retraction_enable": { "value": true },
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
         "retraction_min_travel": { "value": 1.5 },
 
         "cool_fan_full_at_height": { "value": "3 * layer_height" },
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
         
-        
-
-        
         "top_bottom_thickness": {"value":  "layer_height_0 + layer_height * 3" },
         "wall_thickness": {"value": "line_width * 2" }
 

resources/definitions/hctech_hc300-m1&m1h.def.json

@@ -36,7 +36,6 @@
         "retraction_speed": { "default_value": 35},
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
-        "retraction_enable": { "value": true },
 
         "gantry_height": { "value": "55" },
         "speed_print": { "default_value": 60.0 } ,
@@ -48,8 +47,6 @@
         "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-1 F2700 ;Retract a bit\nG1 Z1 E-1 F2400 ;Retract and raise Z\nG1 Z2 ;Raise Z\nG90 ;Absolute positioning\nG12 P1;clean nozzle\nG1 X5 Y300 ;Return to Start Point\nM106 S0 ;Switch off part cooling fan\nM104 S0 ;turn off temperature\nM140 S0 ;turn off Heated Bed\nM84 X Y E ;Disable all steppers but Z\nM81 ;turn-off power" },
 
         "cool_fan_speed": { "value": 75 },
-        "cool_fan_enabled": { "value": true },
-
         "line_width": { "value": 0.38 },
         "travel_avoid_distance": { "value": 1 },
         "infill_before_walls": { "value": false }

resources/definitions/hctech_hc300-m2h.def.json

@@ -37,7 +37,6 @@
         "retraction_speed": { "default_value": 35},
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
-        "retraction_enable": { "value": true },
 
         "gantry_height": { "value": "55" },
         "speed_print": { "default_value": 60.0 } ,
@@ -49,7 +48,6 @@
         "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-1 F2700 ;Retract a bit\nG1 Z1 E-1 F2400 ;Retract and raise Z\nG1 Z2 ;Raise Z\nG90 ;Absolute positioning\nG12 ;clean nozzle\nG1 X5 Y319 ;Return to Start Point\nM106 S0 ;Switch off part cooling fan\nM104 S0 ;turn off temperature\nM140 S0 ;turn off Heated Bed\nM84 X Y E ;Disable all steppers but Z\nM81 ;turn-off power" },
         
         "cool_fan_speed": { "value": 75 },
-        "cool_fan_enabled": { "value": true },
        
         "line_width": { "value": 0.38 },
         "travel_avoid_distance": { "value": 1 },

resources/definitions/hctech_hc300-m3.def.json

@@ -38,7 +38,6 @@
         "retraction_speed": { "default_value": 35},
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
-        "retraction_enable": { "value": true },
 
         "gantry_height": { "value": "55" },
         "speed_print": { "default_value": 60.0 } ,
@@ -49,7 +48,6 @@
         "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 Z1 E-2 F2400 ;Retract and raise Z\nG1 Z2 ;Raise Z\nG90 ;Absolute positioning\nG1 X5 Y290 ;Return to Start Point\nM106 S0 ;Switch off part cooling fan\nM104 S0 ;turn off temperature\nM140 S0 ;turn off Heated Bed\nM84 X Y E ;Disable all steppers but Z" },
 		        
         "cool_fan_speed": { "value": 75 },
-        "cool_fan_enabled": { "value": true },
         
         "line_width": { "value": 0.38 },
         "travel_avoid_distance": { "value": 1 },

resources/definitions/hms434.def.json

@@ -124,7 +124,6 @@
         "switch_extruder_prime_speed":            {"value": "(retraction_prime_speed)"},
 
         "speed_print":             {"value": "50"},
-        "speed_infill":            {"value": "speed_print"},
         "speed_wall":              {"value": "(speed_print/ 5 * 3) if speed_print > 45 else speed_print"},
         "speed_wall_x":            {"value": "speed_wall"},
         "speed_layer_0":           {"value": "(speed_print / 5 * 4) if speed_print > 45 else speed_print"},
@@ -165,7 +164,6 @@
         "skirt_gap":                 {"value": 1},
         "skirt_brim_minimal_length": {"value": 50},
 
-        "prime_tower_enable":         {"value": false },
         "prime_tower_size":           {"value": 20.6 },
         "prime_tower_position_x":     {"value": 125 },
         "prime_tower_position_y":     {"value": 70 },

resources/definitions/inat_base.def.json

@@ -151,43 +151,32 @@
             "value": "4"
         },
         "default_material_print_temperature": {
-            "maximum_value_warning": "470",
             "maximum_value": "470"
         },
         "material_print_temperature": {
-            "maximum_value_warning": "470",
             "maximum_value": "470"
         },
         "material_print_temperature_layer_0": {
             "value": "material_print_temperature",
-            "maximum_value_warning": "470",
             "maximum_value": "470"
         },
         "material_initial_print_temperature": {
             "value": "material_print_temperature",
-            "maximum_value_warning": "470",
             "maximum_value": "470"
         },
         "material_final_print_temperature": {
             "value": "material_print_temperature",
-            "maximum_value_warning": "470",
             "maximum_value": "470"
         },
         "default_material_bed_temperature": {
-            "maximum_value_warning": "150",
             "maximum_value": "150"
         },
         "material_bed_temperature": {
-            "maximum_value_warning": "150",
             "maximum_value": "150"
         },
         "material_bed_temperature_layer_0": {
-            "maximum_value_warning": "150",
             "maximum_value": "150"
         },
-        "speed_infill": {
-            "value": "speed_print"
-        },
         "speed_wall": {
             "value": "speed_print"
         },

resources/definitions/kingroon_base.def.json

@@ -170,15 +170,11 @@
 		"default_material_bed_temperature": { "maximum_value": "150" },
 
         "speed_print": { "value": 60.0 } ,
-        "speed_infill": { "value": "speed_print" },
+
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_roofing": { "value": "speed_topbottom" },
         "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
         "speed_layer_0": { "value": 20.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
@@ -193,7 +189,6 @@
 
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature": { "value": "material_print_temperature" },
-        "material_flow": { "value": 100 },
 
         "z_seam_type": { "value": "'back'" },
         "z_seam_corner": { "value": "'z_seam_corner_none'" },
@@ -230,13 +225,11 @@
         "travel_retract_before_outer_wall": { "value": true },
         
 		"retraction_amount": { "value": 2 },
-        "retraction_enable": { "value": true },
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 2 },
         "retraction_min_travel": { "value": 1.5 },
 
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
         "adhesion_type": { "value": "'none' if support_enable else 'skirt'" },

resources/definitions/koonovo_base.def.json

@@ -49,7 +49,6 @@
         "acceleration_print": { "value": 500 },
         "acceleration_travel": { "value": 500 },
 
-        "line_width": { "value": "machine_nozzle_size" },
         
         "wall_thickness": {"value": "line_width * 2" },
 
@@ -63,33 +62,23 @@
         "material_final_print_temperature": { "value": "material_print_temperature" },
         "material_bed_temperature": { "value": "55" },       
         "material_bed_temperature_layer_0": { "value": "material_bed_temperature" },
-        "material_flow": { "value": 100 },
         "material_standby_temperature": { "value": "material_print_temperature" },
 
-
         "speed_print": { "value": 50.0 } ,
-        "speed_infill": { "value": "speed_print" },
+
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_travel": { "value": "120.0 if speed_print < 60 else 180.0 if speed_print > 100 else speed_print * 2.2" },
         "speed_layer_0": { "value": 25.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 25 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
         "speed_z_hop": { "value": 5 },
-
-        "retraction_enable": { "value": true },
         "retraction_amount": { "value": 2.5 },
         "retraction_speed": { "value": 40 },
 	    
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
-
         "support_brim_enable": { "value": true },
         "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },
         "support_pattern": { "value": "'zigzag'" },

resources/definitions/koonovo_kn3.def.json

@@ -66,7 +66,6 @@
         "acceleration_print": { "value": 500 },
         "acceleration_travel": { "value": 500 },
 
-        "line_width": { "value": "machine_nozzle_size" },
         
         "wall_thickness": {"value": "line_width * 2" },
 
@@ -79,30 +78,21 @@
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature": { "value": "material_print_temperature" },
         "default_material_bed_temperature": { "value": "55" },
-        "material_flow": { "value": 100 },
         "material_standby_temperature": { "value": "material_print_temperature" },
 
-
         "speed_print": { "value": 50.0 } ,
-        "speed_infill": { "value": "speed_print" },
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_travel": { "value": "120.0 if speed_print < 60 else 180.0 if speed_print > 100 else speed_print * 2.2" },
         "speed_layer_0": { "value": 25.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 25 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
         "speed_z_hop": { "value": 5 },
 
-        "retraction_enable": { "value": true },
         "retraction_amount": { "value": 2.5 },
         "retraction_speed": { "value": 40 },     
 
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
 

resources/definitions/koonovo_kn5.def.json

@@ -68,8 +68,6 @@
         "acceleration_print": { "value": 500 },
         "acceleration_travel": { "value": 500 },
         
-        "line_width": { "value": "machine_nozzle_size" },
-        
         "wall_thickness": {"value": "line_width * 2" },
 
         "top_bottom_thickness": {"value":  "layer_height_0 + layer_height * 3" },      
@@ -82,31 +80,22 @@
         "material_final_print_temperature": { "value": "material_print_temperature" },
         "material_standby_temperature": { "value": "material_print_temperature" },
         "default_material_bed_temperature": { "value": "45" },
-        "material_flow": { "value": 100 },
 
-        "speed_print": { "value": 50.0 } ,
+        "speed_print": { "value": 50.0 } , ,
-        "speed_infill": { "value": "speed_print" },
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_travel": { "value": "120.0 if speed_print < 60 else 180.0 if speed_print > 100 else speed_print * 2.2" },
         "speed_layer_0": { "value": 25.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 25 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
         "speed_z_hop": { "value": 5 },
 
-        "retraction_enable": { "value": true },
         "retraction_amount": { "value": 2.5 },
         "retraction_speed": { "value": 40 },     
 
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
-
         "support_brim_enable": { "value": true },
         "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },
         "support_pattern": { "value": "'zigzag'" },

resources/definitions/liquid.def.json

@@ -88,7 +88,6 @@
             "enabled": true
         },
 
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_print": { "value": "4000" },

resources/definitions/longer_base.def.json

@@ -60,15 +60,10 @@
         "jerk_enabled": { "value": false },
 
         "speed_print": { "value": 50.0 } ,
-        "speed_infill": { "value": "speed_print" },
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_roofing": { "value": "speed_topbottom" },
         "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
         "speed_layer_0": { "value": 20.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
@@ -77,18 +72,15 @@
 
         "skirt_brim_speed": { "value": "speed_layer_0" },
 
-        "line_width": { "value": "machine_nozzle_size" },
 
         "optimize_wall_printing_order": { "value": "True" },
 
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature": { "value": "material_print_temperature" },
-        "material_flow": { "value": 100 },
 
         "z_seam_type": { "value": "'back'" },
         "z_seam_corner": { "value": "'z_seam_corner_weighted'" },
 
-        "infill_sparse_density": { "value": "20" },
         "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
         "infill_before_walls": { "value": false },
         "infill_overlap": { "value": 30.0 },
@@ -113,7 +105,6 @@
             "maximum_value": 200
         },
 
-        "retraction_hop_enabled": { "value": "False" },
         "retraction_hop": { "value": 0.2 },
         "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
         "retraction_combing_max_distance": { "value": 30 },
@@ -121,13 +112,12 @@
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
         
-        "retraction_enable": { "value": true },
+
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
         "retraction_min_travel": { "value": 1.5 },
 
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
         "adhesion_type": { "value": "'raft'" },

resources/definitions/lotmaxx_sc10.def.json

@@ -14,7 +14,8 @@
             "0": "lotmaxx_sc10_extruder_0"
         }
     },
-    "overrides": {
+    "overrides":
+    {
         "machine_name": { "default_value": "Lotmaxx SC-10" },
         "machine_width": { "default_value": 235 },
         "machine_depth": { "default_value": 235 },
@@ -35,14 +36,11 @@
         "jerk_enabled":{ "value": false },
         "speed_print":{ "value": 60.0 },
         "speed_infill":{ "value": "speed_print * 2" },
-        "speed_wall":{ "value":"speed_print / 2" },
         "speed_wall_0":{ "value": "speed_wall" },
         "speed_wall_x":{ "value": "speed_wall" },
-        "speed_topbottom":{ "value":"speed_print / 2" },
         "speed_roofing":{ "value": "speed_topbottom" },
         "speed_travel":{ "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
         "speed_layer_0":{ "value": 20.0 },
-        "speed_print_layer_0":{ "value":"speed_layer_0" },
         "speed_travel_layer_0":{ "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
         "speed_prime_tower":{ "value": "speed_topbottom" },
         "speed_support":{ "value": "speed_wall_0" },

resources/definitions/lotmaxx_sc20.def.json

@@ -35,14 +35,11 @@
         "jerk_enabled":{ "value":false },
         "speed_print":{ "value":60.0 },
         "speed_infill":{ "value":"speed_print * 2" },
-        "speed_wall":{ "value":"speed_print / 2" },
         "speed_wall_0":{ "value":"speed_wall" },
         "speed_wall_x":{ "value":"speed_wall" },
-        "speed_topbottom":{ "value":"speed_print / 2" },
         "speed_roofing":{ "value":"speed_topbottom" },
         "speed_travel":{ "value":"150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
         "speed_layer_0":{ "value":20.0 },
-        "speed_print_layer_0":{ "value":"speed_layer_0" },
         "speed_travel_layer_0":{ "value":"100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
         "speed_prime_tower":{ "value":"speed_topbottom" },
         "speed_support":{ "value":"speed_wall_0" },

resources/definitions/malyan_m200.def.json

@@ -28,7 +28,6 @@
         "speed_wall_x": { "value": "speed_print" },
         "speed_support": { "value": "speed_wall_0" },
         "speed_layer_0": { "value": "round(speed_print / 2.0, 2)" },
-        "speed_infill": { "value": "speed_print" },
         "speed_topbottom": {"value": "speed_print / 2"},
 
         "layer_height":
@@ -80,7 +79,6 @@
         "retraction_amount" : { "default_value": 4.5},
         "retraction_speed" : { "default_value": 40},
         "coasting_enable": { "default_value": true },
-        "prime_tower_enable": { "default_value": false},
         "speed_z_hop": {"default_value": 1.5}
     }
 }

resources/definitions/mingda_base.def.json

@@ -108,15 +108,10 @@
         "jerk_enabled": { "value": false },
 
         "speed_print": { "value": 60.0 } ,
-        "speed_infill": { "value": "speed_print" },
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_roofing": { "value": "speed_topbottom" },
         "speed_travel": { "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
         "speed_layer_0": { "value": 20.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
@@ -131,7 +126,6 @@
 
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_final_print_temperature": { "value": "material_print_temperature" },
-        "material_flow": { "value": 100 },
 
         "z_seam_type": { "value": "'back'" },
         "z_seam_corner": { "value": "'z_seam_corner_none'" },
@@ -168,13 +162,12 @@
         "travel_retract_before_outer_wall": { "value": true },
         
 		"retraction_amount": { "value": 2 },
-        "retraction_enable": { "value": true },
+
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
         "retraction_min_travel": { "value": 1.5 },
 
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
         "adhesion_type": { "value": "'none' if support_enable else 'skirt'" },

resources/definitions/mixware_hyper_s.def.json

@@ -241,12 +241,6 @@
         "skirt_brim_speed": {
             "value": "speed_layer_0"
         },
-        "speed_infill": {
-            "value": "speed_print"
-        },
-        "speed_wall": {
-            "value": "speed_print / 2"
-        },
         "speed_wall_0": {
             "value": "speed_wall"
         },
@@ -262,9 +256,6 @@
         "speed_travel": {
             "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5"
         },
-        "speed_print_layer_0": {
-            "value": "speed_layer_0"
-        },
         "speed_travel_layer_0": {
             "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5"
         },

resources/definitions/rigid3d_base.def.json

@@ -113,7 +113,7 @@
         "travel_avoid_other_parts": { "value": "False" },
         
         "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" },
-        "support_interface_enable": { "value": "True" },
+        "support_interface_enable": { "value": true },
         "support_interface_density": { "value": 70 },
         "minimum_interface_area": { "value": 5.0 },
         "minimum_support_area": { "value": 5 },

resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json

@@ -28,9 +28,6 @@
 
     "overrides": {
         "machine_name": { "default_value": "Discov3ry Complete (Ultimaker 2+)" },
-        "speed_infill": {
-            "value": "speed_print"
-        },
         "infill_sparse_density": {
             "value": 100
         },

resources/definitions/tank_m_base.def.json

@@ -49,7 +49,6 @@
         "acceleration_print": { "value": 2500 },
         "acceleration_travel": { "value": 2500 },
 
-        "line_width": { "value": "machine_nozzle_size" },
         
         "wall_thickness": {"value": "line_width * 2" },
 
@@ -63,33 +62,23 @@
         "material_final_print_temperature": { "value": "material_print_temperature" },
         "material_bed_temperature": { "value": "55" },       
         "material_bed_temperature_layer_0": { "value": "material_bed_temperature" },
-        "material_flow": { "value": 100 },
         "material_standby_temperature": { "value": "material_print_temperature" },
 
-
         "speed_print": { "value": 50.0 } ,
-        "speed_infill": { "value": "speed_print" },
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_travel": { "value": "120.0 if speed_print < 60 else 300.0 if speed_print > 100 else speed_print * 2.2" },
         "speed_layer_0": { "value": 25.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 25 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
         "speed_z_hop": { "value": 5 },
 
-        "retraction_enable": { "value": true },
         "retraction_amount": { "value": 1.0 },
         "retraction_speed": { "value": 40 },
 	    
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
-
         "support_brim_enable": { "value": true },
         "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" },
         "support_pattern": { "value": "'zigzag'" },

resources/definitions/trimaker_nebula_plus.def.json

@@ -32,7 +32,6 @@
         "machine_acceleration": { "default_value": 3000 },
         "machine_extruder_count": { "default_value": 1 },
 
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_print": { "value": "4000" },
         "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },

resources/definitions/tronxy_x.def.json

@@ -46,15 +46,12 @@
         "jerk_enabled": { "value": false },
 
         "speed_print": { "value": 60.0 } ,
-        "speed_infill": { "value": "speed_print" },
         "speed_wall": { "value": "speed_print * 0.75" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
         "speed_topbottom": { "value": "speed_print * 0.5" },
         "speed_roofing": { "value": "speed_topbottom" },
         "speed_travel": { "value": "60.0 if speed_print < 50 else 120.0 if speed_print > 80 else speed_print * 1.25" },
         "speed_layer_0": { "value": 30.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "45 if speed_layer_0 < 20 else 60 if speed_layer_0 > 30 else speed_layer_0 * 1.5" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
@@ -63,7 +60,6 @@
 
         "skirt_brim_speed": { "value": "speed_layer_0" },
 
-        "line_width": { "value": "machine_nozzle_size" },
 
         "optimize_wall_printing_order": { "value": "True" },
 
@@ -75,7 +71,6 @@
         "z_seam_type": { "value": "'sharpest_corner'" },
         "z_seam_corner": { "value": "'z_seam_corner_inner'" },
 
-        "infill_sparse_density": { "value": "20" },
         "infill_pattern": { "value": "'lines' if infill_sparse_density > 56 else 'cubic'" },
         "infill_before_walls": { "value": false },
         "infill_overlap": { "value": 30.0 },
@@ -106,7 +101,6 @@
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
 
-        "retraction_enable": { "value": true },
         "retract_at_layer_change": { "value": true },
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 5 },
@@ -114,7 +108,6 @@
         "retraction_min_travel": { "value": 1.5 },
 
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
         "adhesion_type": { "value": "'skirt'" },
@@ -140,8 +133,7 @@
         "support_wall_count": { "value": 0 },
         "support_brim_enable": { "value": true },
         "support_brim_width": { "value": 4 },
-
+        ,
-        "support_interface_enable": { "value": false },
         "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_density": { "value": 33.333 },
         "support_interface_pattern": { "value": "'grid'" },

resources/definitions/two_trees_base.def.json

@@ -33,14 +33,9 @@
         "material_diameter": { "default_value": 1.75 },
 
         "speed_print": { "value": 50.0 },
-        "speed_infill": { "value": "speed_print" },
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_print / 1.5" },
-        "speed_topbottom": { "value": "speed_print / 2" },
         "speed_roofing": { "value": "speed_topbottom" },
         "speed_layer_0": { "value": 20.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },      
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
         "speed_support_interface": { "value": "speed_topbottom" },
@@ -48,14 +43,12 @@
 
         "skirt_brim_speed": { "value": "speed_layer_0" },
 
-        "line_width": { "value": "machine_nozzle_size" },
 
         "optimize_wall_printing_order": { "value": "True" },
 
         "z_seam_type": { "value": "'sharpest_corner'" },
         "z_seam_corner": { "value": "'z_seam_corner_inner'" },
 
-        "infill_sparse_density": { "value": "20" },
         "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
         "infill_before_walls": { "value": false },
         "infill_overlap": { "value": 30.0 },
@@ -65,7 +58,6 @@
 
         "fill_outline_gaps": { "value": false },
 
-        "retraction_hop_enabled": { "value": "False" },
         "retraction_hop": { "value": 0.2 },
         "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
         "retraction_combing_max_distance": { "value": 30 },
@@ -73,16 +65,13 @@
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
 
-        "retraction_enable": { "value": true },
         "retraction_speed": { "default_value" : 40 },
         "retraction_amount": { "default_value" : 7 }, 
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
         "retraction_min_travel": { "value": 1.5 },
 
-
         "cool_fan_full_layer": { "value": "2" },
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
         "adhesion_type": { "value": "'skirt'" },
@@ -108,7 +97,6 @@
         "support_brim_enable": { "value": true },
         "support_brim_width": { "value": 5 },
 
-        "support_interface_enable": { "value": false },
         "support_interface_height": { "value": "layer_height * 4" },
         "support_interface_density": { "value": 33.333 },
         "support_interface_pattern": { "value": "'grid'" },

resources/definitions/ultimaker2_plus_connect.def.json

@@ -57,8 +57,6 @@
         "infill_wipe_dist": { "value": "0" },
         "infill_overlap": { "value": "0" },
         "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'grid'" },
-        "speed_infill": { "value": "speed_print" },
-        "speed_wall_x": { "value": "speed_wall" },
         "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
         "optimize_wall_printing_order": { "value": "True" },
         "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" },

resources/definitions/ultimaker3.def.json

@@ -82,7 +82,6 @@
 
         "prime_blob_enable": { "enabled": true, "default_value": true, "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" },
 
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" },
         "acceleration_print": { "value": "3500" },

resources/definitions/ultimaker_s3.def.json

@@ -75,7 +75,6 @@
             "value": "150"
         },
 
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" },
         "acceleration_print": { "value": "3500" },

resources/definitions/ultimaker_s5.def.json

@@ -77,7 +77,6 @@
             "value": "150"
         },
 
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" },
         "acceleration_print": { "value": "3500" },

resources/definitions/weedo_x40.def.json

@@ -215,7 +215,6 @@
         "infill_overlap": { "value": 30.0 },
         "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
         "infill_wipe_dist": { "value": 0.0 },
-        "infill_sparse_density": { "value": "20" },
         "infill_before_walls": { "value": false },
         "jerk_enabled": { "value": false },
         "jerk_print": { "value": 11 },
@@ -224,40 +223,31 @@
         "jerk_travel": { "value": 18 },
         "jerk_travel_layer_0": { "value": "jerk_travel" },
         "layer_height_0": { "value": "round(layer_height * 1.5, 2)" },
-        "line_width": { "value": "machine_nozzle_size" },
         "machine_min_cool_heat_time_window": { "default_value": 360 },
         "machine_max_jerk_xy": { "value": 10 },
         "machine_max_jerk_z": { "value": 0.4 },
         "machine_max_jerk_e": { "value": 5 },
         "machine_center_is_zero": { "default_value": false },
         "material_diameter": { "default_value": 1.75 },
-        "material_flow": { "value": 100 },
         "material_standby_temperature": { "value": "100" },
         "material_print_temp_prepend": { "default_value": false },
-        "prime_tower_enable": { "default_value": false },
         "raft_airgap": { "default_value": 0.22 },
         "raft_base_speed":{ "value": 20 },
         "raft_interface_speed": { "value": 33 },
         "raft_margin": { "default_value": 8 },
-        "retraction_enable": { "value": true },
+
         "retraction_amount": { "default_value": 4.5 },
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 8 },
         "retraction_hop": { "value": 0.5 },
-        "retraction_hop_enabled": { "value": "False" },
         "retraction_min_travel": { "value": 1.5 },
         "skin_overlap": { "value": 10.0 },
         "speed_layer_0": { "value": "round(speed_print / 2.5, 2)" },
         "speed_print": { "value": 50.0 },
         "speed_support": { "value": "speed_wall_0" },
         "speed_support_interface": { "value": "speed_print" },
-        "speed_topbottom": { "value": "speed_print / 2" }, 
-        "speed_wall": { "value": "speed_print / 2" },
-        "speed_wall_0": { "value": "speed_wall" },
         "speed_wall_x": { "value": "speed_wall" },
-        "speed_infill": { "value": "speed_print" },
         "speed_support_infill": { "value": 58.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": 60 },
         "speed_support_roof": { "value": 39.0 },
         "speed_support_bottom": { "value": 39.0 },

resources/definitions/winbo_dragonl4.def.json

@@ -40,7 +40,6 @@
         "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nM9998\nG28 X0 Y0\nG28 Z0\nG1 F6000 Z0.3\nG92 E0\nG1 F800 X585 E12\nG92 E0" },
         "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" },
         "prime_blob_enable": { "enabled": true },
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_print": { "value": "1800" },
@@ -115,7 +114,6 @@
         "travel_avoid_distance": { "value": "3" },
         "gradual_support_infill_step_height": { "value": "0.2" },
         "gradual_support_infill_steps": { "value": "1" },
-        "infill_sparse_density": { "value": "20" },
         "gradual_infill_step_height": { "value": "1" },
         "initial_layer_line_width_factor": { "value": "120" },
         "jerk_travel": { "value": "25" },
@@ -125,7 +123,7 @@
         "support_connect_zigzags": { "value": "False" },
         "support_infill_rate": { "value": "8 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 8" },
         "support_interface_density": { "value": "80" },
-        "support_interface_enable": { "value": "True" },
+        "support_interface_enable": { "value": true },
         "support_interface_height": { "value": "0.5" },
         "support_roof_pattern": { "value": "'concentric'" },
         "z_seam_type": { "value": "'shortest'" }

resources/definitions/winbo_mini2.def.json

@@ -40,7 +40,6 @@
         "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nG28 X0 Y0\nG28 Z0\nG1 F1000 Z3\nG1 F4000 X0\nG1 F4000 Y0\nG1 F1000 Z0.2\nG92 E0\nG1 F1000 X30 E8\nG92 E0\nM117 Printing." },
         "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" },
         "prime_blob_enable": { "enabled": true },
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_print": { "value": "2000" },
@@ -115,7 +114,6 @@
         "travel_avoid_distance": { "value": "3" },
         "gradual_support_infill_step_height": { "value": "0.2" },
         "gradual_support_infill_steps": { "value": "1" },
-        "infill_sparse_density": { "value": "20" },
         "gradual_infill_step_height": { "value": "1" },
         "initial_layer_line_width_factor": { "value": "120" },
         "jerk_travel": { "value": "25" },
@@ -125,7 +123,7 @@
         "support_connect_zigzags": { "value": "False" },
         "support_infill_rate": { "value": "8 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 8" },
         "support_interface_density": { "value": "80" },
-        "support_interface_enable": { "value": "True" },
+        "support_interface_enable": { "value": true },
         "support_interface_height": { "value": "0.5" },
         "support_roof_pattern": { "value": "'concentric'" },
         "z_seam_type": { "value": "'shortest'" }

resources/definitions/winbo_superhelper105.def.json

@@ -104,17 +104,16 @@
         "travel_avoid_distance": { "value": "3" },
         "gradual_support_infill_step_height": { "value": "0.2" },
         "gradual_support_infill_steps": { "value": "1" },
-        "infill_sparse_density": { "value": "20" },
         "gradual_infill_step_height": { "value": "1" },
         "initial_layer_line_width_factor": { "value": "120" },
         "jerk_travel": { "value": "25" },
-        "support_bottom_enable": { "value": "True" },
+        "support_bottom_enable": { "value": true },
         "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" },
         "support_bottom_pattern": { "value": "'zigzag'" },
-        "support_connect_zigzags": { "value": "False" },
+        "support_connect_zigzags": { "value": false },
         "support_infill_rate": { "value": "8 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 8" },
         "support_interface_density": { "value": "80" },
-        "support_interface_enable": { "value": "True" },
+        "support_interface_enable": { "value": true },
         "support_interface_height": { "value": "0.5" },
         "support_roof_pattern": { "value": "'concentric'" },
         "z_seam_type": { "value": "'shortest'" }