Browse Source

Updated json format

mao 2 years ago
parent
commit
a7082fde2b

+ 95 - 261
resources/definitions/weedo_base.def.json

@@ -2,19 +2,12 @@
     "version": 2,
     "name": "WEEDO Base",
     "inherits": "fdmprinter",
-    "metadata": {
+    "metadata":
+    {
+        "visible": false,
         "author": "WEEDO",
         "manufacturer": "WEEDO",
-        "visible": false,
         "file_formats": "text/x-gcode",
-        "machine_extruder_trains": {
-            "0": "weedo_base_extruder_0"
-        },
-        "has_materials": true,
-        "has_variants": false,
-        "has_machine_quality": false,
-        "preferred_quality_type": "draft",
-        "preferred_material": "generic_pla_175",
         "exclude_materials": [
             "3D-Fuel_PLA_PRO_Black",
             "3D-Fuel_PLA_SnapSupport",
@@ -164,257 +157,98 @@
             "xyzprinting_tpu",
             "zyyx_pro_flex",
             "zyyx_pro_pla"
-        ]
+        ],
+        "has_machine_quality": false,
+        "has_materials": true,
+        "has_variants": false,
+        "machine_extruder_trains": { "0": "weedo_base_extruder_0" },
+        "preferred_material": "generic_pla_175",
+        "preferred_quality_type": "draft"
     },
