Browse Source

Add Builder Premium

Tabs became spaces
Buco 7 years ago
parent
commit
95f018530f

+ 34 - 34
resources/definitions/builder_premium_large.def.json

@@ -8,20 +8,20 @@
         "author": "Builder SZ",
         "manufacturer": "Builder",
         "category": "Other",
-		"quality_definition": "builder_premium_small",
+        "quality_definition": "builder_premium_small",
         "file_formats": "text/x-gcode",
         "platform": "builder_premium_platform.stl",
-		"platform_offset": [-126, -36, 117],
-	    "has_machine_quality": true,
-		"preferred_quality": "*normal*",
-		"machine_extruder_trains":
+        "platform_offset": [-126, -36, 117],
+        "has_machine_quality": true,
+        "preferred_quality": "*normal*",
+        "machine_extruder_trains":
         {
-            "0": "builder_premium_medium_rear",
-            "1": "builder_premium_medium_front"
+            "0": "builder_premium_large_rear",
+            "1": "builder_premium_large_front"
         }
     },
 	
-
+	
 	
     "overrides": {
         "machine_name": { "default_value": "Builder Premium Large" },
@@ -31,21 +31,21 @@
         "machine_depth": { "default_value": 205 },
         "material_diameter": { "default_value": 1.75 },
 
-		"infill_pattern": {"value": "'triangles'" },
-		"infill_before_walls": {"value": false },
+        "infill_pattern": {"value": "'triangles'" },
+        "infill_before_walls": {"value": false },
 
-		"material_print_temperature": {"value": 215 },
-		"default_material_print_temperature": { "default_value": 215 },
+        "material_print_temperature": {"value": 215 },
+        "default_material_print_temperature": { "default_value": 215 },
         "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
         "material_standby_temperature": { "value": "material_print_temperature" },
 		
-		"switch_extruder_retraction_speeds": {"default_value": 15 },
-		"switch_extruder_retraction_speed": {"default_value": 15 },
-		"switch_extruder_prime_speed": {"default_value": 15 },
-		"switch_extruder_retraction_amount": {"value": 1 },
+        "switch_extruder_retraction_speeds": {"default_value": 15 },
+        "switch_extruder_retraction_speed": {"default_value": 15 },
+        "switch_extruder_prime_speed": {"default_value": 15 },
+        "switch_extruder_retraction_amount": {"value": 1 },
 
-		"speed_travel": { "value": "100" },
-		"speed_layer_0": { "value": "20" },
+        "speed_travel": { "value": "100" },
+        "speed_layer_0": { "value": "20" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_print": { "value": "40" },
         "speed_support": { "value": "speed_wall_0" },
@@ -55,29 +55,29 @@
         "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" },
         "speed_wall_x": { "value": "speed_wall" },
 
-		"prime_tower_position_x": { "default_value": 175 },
+        "prime_tower_position_x": { "default_value": 175 },
         "prime_tower_position_y": { "default_value": 178 },
         "prime_tower_wipe_enabled": { "default_value": false },
-		"prime_tower_min_volume": { "default_value": 50 },
-		"dual_pre_wipe": { "default_value": false },
+        "prime_tower_min_volume": { "default_value": 50 },
+        "dual_pre_wipe": { "default_value": false },
 		
-		"prime_blob_enable": { "enabled": true },
+        "prime_blob_enable": { "enabled": true },
 		
-		"acceleration_enabled": { "value": "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" },
         "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_support_interface": { "value": "acceleration_topbottom" },
         "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
-		"acceleration_travel": { "value": "acceleration_print" },
+        "acceleration_travel": { "value": "acceleration_print" },
         "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
         "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" },
 		
-		"cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-		"cool_min_layer_time": { "default_value": 10 },
+        "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
+        "cool_min_layer_time": { "default_value": 10 },
 
-		"jerk_enabled": { "value": "True" },
+        "jerk_enabled": { "value": "True" },
         "jerk_layer_0": { "value": "jerk_topbottom" },
         "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" },
         "jerk_print": { "value": "25" },
@@ -87,22 +87,22 @@
         "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
         "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
 		
