Update settings and JSON format.

Use 4 spaces instead of 2 for indentation, remove the redundant settings, and add spacing to the formulas.

resources/definitions/weedo_base.def.json

@@ -175,7 +175,7 @@
             "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0"
         },
         "machine_end_gcode": {
-      "default_value": "G92 E0\nG1 E-10 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"
+            "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
@@ -189,9 +189,6 @@
         "machine_heated_bed": {
             "default_value": true
         },
-    "machine_center_is_zero": {
-      "default_value": false
-    },
         "machine_nozzle_tip_outer_diameter": {
             "default_value": 0.8
         },
@@ -223,13 +220,13 @@
             "default_value": 3000
         },
         "machine_max_acceleration_z": {
-      "default_value": 100
+            "default_value": 120
         },
         "machine_max_acceleration_e": {
-      "default_value": 200
+            "default_value": 1600
         },
         "machine_acceleration": {
-      "default_value": 4000
+            "default_value": 3000
         },
         "machine_max_jerk_xy": {
             "default_value": 10.0
@@ -238,10 +235,10 @@
             "default_value": 5
         },
         "machine_max_jerk_e": {
-      "default_value": 5.0
+            "default_value": 5.1
         },
         "infill_line_width": {
-      "value": "line_width*1.25"
+            "value": "line_width * 1.25"
         },
         "initial_layer_line_width_factor": {
             "default_value": 110.0
@@ -268,7 +265,7 @@
             "maximum_value": "300"
         },
         "material_print_temperature_layer_0": {
-      "value": "min(material_print_temperature+10,300)"
+            "value": "min(material_print_temperature + 10, 300)"
         },
         "material_initial_print_temperature": {
             "value": "material_print_temperature"
@@ -286,37 +283,31 @@
             "default_value": 95.0
         },
         "infill_material_flow": {
-      "value": "max(0,material_flow-5)"
+            "value": "max(0, material_flow - 5)"
         },
         "support_material_flow": {
-      "value": "max(0,material_flow-5)"
+            "value": "max(0, material_flow - 5)"
         },
         "speed_print": {
             "default_value": 70.0
         },
-    "speed_infill": {
-      "default_value": 70.0
-    },
         "speed_wall": {
-      "value": "max(5,round(speed_print / 2-5,1))"
+            "value": "max(5, round(speed_print / 2 - 5, 1))"
         },
         "speed_wall_0": {
-      "value": "max(5,speed_wall-5)"
+            "value": "max(5, speed_wall - 5)"
         },
         "speed_wall_x": {
             "value": "speed_wall"
         },
         "speed_topbottom": {
-      "value": "round(speed_print * 0.65,1)"
+            "value": "round(speed_print * 0.65, 1)"
         },
         "speed_support": {
-      "value": "round(speed_print*0.82,1)"
+            "value": "round(speed_print * 0.82, 1)"
-    },
-    "speed_support_infill": {
-      "value": "speed_support"
         },
         "speed_support_interface": {
-      "value": "round(speed_support*0.689,1)"
+            "value": "round(speed_support * 0.689, 1)"
         },
         "speed_prime_tower": {
             "value": "speed_support"
@@ -327,9 +318,6 @@
         "speed_layer_0": {
             "value": 26.0
         },
-    "speed_print_layer_0": {
-      "value": 26.0
-    },
         "speed_travel_layer_0": {
             "value": 80.0
         },
@@ -366,14 +354,11 @@
         "support_angle": {
             "default_value": 60.0
         },
-    "support_pattern": {
-      "default_value": "zigzag"
-    },
         "support_connect_zigzags": {
             "default_value": false
         },
         "support_z_distance": {
-      "default_value": 0.2
+            "default_value": 0.18
         },
         "support_interface_enable": {
             "default_value": true

resources/definitions/weedo_hephi3s.def.json

@@ -39,10 +39,10 @@
             "value": "speed_print / 2"
         },
         "speed_topbottom": {
-      "value": "round(speed_print * 0.58,1)"
+            "value": "round(speed_print * 0.58, 1)"
         },
         "speed_support": {
-      "value": "round(speed_print*0.96,1)"
+            "value": "round(speed_print * 0.96, 1)"
         }
     }
 }

resources/definitions/weedo_me40.def.json

@@ -39,10 +39,10 @@
             "value": "speed_print / 2"
         },
         "speed_topbottom": {
-      "value": "round(speed_print * 0.58,1)"
+            "value": "round(speed_print * 0.58, 1)"
         },
         "speed_support": {
-      "value": "round(speed_print*0.96,1)"
+            "value": "round(speed_print * 0.96, 1)"
         }
     }
 }

resources/definitions/weedo_me40_lite.def.json

@@ -43,10 +43,10 @@
             "value": "speed_print / 2"
         },
         "speed_topbottom": {
-      "value": "round(speed_print * 0.58,1)"
+            "value": "round(speed_print * 0.58, 1)"
         },
         "speed_support": {
-      "value": "round(speed_print*0.96,1)"
+            "value": "round(speed_print * 0.96, 1)"
         }
     }
 }

resources/definitions/weedo_tina2.def.json

@@ -230,7 +230,7 @@
             "value": 30.0
         },
         "speed_support_bottom": {
-      "dvalue": 30.0
+            "value": 30.0
         },
         "speed_roofing": {
             "value": 25.0

resources/definitions/weedo_tina2s.def.json

@@ -226,7 +226,7 @@
             "value": 30.0
         },
         "speed_support_bottom": {
-      "dvalue": 30.0
+            "value": 30.0
         },
         "speed_roofing": {
             "value": 25.0

resources/definitions/weedo_x40v3.def.json

@@ -19,7 +19,7 @@
     },
     "overrides": {
         "machine_name": {
-      "default_value": "WEEDO X40 V3"
+            "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"
@@ -52,7 +52,7 @@
             "default_value": 1.7
         },
         "material_standby_temperature": {
-      "value": "material_print_temperature-20"
+            "value": "max(0, material_print_temperature - 20)"
         },
         "retraction_amount": {
             "default_value": 4
@@ -64,10 +64,10 @@
             "value": "speed_print / 2"
         },
         "speed_topbottom": {
-      "value": "round(speed_print * 0.58,1)"
+            "value": "round(speed_print * 0.58, 1)"
         },
         "speed_support": {
-      "value": "round(speed_print*0.96,1)"
+            "value": "round(speed_print * 0.96, 1)"
         },
         "switch_extruder_retraction_amount": {
             "value": 0