-    "overrides": {
-        "machine_name": {
-            "default_value": "WEEDO Base"
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0"
-        },
-        "machine_end_gcode": {
-            "default_value": "G92 E0\nG1 E-3 F1680 \nG28 Z F400; Get extruder out of way.\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n"
-        },
-        "material_diameter": {
-            "default_value": 1.75
-        },
-        "material_bed_temp_wait": {
-            "default_value": false
-        },
-        "material_print_temp_wait": {
-            "default_value": false
-        },
-        "machine_heated_bed": {
-            "default_value": true
-        },
-        "machine_nozzle_tip_outer_diameter": {
-            "default_value": 0.8
-        },
-        "machine_nozzle_heat_up_speed": {
-            "default_value": 1.8
-        },
-        "machine_nozzle_cool_down_speed": {
-            "default_value": 0.67
-        },
-        "machine_min_cool_heat_time_window": {
-            "default_value": 1200.0
-        },
-        "machine_max_feedrate_x": {
-            "default_value": 200
-        },
-        "machine_max_feedrate_y": {
-            "default_value": 130
-        },
-        "machine_max_feedrate_z": {
-            "default_value": 10
-        },
-        "machine_max_feedrate_e": {
-            "default_value": 50
-        },
-        "machine_max_acceleration_x": {
-            "default_value": 3000
-        },
-        "machine_max_acceleration_y": {
-            "default_value": 3000
-        },
-        "machine_max_acceleration_z": {
-            "default_value": 120
-        },
-        "machine_max_acceleration_e": {
-            "default_value": 1600
-        },
-        "machine_acceleration": {
-            "default_value": 3000
-        },
-        "machine_max_jerk_xy": {
-            "default_value": 10.0
-        },
-        "machine_max_jerk_z": {
-            "default_value": 5
-        },
-        "machine_max_jerk_e": {
-            "default_value": 5.1
-        },
-        "infill_line_width": {
-            "value": "line_width * 1.25"
-        },
-        "initial_layer_line_width_factor": {
-            "default_value": 110.0
-        },
-        "wall_0_wipe_dist": {
-            "value": 0.0
-        },
-        "z_seam_corner": {
-            "default_value": "z_seam_corner_any"
-        },
-        "skin_outline_count": {
-            "value": "0"
-        },
-        "infill_sparse_density": {
-            "default_value": 10.0
-        },
-        "infill_pattern": {
-            "value": "'zigzag'"
-        },
-        "infill_before_walls": {
-            "default_value": false
-        },
-        "material_print_temperature": {
-            "maximum_value": "300"
-        },
-        "material_print_temperature_layer_0": {
-            "value": "min(material_print_temperature + 10, 300)"
-        },
-        "material_initial_print_temperature": {
-            "value": "material_print_temperature"
-        },
-        "material_final_print_temperature": {
-            "value": "material_print_temperature"
-        },
-        "material_bed_temperature": {
-            "maximum_value_warning": "96"
-        },
-        "material_flow": {
-            "default_value": 95.0
-        },
-        "material_flow_layer_0": {
-            "default_value": 95.0
-        },
-        "infill_material_flow": {
-            "value": "max(0, material_flow - 5)"
-        },
-        "support_material_flow": {
-            "value": "max(0, material_flow - 5)"
-        },
-        "speed_print": {
-            "default_value": 70.0
-        },
-        "speed_wall": {
-            "value": "max(5, round(speed_print / 2 - 5, 1))"
-        },
-        "speed_wall_0": {
-            "value": "max(5, speed_wall - 5)"
-        },
-        "speed_wall_x": {
-            "value": "speed_wall"
-        },
-        "speed_topbottom": {
-            "value": "round(speed_print * 0.65, 1)"
-        },
-        "speed_support": {
-            "value": "round(speed_print * 0.82, 1)"
-        },
-        "speed_support_interface": {
-            "value": "round(speed_support * 0.689, 1)"
-        },
-        "speed_prime_tower": {
-            "value": "speed_support"
-        },
-        "speed_travel": {
-            "value": 105.0
-        },
-        "speed_layer_0": {
-            "value": 26.0
-        },
-        "speed_travel_layer_0": {
-            "value": 80.0
-        },
-        "skirt_brim_speed": {
-            "value": 26.0
-        },
-        "retraction_amount": {
-            "default_value": 3
-        },
-        "retraction_speed": {
-            "default_value": 28.0
-        },
-        "retraction_min_travel": {
-            "value": 0.8
-        },
-        "retraction_extrusion_window": {
-            "value": 1.0
-        },
-        "material_standby_temperature": {
-            "default_value": 175.0
-        },
-        "switch_extruder_retraction_amount": {
-            "value": 16.5
-        },
-        "switch_extruder_retraction_speeds": {
-            "default_value": 28.0
-        },
-        "retraction_combing": {
-            "value": "off"
-        },
-        "retraction_hop_after_extruder_switch": {
-            "default_value": false
-        },
-        "support_angle": {
-            "default_value": 60.0
-        },
-        "support_connect_zigzags": {
-            "default_value": false
-        },
-        "support_z_distance": {
-            "default_value": 0.18
-        },
-        "support_interface_enable": {
-            "default_value": true
-        },
-        "support_interface_density": {
-            "default_value": 60.0
-        },
-        "support_interface_height": {
-            "default_value": 0.8
-        },
-        "support_interface_pattern": {
-            "default_value": "lines"
-        },
-        "adhesion_type": {
-            "default_value": "raft"
-        },
-        "skirt_line_count": {
-            "default_value": 2
-        },
-        "raft_margin": {
-            "default_value": 8.0
-        },
-        "raft_airgap": {
-            "default_value": 0.19
-        },
-        "layer_0_z_overlap": {
-            "value": 0.09
-        },
-        "raft_surface_thickness": {
-            "value": 0.25
-        },
-        "raft_interface_thickness": {
-            "value": 0.27
-        },
-        "raft_surface_speed": {
-            "value": 40.0
-        },
-        "raft_interface_speed": {
-            "value": 33.0
-        },
-        "raft_base_speed": {
-            "value": 20.0
-        },
-        "raft_surface_fan_speed": {
-            "value": "100.0 if cool_fan_enabled else 0.0"
-        },
-        "prime_tower_size": {
-            "default_value": 15.0
-        },
-        "prime_tower_min_volume": {
-            "default_value": 10.0
-        },
-        "draft_shield_dist": {
-            "default_value": 3
-        },
-        "top_skin_preshrink": {
-            "value": 0.0
-        }
+    "overrides":
+    {
+        "adhesion_type": { "default_value": "raft" },
+        "draft_shield_dist": { "default_value": 3 },
+        "infill_before_walls": { "default_value": false },
+        "infill_line_width": { "value": "line_width * 1.25" },
+        "infill_material_flow": { "value": "max(0, material_flow - 5)" },
+        "infill_pattern": { "value": "'zigzag'" },
+        "infill_sparse_density": { "default_value": 10.0 },
+        "initial_layer_line_width_factor": { "default_value": 110.0 },
+        "layer_0_z_overlap": { "value": 0.09 },
+        "machine_acceleration": { "default_value": 3000 },
+        "machine_end_gcode": { "default_value": "G92 E0\nG1 E-3 F1680 \nG28 Z F400; Get extruder out of way.\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n" },
+        "machine_heated_bed": { "default_value": true },
+        "machine_max_acceleration_e": { "default_value": 1600 },
+        "machine_max_acceleration_x": { "default_value": 3000 },
+        "machine_max_acceleration_y": { "default_value": 3000 },
+        "machine_max_acceleration_z": { "default_value": 120 },
+        "machine_max_feedrate_e": { "default_value": 50 },
+        "machine_max_feedrate_x": { "default_value": 200 },
+        "machine_max_feedrate_y": { "default_value": 130 },
+        "machine_max_feedrate_z": { "default_value": 10 },
+        "machine_max_jerk_e": { "default_value": 5.1 },
+        "machine_max_jerk_xy": { "default_value": 10.0 },
+        "machine_max_jerk_z": { "default_value": 5 },
+        "machine_min_cool_heat_time_window": { "default_value": 1200.0 },
+        "machine_name": { "default_value": "WEEDO Base" },
+        "machine_nozzle_cool_down_speed": { "default_value": 0.67 },
+        "machine_nozzle_heat_up_speed": { "default_value": 1.8 },
+        "machine_nozzle_tip_outer_diameter": { "default_value": 0.8 },
+        "machine_start_gcode": { "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" },
+        "material_bed_temp_wait": { "default_value": false },
+        "material_bed_temperature": { "maximum_value_warning": "96" },
+        "material_diameter": { "default_value": 1.75 },
+        "material_final_print_temperature": { "value": "material_print_temperature" },
+        "material_flow": { "default_value": 95.0 },
+        "material_flow_layer_0": { "default_value": 95.0 },
+        "material_initial_print_temperature": { "value": "material_print_temperature" },
+        "material_print_temp_wait": { "default_value": false },
+        "material_print_temperature": { "maximum_value": "300" },
+        "material_print_temperature_layer_0": { "value": "min(material_print_temperature + 10, 300)" },
+        "material_standby_temperature": { "default_value": 175.0 },
+        "prime_tower_min_volume": { "default_value": 10.0 },
+        "prime_tower_size": { "default_value": 15.0 },
+        "raft_airgap": { "default_value": 0.19 },
+        "raft_base_speed": { "value": 20.0 },
+        "raft_interface_speed": { "value": 33.0 },
+        "raft_interface_thickness": { "value": 0.27 },
+        "raft_margin": { "default_value": 8.0 },
+        "raft_surface_fan_speed": { "value": "100.0 if cool_fan_enabled else 0.0" },
+        "raft_surface_speed": { "value": 40.0 },
+        "raft_surface_thickness": { "value": 0.25 },
+        "retraction_amount": { "default_value": 3 },
+        "retraction_combing": { "value": "off" },
+        "retraction_extrusion_window": { "value": 1.0 },
+        "retraction_hop_after_extruder_switch": { "default_value": false },
+        "retraction_min_travel": { "value": 0.8 },
+        "retraction_speed": { "default_value": 28.0 },
+        "skin_outline_count": { "value": "0" },
+        "skirt_brim_speed": { "value": 26.0 },
+        "skirt_line_count": { "default_value": 2 },
+        "speed_layer_0": { "value": 26.0 },
+        "speed_prime_tower": { "value": "speed_support" },
+        "speed_print": { "default_value": 70.0 },
+        "speed_support": { "value": "round(speed_print * 0.82, 1)" },
+        "speed_support_interface": { "value": "round(speed_support * 0.689, 1)" },
+        "speed_topbottom": { "value": "round(speed_print * 0.65, 1)" },
+        "speed_travel": { "value": 105.0 },
+        "speed_travel_layer_0": { "value": 80.0 },
+        "speed_wall": { "value": "max(5, round(speed_print / 2 - 5, 1))" },
+        "speed_wall_0": { "value": "max(5, speed_wall - 5)" },
+        "speed_wall_x": { "value": "speed_wall" },
+        "support_angle": { "default_value": 60.0 },
+        "support_connect_zigzags": { "default_value": false },
+        "support_interface_density": { "default_value": 60.0 },
+        "support_interface_enable": { "default_value": true },
+        "support_interface_height": { "default_value": 0.8 },
+        "support_interface_pattern": { "default_value": "lines" },
+        "support_material_flow": { "value": "max(0, material_flow - 5)" },
+        "support_z_distance": { "default_value": 0.18 },
+        "switch_extruder_retraction_amount": { "value": 16.5 },
+        "switch_extruder_retraction_speeds": { "default_value": 28.0 },
+        "top_skin_preshrink": { "value": 0.0 },
+        "wall_0_wipe_dist": { "value": 0.0 },
+        "z_seam_corner": { "default_value": "z_seam_corner_any" }
     }
 }