-		"wall_thickness": { "value": "1.2" },
+        "wall_thickness": { "value": "1.2" },
 		
-	    "retraction_amount": { "default_value": 3 },
+        "retraction_amount": { "default_value": 3 },
         "retraction_speed": { "default_value": 15 },
         "retraction_retract_speed": { "default_value": 15 },
         "retraction_prime_speed": { "default_value": 15 },
-		"travel_retract_before_outer_wall": { "default_value": true },
-		"skin_overlap": { "value": "15" },
+        "travel_retract_before_outer_wall": { "default_value": true },
+        "skin_overlap": { "value": "15" },
         "adhesion_type": { "default_value": "skirt" },
         "machine_nozzle_heat_up_speed": { "default_value": 2 },
         "machine_nozzle_cool_down_speed": { "default_value": 2 },
         "machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
         "gantry_height": { "default_value": 55 },
-		"machine_max_feedrate_x": { "default_value": 300 },
+        "machine_max_feedrate_x": { "default_value": 300 },
         "machine_max_feedrate_y": { "default_value": 300 },
-	    "machine_max_feedrate_z": { "default_value": 40 },
+        "machine_max_feedrate_z": { "default_value": 40 },
         "machine_max_acceleration_z": { "default_value": 500 },
         "machine_acceleration": { "default_value": 1000 },
         "machine_max_jerk_xy": { "default_value": 10 },
@@ -113,6 +113,6 @@
         "machine_end_gcode": {
             "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
         },
-		"machine_extruder_count": { "default_value": 2 }
+        "machine_extruder_count": { "default_value": 2 }
     }
 }

+ 32 - 32
resources/definitions/builder_premium_medium.def.json

@@ -8,20 +8,20 @@
         "author": "Builder SZ",
         "manufacturer": "Builder",
         "category": "Other",
-		"quality_definition": "builder_premium_small",
+        "quality_definition": "builder_premium_small",
         "file_formats": "text/x-gcode",
         "platform": "builder_premium_platform.stl",
-		"platform_offset": [-126, -36, 117],
-	    "has_machine_quality": true,
-		"preferred_quality": "*normal*",
-		"machine_extruder_trains":
+        "platform_offset": [-126, -36, 117],
+        "has_machine_quality": true,
+        "preferred_quality": "*normal*",
+        "machine_extruder_trains":
         {
             "0": "builder_premium_medium_rear",
             "1": "builder_premium_medium_front"
         }
     },
 	
-
+	
 	
     "overrides": {
         "machine_name": { "default_value": "Builder Premium Medium" },
@@ -31,21 +31,21 @@
         "machine_depth": { "default_value": 205 },
         "material_diameter": { "default_value": 1.75 },
 
-		"infill_pattern": {"value": "'triangles'" },
-		"infill_before_walls": {"value": false },
+        "infill_pattern": {"value": "'triangles'" },
+        "infill_before_walls": {"value": false },
 
-		"material_print_temperature": {"value": 215 },
-		"default_material_print_temperature": { "default_value": 215 },
+        "material_print_temperature": {"value": 215 },
+        "default_material_print_temperature": { "default_value": 215 },
         "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
         "material_standby_temperature": { "value": "material_print_temperature" },
 		
-		"switch_extruder_retraction_speeds": {"default_value": 15 },
-		"switch_extruder_retraction_speed": {"default_value": 15 },
-		"switch_extruder_prime_speed": {"default_value": 15 },
-		"switch_extruder_retraction_amount": {"value": 1 },
+        "switch_extruder_retraction_speeds": {"default_value": 15 },
+        "switch_extruder_retraction_speed": {"default_value": 15 },
+        "switch_extruder_prime_speed": {"default_value": 15 },
+        "switch_extruder_retraction_amount": {"value": 1 },
 
-		"speed_travel": { "value": "100" },
-		"speed_layer_0": { "value": "20" },
+        "speed_travel": { "value": "100" },
+        "speed_layer_0": { "value": "20" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_print": { "value": "40" },
         "speed_support": { "value": "speed_wall_0" },
@@ -55,29 +55,29 @@
         "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" },
         "speed_wall_x": { "value": "speed_wall" },
 
-		"prime_tower_position_x": { "default_value": 175 },
+        "prime_tower_position_x": { "default_value": 175 },
         "prime_tower_position_y": { "default_value": 178 },
         "prime_tower_wipe_enabled": { "default_value": false },
-		"prime_tower_min_volume": { "default_value": 50 },
-		"dual_pre_wipe": { "default_value": false },
+        "prime_tower_min_volume": { "default_value": 50 },
+        "dual_pre_wipe": { "default_value": false },
 		
-		"prime_blob_enable": { "enabled": true },
+        "prime_blob_enable": { "enabled": true },
 		
-		"acceleration_enabled": { "value": "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" },
         "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_support_interface": { "value": "acceleration_topbottom" },
         "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
-		"acceleration_travel": { "value": "acceleration_print" },
+        "acceleration_travel": { "value": "acceleration_print" },
         "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
         "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" },
 		
