From b3681eacf21dc2aeb4223eea5930d9717ce11ea4 Mon Sep 17 00:00:00 2001
From: jeffkyjin <jeffkyjin@magicfirm.com>
Date: Wed, 5 Feb 2020 17:33:54 +0800
Subject: [PATCH] modify grid 4 def

---
 resources/definitions/mbot3d_grid4.def.json   | 265 +-----------------
 .../definitions/mbot3d_grid4_dual.def.json    | 199 +------------
 2 files changed, 13 insertions(+), 451 deletions(-)

diff --git a/resources/definitions/mbot3d_grid4.def.json b/resources/definitions/mbot3d_grid4.def.json
index 0275615e15..a895415dda 100644
--- a/resources/definitions/mbot3d_grid4.def.json
+++ b/resources/definitions/mbot3d_grid4.def.json
@@ -30,7 +30,7 @@
             "default_value": 210
         },
         "machine_height": {
-            "default_value": 200
+            "default_value": 190
         },
         "machine_heated_bed": {
             "default_value": true
@@ -41,273 +41,12 @@
         "machine_gcode_flavor": {
             "default_value": "RepRap (Marlin/Sprinter)"
         },
-        "machine_extruder_count": {
-            "default_value": 1
-        },
-        "material_diameter": {
-            "default_value": 1.75
-        },
         "material_flow": {
             "default_value": 100
         },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
-        "material_print_temperature": {
-            "default_value": 200
-        },
-        "material_print_temperature_layer_0": {
-            "default_value": 210
-        }, 
-        "material_print_temp_wait":{
-            "default_value": true
-        },
-        "material_bed_temperature": {
-            "default_value": 50
-        },
-        "material_bed_temperature_layer_0": {
-            "default_value": 50
-        },
-        "material_bed_temp_wait":{
-            "default_value": false
-        },
-        "layer_height": {
-            "default_value": 0.2
-        },       
-        "layer_height_0": {
-            "default_value": 0.3
-        },
-        "initial_layer_line_width_factor":{
-            "default_value": 150
-        },
-	    "adhesion_type":{
+        "adhesion_type": {
             "default_value": "skirt"
-        },
-        "brim_line_count":{
-            "default_value": 3
-        },
-        "wall_line_count":{
-            "default_value": 2
-        },  
-        "infill_pattern": {
-            "default_value": "lines"
-        },	
-        "infill_line_distance": {
-            "default_value": 2.66
-        },               
-        "infill_before_walls": {
-            "default_value": false
-        },      
-        "top_layers":{
-            "default_value": 5
-        },
-		"roofing_layer_count":{
-            "default_value": 0
         },        
-        "bottom_layers":{
-            "default_value": 4
-        },
-	    "raft_margin": {
-            "default_value": 5.0
-        },
-	    "raft_airgap":{
-            "default_value": 0.2
-        },
-        "raft_base_line_spacing": {
-            "default_value": 3.0
-        },
-        "raft_base_line_width": {
-            "default_value": 2.0
-        },
-        "raft_base_thickness": {
-            "default_value": 0.3
-        },
-        "raft_interface_line_spacing": {
-            "default_value": 3.0
-        },
-        "raft_interface_thickness": {
-            "default_value": 0.27
-        },
-        "raft_surface_layers": {
-            "default_value": 2
-        },
-        "raft_surface_line_spacing": {
-            "default_value": 0.4
-        },
-        "raft_surface_thickness": {
-            "default_value": 0.2
-        },
-        "cool_fan_enabled": {
-            "default_value": true
-        },
-        "cool_fan_speed_min": {
-            "default_value": 40
-        },
-        "cool_fan_speed_max": {
-            "default_value": 80
-        },       
-        "cool_min_layer_time_fan_speed_max": {
-            "default_value": 20
-        },     
-        "cool_fan_full_layer": {
-            "default_value": 5
-        },
-        "cool_min_layer_time": {
-            "default_value": 5
-        },
-        "cool_min_speed": {
-            "default_value": 5
-        },
-        "machine_max_feedrate_x": {
-            "default_value": 300
-        },
-        "machine_max_feedrate_y": {
-            "default_value": 300
-        },
-        "machine_max_feedrate_z": {
-            "default_value": 40
-        },
-        "machine_max_feedrate_e": {
-            "default_value": 60
-        },
-        "speed_infill":{
-            "default_value": 80
-        },
-        "speed_print_layer_0": {
-            "default_value": 15
-        },
-        "speed_travel_layer_0": {
-            "default_value": 60
-        }, 
-        "skirt_brim_speed": {
-            "default_value": 20
-        },
-        "speed_travel": {
-            "default_value": 120
-        },
-        "speed_support_infill": {
-            "default_value": 60
-        },
-        "speed_support_roof": {
-            "default_value": 45
-        },
-        "speed_support_bottom": {
-            "default_value": 45
-        },
-        "speed_topbottom": {
-            "default_value":60
-        },
-        "speed_wall_0": {
-            "default_value": 20
-        },
-        "speed_wall_x": {
-            "default_value": 50
-        },
-        "raft_base_speed":{
-            "default_value": 15
-        },
-	    "raft_interface_speed":{
-            "default_value": 60
-        },
-	    "raft_surface_speed":{
-            "default_value": 45
-        },
-        "jerk_enabled": { 
-            "default_value": true
-        },
-        "jerk_infill":{
-            "default_value": 25
-        },
-        "jerk_print_layer_0": { 
-            "default_value": 5 
-        },
-        "jerk_travel_layer_0": { 
-            "default_value": 5
-        },
-        "jerk_wall_x": { 
-            "default_value": 10
-        },
-        "jerk_wall_0": { 
-            "default_value": 5
-        },
-        "jerk_topbottom": { 
-            "default_value": 10
-        },
-        "jerk_support_infill": { 
-            "default_value": 15 
-        },
-        "jerk_support_roof": {
-         "default_value": 5 
-        },  
-        "jerk_support_bottom": {
-         "default_value": 5 
-        },
-        "retraction_enable": { 
-        	  "default_value": true 
-        },
-        "retraction_retract_speed": { 
-        	  "default_value": 60
-        },
-        "retraction_prime_speed": { 
-        	  "default_value": 60
-        },   
-        "retraction_amount": { 
-        	  "default_value": 2 
-        },
-		"retraction_extra_prime_amount": { 
-        	  "default_value": 0
-        },
-        "retraction_hop_enabled": {
-            "default_value": true
-        },
-        "retraction_hop": { 
-        	  "default_value": 0.5
-        },
-        "retraction_min_travel": {
-            "default_value": 2
-        },
-        "support_enable": {
-            "default_value": false
-        },
-        "support_angle": {
-            "default_value": 60
-        },
-        "support_pattern": {
-            "default_value": "zigzag"
-        },
-        "support_line_distance":{
-            "default_value": 2.66
-        },
-        "support_roof_enable": {
-            "default_value": true
-        },
-        "support_bottom_enable": {
-            "default_value": true
-        },
-        "support_roof_height": {
-            "default_value": 0.6
-        },
-        "support_bottom_height": {
-            "default_value": 0.6
-        },
-        "support_top_distance": {
-            "default_value": 0.2
-        },
-        "support_bottom_distance": {
-            "default_value": 0.2
-        },
-        "z_seam_type": {
-            "default_value": "shortest"
-        },
-	    "z_seam_corner":{
-            "default_value": "z_seam_corner_inner"
-        },
-        "wall_0_wipe_dist":{
-            "default_value": 0
-        },       
-        "xy_offset": {
-             "default_value": 0.05
-        },
         "machine_start_gcode": {
             "default_value": ";---------- START GCODE ----------\nG21 ; set units to millimeters\nG28 ; home all axes\nG29 ;Autolevel bed\nG1 Z10 F400\nG1 X145 Z10 F2400\nG92 E0\nG1 X145 Z0.5 F400\nG1 X120 Z0.5 E20 F360\nG92 E0.0\n;----------END START GCODE ----------\n"
         },
diff --git a/resources/definitions/mbot3d_grid4_dual.def.json b/resources/definitions/mbot3d_grid4_dual.def.json
index 52afdd6347..d32590ff3e 100644
--- a/resources/definitions/mbot3d_grid4_dual.def.json
+++ b/resources/definitions/mbot3d_grid4_dual.def.json
@@ -30,208 +30,31 @@
             "default_value": 210
         },
         "machine_height": {
-            "default_value": 200
+            "default_value": 190
         },
         "machine_heated_bed": {
             "default_value": true
         },
+        "machine_center_is_zero": {
+            "default_value": false
+        },        
         "machine_gcode_flavor": {
             "default_value": "RepRap (Marlin/Sprinter)"
         },
         "machine_extruder_count": {
             "default_value": 2
         },
-        "material_diameter": {
-            "default_value": 1.75
-        },
         "material_flow": {
-            "default_value": 95
-        },
-        "machine_nozzle_size": {
-            "default_value": 0.4
-        },
-        "machine_max_feedrate_x": {
-            "default_value": 300
-        },
-        "machine_max_feedrate_y": {
-            "default_value": 300
-        },
-        "machine_max_feedrate_z": {
-            "default_value": 40
-        },
-        "machine_max_feedrate_e": {
-            "default_value": 60
-        },
-        "layer_height": {
-            "default_value": 0.2
-        },       
-        "layer_height_0": {
-            "default_value": 0.25
-        },
-	    "brim_line_count":{
-	       "default_value": 3
-		},
-	    "adhesion_type":{
-            "default_value": "skirt"
-        },		
-		"wall_line_count":{
-		   "default_value": 3
-		},   
-        "cool_fan_enabled": {
-            "default_value": true
-        },
-        "cool_fan_speed_min": {
-            "default_value": 50
-        },
-        "cool_fan_speed_max": {
-            "default_value": 80
-        },           
-        "cool_fan_full_layer": {
-            "default_value": 5
-        },
-        "cool_min_speed": {
-            "default_value": 5
-        },
-        "infill_line_distance": {
-            "default_value": 2
-        },        
-        "infill_pattern": {
-            "default_value": "lines"
-        }, 
-        "top_layers":{
-            "default_value": 4
-        },
-        "bottom_layers":{
-            "default_value": 3
-        },
-        "material_print_temperature": {
-            "default_value": 200
-        },
-        "material_print_temperature_layer_0": {
-            "default_value": 210
-        },
-        "material_print_temp_wait":{
-            "default_value": true
-        },		
-        "material_bed_temperature": {
-            "default_value": 45
-        },
-        "material_bed_temperature_layer_0": {
-            "default_value": 45
-        }, 
-        "material_bed_temp_wait":{
-            "default_value": false
-        },		
-        "retraction_enable": { 
-        	  "default_value": true 
-        },
-        "retraction_retract_speed": { 
-        	  "default_value": 45
-        },
-        "retraction_prime_speed": { 
-        	  "default_value": 45
-        },   
-        "retraction_amount": { 
-        	  "default_value": 5 
-        },
-        "retraction_hop_enabled": {
-            "default_value": true
-        },
-        "retraction_hop": { 
-        	  "default_value": 0.4
-        },
-        "speed_infill":{
-            "default_value": 60
-        },
-        "speed_print_layer_0": {
-        	  "default_value": 10
-        },
-        "skirt_brim_speed": {
-            "default_value": 15
-        },		
-        "speed_travel": {
             "default_value": 100
         },
-        "speed_support_infill": {
-            "default_value": 60
-        },
-        "speed_support_roof": {
-            "default_value": 25
-        },
-        "speed_support_bottom": {
-            "default_value": 45
-        },
-        "support_line_distance": {
-            "default_value": 2.66
-        },
-        "speed_topbottom": {
-            "default_value":25
-        },
-        "speed_wall_0": {
-            "default_value": 15
-        },
-        "speed_wall_x": {
-            "default_value": 30
-        },		
-        "support_enable": {
-            "default_value": true
-        },
-		"support_infill_extruder_nr":{
-            "default_value": 1
-        },
-		"support_extruder_nr_layer_0":{
-            "default_value": 1
-        },
-		"support_roof_extruder_nr":{
-            "default_value": 1
-        },
-		"support_bottom_extruder_nr":{
-            "default_value": 1
-        },	
-        "support_angle": {
-            "default_value": 60
-        },
-        "support_pattern": {
-            "default_value": "zigzag"
-        },
-        "support_roof_enable": {
-            "default_value": true
-        },
-        "support_bottom_enable": {
-            "default_value": true
-        },
-        "support_roof_height": {
-            "default_value": 0.6
-        },
-        "support_bottom_height": {
-            "default_value": 0.6
-        },
-        "support_top_distance": {
-            "default_value": 0.1
-        },
-        "support_bottom_distance": {
-            "default_value": 0.1
-        },
-        "z_seam_type": {
-            "default_value": "back"
-        },
-        "wall_0_wipe_dist":{
-            "default_value": 0
-        },       
-        "z_seam_x":{
-            "default_value": 0
-        },
-        "z_seam_y":{
-            "default_value": 210
-        },
-        "xy_offset": {
-            "default_value": 0.05
-       },
-       "machine_start_gcode": {
+        "adhesion_type": {
+            "default_value": "skirt"
+        },     
+        "machine_start_gcode": {
            "default_value": ";---------- START GCODE ----------\nG21 ; set units to millimeters\nG28 ; home all axes\nG29 ;Autolevel bed\nG1 Z10 F400\nG1 X145 Z10 F2400\nG92 E0\nG1 X145 Z0.5 F400\nG1 X120 Z0.5 E20 F360\nG92 E0.0\n;----------END START GCODE ----------\n"
-       },
-       "machine_end_gcode": {
+        },
+        "machine_end_gcode": {
            "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 Z190 F900\nG28 X Y  ;home X Y axes\nM84 ; disable motors"
-       }
+        }
     }
 }
\ No newline at end of file