+ 16 - 27
resources/definitions/weedo_f150s.def.json

@@ -1,8 +1,9 @@
 {
-    "name": "WEEDO F150S",
     "version": 2,
+    "name": "WEEDO F150S",
     "inherits": "weedo_base",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "WEEDO",
         "manufacturer": "WEEDO",
@@ -13,31 +14,19 @@
             0
         ]
     },
-    "overrides": {
-        "machine_name": {
-            "default_value": "WEEDO F150S"
-        },
-        "machine_start_gcode": {
-            "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for (150S)****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z140 F300\nG28 Z\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z5"
-        },
-        "machine_end_gcode": {
-            "default_value": ";(**** end.gcode for 150s****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680 ; Reduce filament pressure\nG28 Z F1500; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off"
-        },
-        "machine_width": {
-            "default_value": 200
-        },
-        "machine_depth": {
-            "default_value": 150
-        },
-        "machine_height": {
-            "default_value": 150
-        },
-        "material_bed_temperature": {
-            "maximum_value_warning": "70",
-            "maximum_value": "90"
+    "overrides":
+    {
+        "machine_depth": { "default_value": 150 },
+        "machine_end_gcode": { "default_value": ";(**** end.gcode for 150s****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680 ; Reduce filament pressure\nG28 Z F1500; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" },
+        "machine_height": { "default_value": 150 },
+        "machine_name": { "default_value": "WEEDO F150S" },
+        "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for (150S)****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z140 F300\nG28 Z\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z5" },
+        "machine_width": { "default_value": 200 },
+        "material_bed_temperature":
+        {
+            "maximum_value": "90",
+            "maximum_value_warning": "70"
         },
-        "retraction_amount": {
-            "default_value": 1.2
-        }
+        "retraction_amount": { "default_value": 1.2 }
     }
 }