-		"cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-		"cool_min_layer_time": { "default_value": 10 },
+        "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
+        "cool_min_layer_time": { "default_value": 10 },
 
-		"jerk_enabled": { "value": "True" },
+        "jerk_enabled": { "value": "True" },
         "jerk_layer_0": { "value": "jerk_topbottom" },
         "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" },
         "jerk_print": { "value": "25" },
@@ -87,22 +87,22 @@
         "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
         "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
 		
-		"wall_thickness": { "value": "1.2" },
+        "wall_thickness": { "value": "1.2" },
 		
-	    "retraction_amount": { "default_value": 3 },
+        "retraction_amount": { "default_value": 3 },
         "retraction_speed": { "default_value": 15 },
         "retraction_retract_speed": { "default_value": 15 },
         "retraction_prime_speed": { "default_value": 15 },
-		"travel_retract_before_outer_wall": { "default_value": true },
-		"skin_overlap": { "value": "15" },
+        "travel_retract_before_outer_wall": { "default_value": true },
+        "skin_overlap": { "value": "15" },
         "adhesion_type": { "default_value": "skirt" },
         "machine_nozzle_heat_up_speed": { "default_value": 2 },
         "machine_nozzle_cool_down_speed": { "default_value": 2 },
         "machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
         "gantry_height": { "default_value": 55 },
-		"machine_max_feedrate_x": { "default_value": 300 },
+        "machine_max_feedrate_x": { "default_value": 300 },
         "machine_max_feedrate_y": { "default_value": 300 },
-	    "machine_max_feedrate_z": { "default_value": 40 },
+        "machine_max_feedrate_z": { "default_value": 40 },
         "machine_max_acceleration_z": { "default_value": 500 },
         "machine_acceleration": { "default_value": 1000 },
         "machine_max_jerk_xy": { "default_value": 10 },
@@ -113,6 +113,6 @@
         "machine_end_gcode": {
             "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
         },
-		"machine_extruder_count": { "default_value": 2 }
+        "machine_extruder_count": { "default_value": 2 }
     }
 }

+ 31 - 31
resources/definitions/builder_premium_small.def.json

@@ -10,17 +10,17 @@
         "category": "Other",
         "file_formats": "text/x-gcode",
         "platform": "builder_premium_platform.stl",
-		"platform_offset": [-126, -36, 117],
-	    "has_machine_quality": true,
-		"preferred_quality": "*normal*",
-		"machine_extruder_trains":
+        "platform_offset": [-126, -36, 117],
+        "has_machine_quality": true,
+        "preferred_quality": "*normal*",
+        "machine_extruder_trains":
         {
             "0": "builder_premium_small_rear",
             "1": "builder_premium_small_front"
         }
     },
 	