+ 12 - 24
resources/definitions/weedo_f152s.def.json

@@ -1,8 +1,9 @@
 {
-    "name": "WEEDO F152S",
     "version": 2,
+    "name": "WEEDO F152S",
     "inherits": "weedo_base",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "WEEDO",
         "manufacturer": "WEEDO",
@@ -13,27 +14,14 @@
             0
         ]
     },
-    "overrides": {
-        "machine_name": {
-            "default_value": "WEEDO F152S"
-        },
-        "machine_start_gcode": {
-            "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for F152S ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z5"
-        },
-        "machine_end_gcode": {
-            "default_value": ";(**** end.gcode for F152S****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off"
-        },
-        "machine_width": {
-            "default_value": 200
-        },
-        "machine_depth": {
-            "default_value": 185
-        },
-        "machine_height": {
-            "default_value": 195
-        },
-        "retraction_amount": {
-            "default_value": 1.2
-        }
+    "overrides":
+    {
+        "machine_depth": { "default_value": 185 },
+        "machine_end_gcode": { "default_value": ";(**** end.gcode for F152S****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" },
+        "machine_height": { "default_value": 195 },
+        "machine_name": { "default_value": "WEEDO F152S" },
+        "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for F152S ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z5" },
+        "machine_width": { "default_value": 200 },
+        "retraction_amount": { "default_value": 1.2 }
     }
 }

+ 12 - 24
resources/definitions/weedo_f370.def.json

@@ -1,8 +1,9 @@
 {
-    "name": "WEEDO F370",
     "version": 2,
+    "name": "WEEDO F370",
     "inherits": "weedo_base",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "WEEDO",
         "manufacturer": "WEEDO",
@@ -13,27 +14,14 @@
             0
         ]
     },
-    "overrides": {
-        "machine_name": {
-            "default_value": "WEEDO F370"
-        },
-        "machine_start_gcode": {
-            "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for 370 ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z2"
-        },
-        "machine_end_gcode": {
-            "default_value": ";(**** end.gcode for F370****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off"
-        },
-        "machine_width": {
-            "default_value": 310
-        },
-        "machine_depth": {
-            "default_value": 310
-        },
-        "machine_height": {
-            "default_value": 370
-        },
-        "retraction_amount": {
-            "default_value": 1.2
-        }
+    "overrides":
+    {
+        "machine_depth": { "default_value": 310 },
+        "machine_end_gcode": { "default_value": ";(**** end.gcode for F370****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" },
+        "machine_height": { "default_value": 370 },
+        "machine_name": { "default_value": "WEEDO F370" },
+        "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for 370 ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z2" },
+        "machine_width": { "default_value": 310 },
+        "retraction_amount": { "default_value": 1.2 }
     }
 }

+ 15 - 33
resources/definitions/weedo_hephi3s.def.json

@@ -1,8 +1,9 @@
 {
-    "name": "WEEDO hephi3s",
     "version": 2,
+    "name": "WEEDO hephi3s",
     "inherits": "weedo_base",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "WEEDO",
         "manufacturer": "WEEDO",
@@ -13,36 +14,17 @@
             0
         ]
     },
-    "overrides": {
-        "machine_name": {
-            "default_value": "WEEDO hephi3s"
-        },
-        "machine_start_gcode": {
-            "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for hephi3****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15 F1000\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8"
-        },
-        "machine_end_gcode": {
-            "default_value": ";(**** end.gcode for hephi3****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off"
-        },
-        "machine_width": {
-            "default_value": 220
-        },
-        "machine_depth": {
-            "default_value": 220
-        },
-        "machine_height": {
-            "default_value": 250
-        },
-        "speed_print": {
-            "default_value": 60.0
-        },
-        "speed_wall": {
-            "value": "speed_print / 2"
-        },
-        "speed_topbottom": {
-            "value": "round(speed_print * 0.58, 1)"
-        },
-        "speed_support": {
-            "value": "round(speed_print * 0.96, 1)"
-        }
+    "overrides":
+    {
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": ";(**** end.gcode for hephi3****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" },
+        "machine_height": { "default_value": 250 },
+        "machine_name": { "default_value": "WEEDO hephi3s" },
+        "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for hephi3****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15 F1000\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" },
+        "machine_width": { "default_value": 220 },
+        "speed_print": { "default_value": 60.0 },
+        "speed_support": { "value": "round(speed_print * 0.96, 1)" },
+        "speed_topbottom": { "value": "round(speed_print * 0.58, 1)" },
+        "speed_wall": { "value": "speed_print / 2" }
     }
 }

+ 15 - 33
resources/definitions/weedo_me40.def.json

@@ -1,8 +1,9 @@
 {
-    "name": "WEEDO ME40",
     "version": 2,
+    "name": "WEEDO ME40",
     "inherits": "weedo_base",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "WEEDO",
         "manufacturer": "WEEDO",
@@ -13,36 +14,17 @@
             0
         ]
     },
-    "overrides": {
-        "machine_name": {
-            "default_value": "WEEDO ME40"
-        },
-        "machine_start_gcode": {
-            "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8"
-        },
-        "machine_end_gcode": {
-            "default_value": ";(**** end.gcode for  ME40****)\nM203 Z15\nG1 X0 Y150 F3000\nG28 Z\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off"
-        },
-        "machine_width": {
-            "default_value": 300
-        },
-        "machine_depth": {
-            "default_value": 300
-        },
-        "machine_height": {
-            "default_value": 400
-        },
-        "speed_print": {
-            "default_value": 60.0
-        },
-        "speed_wall": {
-            "value": "speed_print / 2"
-        },
-        "speed_topbottom": {
-            "value": "round(speed_print * 0.58, 1)"
-        },
-        "speed_support": {
-            "value": "round(speed_print * 0.96, 1)"
-        }
+    "overrides":
+    {
+        "machine_depth": { "default_value": 300 },
+        "machine_end_gcode": { "default_value": ";(**** end.gcode for  ME40****)\nM203 Z15\nG1 X0 Y150 F3000\nG28 Z\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" },
+        "machine_height": { "default_value": 400 },
+        "machine_name": { "default_value": "WEEDO ME40" },
+        "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" },
+        "machine_width": { "default_value": 300 },
+        "speed_print": { "default_value": 60.0 },
+        "speed_support": { "value": "round(speed_print * 0.96, 1)" },
+        "speed_topbottom": { "value": "round(speed_print * 0.58, 1)" },
+        "speed_wall": { "value": "speed_print / 2" }
     }
 }

+ 20 - 37
resources/definitions/weedo_me40_lite.def.json

@@ -1,8 +1,9 @@
 {
-    "name": "WEEDO ME40 Lite",
     "version": 2,
+    "name": "WEEDO ME40 Lite",
     "inherits": "weedo_base",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "WEEDO",
         "manufacturer": "WEEDO",
@@ -13,40 +14,22 @@
             0
         ]
     },