-
+	
 	
     "overrides": {
         "machine_name": { "default_value": "Builder Premium Small" },
@@ -30,21 +30,21 @@
         "machine_depth": { "default_value": 205 },
         "material_diameter": { "default_value": 1.75 },
 
-		"infill_pattern": {"value": "'triangles'" },
-		"infill_before_walls": {"value": false },
+        "infill_pattern": {"value": "'triangles'" },
+        "infill_before_walls": {"value": false },
 
-		"material_print_temperature": {"value": 215 },
-		"default_material_print_temperature": { "default_value": 215 },
+        "material_print_temperature": {"value": 215 },
+        "default_material_print_temperature": { "default_value": 215 },
         "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
         "material_standby_temperature": { "value": "material_print_temperature" },
 		
-		"switch_extruder_retraction_speeds": {"default_value": 15 },
-		"switch_extruder_retraction_speed": {"default_value": 15 },
-		"switch_extruder_prime_speed": {"default_value": 15 },
-		"switch_extruder_retraction_amount": {"value": 1 },
+        "switch_extruder_retraction_speeds": {"default_value": 15 },
+        "switch_extruder_retraction_speed": {"default_value": 15 },
+        "switch_extruder_prime_speed": {"default_value": 15 },
+        "switch_extruder_retraction_amount": {"value": 1 },
 
-		"speed_travel": { "value": "100" },
-		"speed_layer_0": { "value": "20" },
+        "speed_travel": { "value": "100" },
+        "speed_layer_0": { "value": "20" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_print": { "value": "40" },
         "speed_support": { "value": "speed_wall_0" },
@@ -54,29 +54,29 @@
         "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" },
         "speed_wall_x": { "value": "speed_wall" },
 
-		"prime_tower_position_x": { "default_value": 175 },
+        "prime_tower_position_x": { "default_value": 175 },
         "prime_tower_position_y": { "default_value": 178 },
         "prime_tower_wipe_enabled": { "default_value": false },
-		"prime_tower_min_volume": { "default_value": 50 },
-		"dual_pre_wipe": { "default_value": false },
+        "prime_tower_min_volume": { "default_value": 50 },
+        "dual_pre_wipe": { "default_value": false },
 		
-		"prime_blob_enable": { "enabled": true },
+        "prime_blob_enable": { "enabled": true },
 		
-		"acceleration_enabled": { "value": "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" },
         "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_support_interface": { "value": "acceleration_topbottom" },
         "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
-		"acceleration_travel": { "value": "acceleration_print" },
+        "acceleration_travel": { "value": "acceleration_print" },
         "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 3000)" },
         "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" },
 		
-		"cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-		"cool_min_layer_time": { "default_value": 10 },
+        "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
+        "cool_min_layer_time": { "default_value": 10 },
 
-		"jerk_enabled": { "value": "True" },
+        "jerk_enabled": { "value": "True" },
         "jerk_layer_0": { "value": "jerk_topbottom" },
         "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" },
         "jerk_print": { "value": "25" },
@@ -86,22 +86,22 @@
         "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
         "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
 		
-		"wall_thickness": { "value": "1.2" },
+        "wall_thickness": { "value": "1.2" },
 		
-	    "retraction_amount": { "default_value": 3 },
+        "retraction_amount": { "default_value": 3 },
         "retraction_speed": { "default_value": 15 },
         "retraction_retract_speed": { "default_value": 15 },
         "retraction_prime_speed": { "default_value": 15 },
-		"travel_retract_before_outer_wall": { "default_value": true },
-		"skin_overlap": { "value": "15" },
+        "travel_retract_before_outer_wall": { "default_value": true },
+        "skin_overlap": { "value": "15" },
         "adhesion_type": { "default_value": "skirt" },
         "machine_nozzle_heat_up_speed": { "default_value": 2 },
         "machine_nozzle_cool_down_speed": { "default_value": 2 },
         "machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
         "gantry_height": { "default_value": 55 },
-		"machine_max_feedrate_x": { "default_value": 300 },
+        "machine_max_feedrate_x": { "default_value": 300 },
         "machine_max_feedrate_y": { "default_value": 300 },
-	    "machine_max_feedrate_z": { "default_value": 40 },
+        "machine_max_feedrate_z": { "default_value": 40 },
         "machine_max_acceleration_z": { "default_value": 500 },
         "machine_acceleration": { "default_value": 1000 },
         "machine_max_jerk_xy": { "default_value": 10 },
@@ -112,6 +112,6 @@
         "machine_end_gcode": {
             "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning"
         },
-		"machine_extruder_count": { "default_value": 2 }
+        "machine_extruder_count": { "default_value": 2 }
     }
 }