-    "overrides": {
-        "machine_name": {
-            "default_value": "WEEDO ME40 Lite"
-        },
-        "machine_start_gcode": {
-            "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40 Lite****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8"
-        },
-        "machine_end_gcode": {
-            "default_value": ";(**** end.gcode for  ME40****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off"
-        },
-        "machine_width": {
-            "default_value": 300
-        },
-        "machine_depth": {
-            "default_value": 300
-        },
-        "machine_height": {
-            "default_value": 400
-        },
-        "material_bed_temperature": {
-            "maximum_value_warning": "70",
-            "maximum_value": "90"
-        },
-        "speed_print": {
-            "default_value": 60.0
-        },
-        "speed_wall": {
-            "value": "speed_print / 2"
-        },
-        "speed_topbottom": {
-            "value": "round(speed_print * 0.58, 1)"
-        },
-        "speed_support": {
-            "value": "round(speed_print * 0.96, 1)"
-        }
+    "overrides":
+    {
+        "machine_depth": { "default_value": 300 },
+        "machine_end_gcode": { "default_value": ";(**** end.gcode for  ME40****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" },
+        "machine_height": { "default_value": 400 },
+        "machine_name": { "default_value": "WEEDO ME40 Lite" },
+        "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40 Lite****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" },
+        "machine_width": { "default_value": 300 },
+        "material_bed_temperature":
+        {
+            "maximum_value": "90",
+            "maximum_value_warning": "70"
+        },
+        "speed_print": { "default_value": 60.0 },
+        "speed_support": { "value": "round(speed_print * 0.96, 1)" },
+        "speed_topbottom": { "value": "round(speed_print * 0.58, 1)" },
+        "speed_wall": { "value": "speed_print / 2" }
     }
 }

+ 32 - 74
resources/definitions/weedo_tina2.def.json

@@ -1,17 +1,13 @@
 {
-    "name": "WEEDO TINA2",
     "version": 2,
+    "name": "WEEDO TINA2",
     "inherits": "weedo_base",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "WEEDO",
         "manufacturer": "WEEDO",
         "file_formats": "text/x-gcode",
-        "platform_offset": [
-            0,
-            0,
-            0
-        ],
         "exclude_materials": [
             "3D-Fuel_PLA_PRO_Black",
             "3D-Fuel_PLA_SnapSupport",
@@ -169,74 +165,36 @@
             "xyzprinting_tpu",
             "zyyx_pro_flex",
             "zyyx_pro_pla"
+        ],
+        "platform_offset": [
+            0,
+            0,
+            0
         ]
     },
-    "overrides": {
-        "machine_name": {
-            "default_value": "WEEDO TINA2"
-        },
-        "machine_start_gcode": {
-            "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5"
-        },
-        "machine_end_gcode": {
-            "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000"
-        },
-        "machine_width": {
-            "default_value": 100
-        },
-        "machine_depth": {
-            "default_value": 120
-        },
-        "machine_height": {
-            "default_value": 100
-        },
-        "machine_heated_bed": {
-            "default_value": false
-        },
-        "infill_pattern": {
-            "value": "'lines' if infill_sparse_density > 45 else 'grid'"
-        },
-        "speed_print": {
-            "value": 40.0
-        },
-        "speed_infill": {
-            "value": 40.0
-        },
-        "speed_wall": {
-            "value": 25.0
-        },
-        "speed_wall_0": {
-            "value": 20.0
-        },
-        "speed_wall_x": {
-            "value": 25.0
-        },
-        "speed_topbottom": {
-            "value": 30.0
-        },
-        "speed_support_infill": {
-            "value": 45.0
-        },
-        "speed_print_layer_0": {
-            "value": 22.0
-        },
-        "speed_travel_layer_0": {
-            "value": 60
-        },
-        "speed_travel": {
-            "value": 65.0
-        },
-        "speed_support_roof": {
-            "value": 30.0
-        },
-        "speed_support_bottom": {
-            "value": 30.0
-        },
-        "speed_roofing": {
-            "value": 25.0
-        },
-        "raft_base_thickness": {
-            "value": 0.35
-        }
+    "overrides":
+    {
+        "infill_pattern": { "value": "'lines' if infill_sparse_density > 45 else 'grid'" },
+        "machine_depth": { "default_value": 120 },
+        "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" },
+        "machine_heated_bed": { "default_value": false },
+        "machine_height": { "default_value": 100 },
+        "machine_name": { "default_value": "WEEDO TINA2" },
+        "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" },
+        "machine_width": { "default_value": 100 },
+        "raft_base_thickness": { "value": 0.35 },
+        "speed_infill": { "value": 40.0 },
+        "speed_print": { "value": 40.0 },
+        "speed_print_layer_0": { "value": 22.0 },
+        "speed_roofing": { "value": 25.0 },
+        "speed_support_bottom": { "value": 30.0 },
+        "speed_support_infill": { "value": 45.0 },
+        "speed_support_roof": { "value": 30.0 },
+        "speed_topbottom": { "value": 30.0 },
+        "speed_travel": { "value": 65.0 },
+        "speed_travel_layer_0": { "value": 60 },
+        "speed_wall": { "value": 25.0 },
+        "speed_wall_0": { "value": 20.0 },
+        "speed_wall_x": { "value": 25.0 }
     }
 }

+ 35 - 72
resources/definitions/weedo_tina2s.def.json

@@ -1,17 +1,13 @@
 {
-    "name": "WEEDO TINA2S",
     "version": 2,
+    "name": "WEEDO TINA2S",
     "inherits": "weedo_base",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "WEEDO",
         "manufacturer": "WEEDO",
         "file_formats": "text/x-gcode",
-        "platform_offset": [
-            0,
-            0,
-            0
-        ],
         "exclude_materials": [
             "3D-Fuel_PLA_PRO_Black",
             "3D-Fuel_PLA_SnapSupport",
@@ -167,72 +163,39 @@
             "xyzprinting_tpu",
             "zyyx_pro_flex",
             "zyyx_pro_pla"
+        ],
+        "platform_offset": [
+            0,
+            0,
+            0
         ]
     },
-    "overrides": {
-        "machine_name": {
-            "default_value": "WEEDO TINA2S"
-        },
-        "machine_start_gcode": {
-            "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5"
-        },
-        "machine_end_gcode": {
-            "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000"
-        },
-        "machine_width": {
-            "default_value": 100
-        },
-        "machine_depth": {
-            "default_value": 110
-        },
-        "machine_height": {
-            "default_value": 100
-        },
-        "material_bed_temperature": {
-            "maximum_value_warning": "60",
-            "maximum_value": "65"
-        },
-        "speed_print": {
-            "value": 40.0
-        },
-        "speed_infill": {
-            "value": 40.0
-        },
-        "speed_wall": {
-            "value": 25.0
-        },
-        "speed_wall_0": {
-            "value": 20.0
-        },
-        "speed_wall_x": {
-            "value": 25.0
-        },
-        "speed_topbottom": {
-            "value": 30.0
-        },
-        "speed_support_infill": {
-            "value": 45.0
-        },
-        "speed_print_layer_0": {
-            "value": 22.0
-        },
-        "speed_travel_layer_0": {
-            "value": 60
-        },
-        "speed_travel": {
-            "value": 65.0
-        },
-        "speed_support_roof": {
-            "value": 30.0
-        },
-        "speed_support_bottom": {
-            "value": 30.0
-        },
-        "speed_roofing": {
-            "value": 25.0
-        },
-        "raft_base_thickness": {
-            "value": 0.35
-        }
+    "overrides":
+    {
+        "machine_depth": { "default_value": 110 },
+        "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" },
+        "machine_height": { "default_value": 100 },
+        "machine_name": { "default_value": "WEEDO TINA2S" },
+        "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" },
+        "machine_width": { "default_value": 100 },
+        "material_bed_temperature":
+        {
+            "maximum_value": "65",
+            "maximum_value_warning": "60"
+        },
+        "raft_base_thickness": { "value": 0.35 },
+        "speed_infill": { "value": 40.0 },
+        "speed_print": { "value": 40.0 },
+        "speed_print_layer_0": { "value": 22.0 },
+        "speed_roofing": { "value": 25.0 },
+        "speed_support_bottom": { "value": 30.0 },
+        "speed_support_infill": { "value": 45.0 },
+        "speed_support_roof": { "value": 30.0 },
+        "speed_topbottom": { "value": 30.0 },
+        "speed_travel": { "value": 65.0 },
+        "speed_travel_layer_0": { "value": 60 },
+        "speed_wall": { "value": 25.0 },
+        "speed_wall_0": { "value": 20.0 },
+        "speed_wall_x": { "value": 25.0 }
     }
 }

+ 28 - 67
resources/definitions/weedo_x40v3.def.json

@@ -1,13 +1,15 @@
 {
-    "name": "WEEDO X40 V3+",
     "version": 2,
+    "name": "WEEDO X40 V3+",
     "inherits": "weedo_base",
-    "metadata": {
+    "metadata":
+    {
         "visible": true,
         "author": "WEEDO",
         "manufacturer": "WEEDO",
         "file_formats": "text/x-gcode",
-        "machine_extruder_trains": {
+        "machine_extruder_trains":
+        {
             "0": "weedo_x40v3_extruder_left",
             "1": "weedo_x40v3_extruder_right"
         },
@@ -17,69 +19,28 @@
             0
         ]
     },
-    "overrides": {
-        "machine_name": {
-            "default_value": "WEEDO X40"
-        },
-        "machine_start_gcode": {
-            "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for  X40 ****)\nM203 Z15\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG28 ;This command will use tool0 to get the x endstop and setup coordinate system\nG29 ;Auto level\nM107 P0 ;Turn off fan\nM107 P1\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 X-47 F3000\nG1 Z20 F600\nT{initial_extruder_nr} S ;Set start extruder nr after G28\nM109 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG92 E0\nG1 E22 F300\nG92 E0\nM203 Z2"
-        },
-        "machine_end_gcode": {
-            "default_value": ";(*********end X40 End.gcode*******)\nM203 Z15\nM605 S1 ;Set to auto-park\nG28 X F3000\nG91 ; Relative positioning\nG1 E-1 ; Reduce filament pressure\nG90\nG1 Y300 F3000\nM104 S0 T0\nM104 S0 T1\nM140 S0\nM107 P0\nM107 P1\nM82"
-        },
-        "material_print_temp_prepend": {
-            "default_value": false
-        },
-        "machine_width": {
-            "default_value": 300
-        },
-        "machine_depth": {
-            "default_value": 300
-        },
-        "machine_height": {
-            "default_value": 400
-        },
-        "machine_always_write_active_tool": {
-            "default_value": true
-        },
-        "machine_extruder_count": {
-            "default_value": 2
-        },
-        "machine_nozzle_heat_up_speed": {
-            "default_value": 1.7
-        },
-        "material_standby_temperature": {
-            "value": "max(0, material_print_temperature - 20)"
-        },
-        "retraction_amount": {
-            "default_value": 4
-        },
-        "speed_print": {
-            "default_value": 60.0
-        },
-        "speed_wall": {
-            "value": "speed_print / 2"
-        },
-        "speed_topbottom": {
-            "value": "round(speed_print * 0.58, 1)"
-        },
-        "speed_support": {
-            "value": "round(speed_print * 0.96, 1)"
-        },
-        "switch_extruder_retraction_amount": {
-            "value": 0
-        },
-        "adhesion_type": {
-            "default_value": "brim"
-        },
-        "ooze_shield_enabled": {
-            "default_value": true
-        },
-        "ooze_shield_angle": {
-            "default_value": 0
-        },
-        "ooze_shield_dist": {
-            "default_value": 3.0
-        }
+    "overrides":
+    {
+        "adhesion_type": { "default_value": "brim" },
+        "machine_always_write_active_tool": { "default_value": true },
+        "machine_depth": { "default_value": 300 },
+        "machine_end_gcode": { "default_value": ";(*********end X40 End.gcode*******)\nM203 Z15\nM605 S1 ;Set to auto-park\nG28 X F3000\nG91 ; Relative positioning\nG1 E-1 ; Reduce filament pressure\nG90\nG1 Y300 F3000\nM104 S0 T0\nM104 S0 T1\nM140 S0\nM107 P0\nM107 P1\nM82" },
+        "machine_extruder_count": { "default_value": 2 },
+        "machine_height": { "default_value": 400 },
+        "machine_name": { "default_value": "WEEDO X40" },
+        "machine_nozzle_heat_up_speed": { "default_value": 1.7 },
+        "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for  X40 ****)\nM203 Z15\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG28 ;This command will use tool0 to get the x endstop and setup coordinate system\nG29 ;Auto level\nM107 P0 ;Turn off fan\nM107 P1\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 X-47 F3000\nG1 Z20 F600\nT{initial_extruder_nr} S ;Set start extruder nr after G28\nM109 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG92 E0\nG1 E22 F300\nG92 E0\nM203 Z2" },
+        "machine_width": { "default_value": 300 },
+        "material_print_temp_prepend": { "default_value": false },
+        "material_standby_temperature": { "value": "max(0, material_print_temperature - 20)" },
+        "ooze_shield_angle": { "default_value": 0 },
+        "ooze_shield_dist": { "default_value": 3.0 },
+        "ooze_shield_enabled": { "default_value": true },
+        "retraction_amount": { "default_value": 4 },
+        "speed_print": { "default_value": 60.0 },
+        "speed_support": { "value": "round(speed_print * 0.96, 1)" },
+        "speed_topbottom": { "value": "round(speed_print * 0.58, 1)" },
+        "speed_wall": { "value": "speed_print / 2" },
+        "switch_extruder_retraction_amount": { "value": 0 }
     }
 }