Merge branch 'master' of https://github.com/eMotion-Tech/Cura into eMotion-Tech-master

resources/definitions/strateo3d.def.json

@@ -30,13 +30,14 @@
             "machine_depth": { "default_value": 420 },
             "machine_height": { "default_value": 495 },
             "machine_heated_bed": { "default_value": true },
+            "machine_heated_build_volume": { "default_value": true },
             "machine_center_is_zero": { "default_value": false },
             "machine_head_with_fans_polygon": { "default_value": [ [ -76, -51.8 ] , [ 25, -51.8 ] , [ 25, 38.2 ] , [ -76, 38.2 ] ] },
             "gantry_height": { "value": "40" },
             "machine_extruder_count": { "default_value": 2 },
             "machine_gcode_flavor": { "default_value": "Marlin" },
             "machine_start_gcode": { "default_value": "G28 \nG90 G1 X300 Y210 Z15 F6000 \nG92 E0" },
-            "machine_end_gcode": { "default_value": "T1 \nM104 S0 \nT0 \nM104 S0 \nM140 S0 \nM141 S0 \nG91 \nG0 E-1 F1500 \nG0 z1 \nG90 \nG28 \nM801.2 \nM801.0 \nM84" },
+            "machine_end_gcode": { "default_value": "T1 \nM104 S0 \nT0 \nM104 S0 \nM140 S0 \nM141 S0 \nG91 \nG0 z1 \nG90 \nG28 \nM801.0 \nM84 \nM192" },
             "extruder_prime_pos_y": {"minimum_value": "0", "maximum_value": "machine_depth"},
             "extruder_prime_pos_x": {"minimum_value": "0", "maximum_value": "machine_width"},
             "machine_heat_zone_length": { "default_value": 7 },
@@ -46,17 +47,17 @@
             "material_bed_temperature": { "maximum_value": "130" },
             "material_bed_temperature_layer_0": { "maximum_value": "130" },
             "extruder_prime_pos_abs": { "default_value": true },
-            "machine_acceleration": { "default_value": 2000 },
+            "machine_acceleration": { "default_value": 1500 },
 
             "acceleration_enabled": { "value": false },
-            "acceleration_layer_0": { "value": "acceleration_topbottom" },
-            "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 1000 / 2000)" },
-            "acceleration_print": { "value": "2000" },
+            "acceleration_print": { "value": "machine_acceleration" },
+            "acceleration_wall": { "value": "math.ceil(acceleration_print * 1250 / acceleration_print)" },
+            "acceleration_wall_0": { "value": "math.ceil(acceleration_print * 1000 / acceleration_print)" },
+            "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1250 / acceleration_print)" },
             "acceleration_support": { "value": "acceleration_print" },
             "acceleration_support_interface": { "value": "acceleration_topbottom" },
-            "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 2000)" },
-            "acceleration_wall": { "value": "math.ceil(acceleration_print * 1500 / 2000)" },
-            "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1500)" },
+            "acceleration_travel": { "value": "acceleration_print" },
+            "acceleration_layer_0": { "value": "acceleration_topbottom" },
             "adaptive_layer_height_variation": { "default_value": 0.1 },
             "adaptive_layer_height_variation_step": { "default_value": 0.05 },
             "adhesion_type": { "default_value": "skirt" },

resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_A.inst.cfg

@@ -8,21 +8,20 @@ setting_version = 10
 type = quality
 quality_type = a
 weight = 1
-material = generic_abs
+material = emotiontech_abs
 variant = Standard 0.4
 
 [values]
 layer_height_0 = =round(0.5*machine_nozzle_size, 2)
-line_width = =machine_nozzle_size/machine_nozzle_size*0.35
+line_width = =machine_nozzle_size/machine_nozzle_size*0.4
+wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3
-infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.5
-support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
 wall_0_wipe_dist = =machine_nozzle_size/2
-speed_print = 55
-speed_wall = =math.ceil(speed_print * 40/55)
-speed_wall_0 = =math.ceil(speed_wall * 30/40)
-speed_topbottom = =math.ceil(speed_print * 35/55)
-speed_layer_0 = =math.ceil(speed_print * 20/55)
+speed_print = 50
+speed_wall = =math.ceil(speed_print * 35/50)
+speed_wall_0 = =math.ceil(speed_wall * 30/35)
+speed_topbottom = =math.ceil(speed_print * 35/50)
+speed_layer_0 = =math.ceil(speed_print * 20/50)
 speed_slowdown_layers = 2
 cool_fan_enabled = True
 cool_fan_speed = 35

resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_B.inst.cfg

@@ -8,21 +8,20 @@ setting_version = 10
 type = quality
 quality_type = b
 weight = 0
-material = generic_abs
+material = emotiontech_abs
 variant = Standard 0.4
 
 [values]
 layer_height_0 = =round(0.67*machine_nozzle_size, 2)
-line_width = =machine_nozzle_size/machine_nozzle_size*0.35
+line_width = =machine_nozzle_size/machine_nozzle_size*0.4
+wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3
-infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.5
-support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
 wall_0_wipe_dist = =machine_nozzle_size/2
-speed_print = 60
-speed_wall = =math.ceil(speed_print * 43/60)
-speed_wall_0 = =math.ceil(speed_wall * 33/43)
-speed_topbottom = =math.ceil(speed_print * 37/60)
-speed_layer_0 = =math.ceil(speed_print * 25/60)
+speed_print = 55
+speed_wall = =math.ceil(speed_print * 37/55)
+speed_wall_0 = =math.ceil(speed_wall * 33/37)
+speed_topbottom = =math.ceil(speed_print * 37/55)
+speed_layer_0 = =math.ceil(speed_print * 25/55)
 speed_slowdown_layers = 2
 cool_fan_enabled = True
 cool_fan_speed = 35

resources/quality/strateo3d/Standard_0.4/s3d_std0.4_ABS_C.inst.cfg

@@ -8,21 +8,20 @@ setting_version = 10
 type = quality
 quality_type = c
 weight = -1
-material = generic_abs
+material = emotiontech_abs
 variant = Standard 0.4
 
 [values]
 layer_height_0 = =round(0.75*machine_nozzle_size, 2)
-line_width = =machine_nozzle_size/machine_nozzle_size*0.35
+line_width = =machine_nozzle_size/machine_nozzle_size*0.4
+wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3
-infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.5
-support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
 wall_0_wipe_dist = =machine_nozzle_size/2
-speed_print = 65
-speed_wall = =math.ceil(speed_print * 45/65)
-speed_wall_0 = =math.ceil(speed_wall * 35/45)
-speed_topbottom = =math.ceil(speed_print * 40/65)
-speed_layer_0 = =math.ceil(speed_print * 30/65)
+speed_print = 60
+speed_wall = =math.ceil(speed_print * 40/60)
+speed_wall_0 = =math.ceil(speed_wall * 35/40)
+speed_topbottom = =math.ceil(speed_print * 40/60)
+speed_layer_0 = =math.ceil(speed_print * 30/60)
 speed_slowdown_layers = 2
 cool_fan_enabled = True
 cool_fan_speed = 35

resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_A.inst.cfg

@@ -8,21 +8,20 @@ setting_version = 10
 type = quality
 quality_type = a
 weight = 1
-material = generic_petg
+material = emotiontech_petg
 variant = Standard 0.4
 
 [values]
 layer_height_0 = =round(0.5*machine_nozzle_size, 2)
-line_width = =machine_nozzle_size/machine_nozzle_size*0.35
+line_width = =machine_nozzle_size/machine_nozzle_size*0.4
+wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3
-infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4
-support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
 wall_0_wipe_dist = =machine_nozzle_size/2
-speed_print = 55
-speed_wall = =math.ceil(speed_print * 40/55)
-speed_wall_0 = =math.ceil(speed_wall * 25/40)
-speed_topbottom = =math.ceil(speed_print * 35/55)
-speed_layer_0 = =math.ceil(speed_print * 20/55)
+speed_print = 50
+speed_wall = =math.ceil(speed_print * 35/50)
+speed_wall_0 = =math.ceil(speed_wall * 30/35)
+speed_topbottom = =math.ceil(speed_print * 35/50)
+speed_layer_0 = =math.ceil(speed_print * 20/50)
 speed_slowdown_layers = 2
 cool_fan_enabled = True
 cool_fan_speed = 50

resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_B.inst.cfg

@@ -8,21 +8,20 @@ setting_version = 10
 type = quality
 quality_type = b
 weight = 0
-material = generic_petg
+material = emotiontech_petg
 variant = Standard 0.4
 
 [values]
 layer_height_0 = =round(0.67*machine_nozzle_size, 2)
-line_width = =machine_nozzle_size/machine_nozzle_size*0.35
+line_width = =machine_nozzle_size/machine_nozzle_size*0.4
+wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3
-infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4
-support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
 wall_0_wipe_dist = =machine_nozzle_size/2
-speed_print = 60
-speed_wall = =math.ceil(speed_print * 43/60)
-speed_wall_0 = =math.ceil(speed_wall * 27/43)
-speed_topbottom = =math.ceil(speed_print * 37/60)
-speed_layer_0 = =math.ceil(speed_print * 25/60)
+speed_print = 55
+speed_wall = =math.ceil(speed_print * 37/55)
+speed_wall_0 = =math.ceil(speed_wall * 33/37)
+speed_topbottom = =math.ceil(speed_print * 37/55)
+speed_layer_0 = =math.ceil(speed_print * 25/55)
 speed_slowdown_layers = 2
 cool_fan_enabled = True
 cool_fan_speed = 50

resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PETG_C.inst.cfg

@@ -8,21 +8,20 @@ setting_version = 10
 type = quality
 quality_type = c
 weight = -1
-material = generic_petg
+material = emotiontech_petg
 variant = Standard 0.4
 
 [values]
 layer_height_0 = =round(0.75*machine_nozzle_size, 2)
-line_width = =machine_nozzle_size/machine_nozzle_size*0.35
+line_width = =machine_nozzle_size/machine_nozzle_size*0.4
+wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3
-infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.4
-support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
 wall_0_wipe_dist = =machine_nozzle_size/2
-speed_print = 65
-speed_wall = =math.ceil(speed_print * 45/65)
-speed_wall_0 = =math.ceil(speed_wall * 30/45)
-speed_topbottom = =math.ceil(speed_print * 40/65)
-speed_layer_0 = =math.ceil(speed_print * 30/65)
+speed_print = 60
+speed_wall = =math.ceil(speed_print * 40/60)
+speed_wall_0 = =math.ceil(speed_wall * 35/40)
+speed_topbottom = =math.ceil(speed_print * 40/60)
+speed_layer_0 = =math.ceil(speed_print * 30/60)
 speed_slowdown_layers = 2
 cool_fan_enabled = True
 cool_fan_speed = 50

resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_A.inst.cfg

@@ -8,21 +8,20 @@ setting_version = 10
 type = quality
 quality_type = a
 weight = 1
-material = generic_pla
+material = emotiontech_pla
 variant = Standard 0.4
 
 [values]
 layer_height_0 = =round(0.5*machine_nozzle_size, 2)
-line_width = =machine_nozzle_size/machine_nozzle_size*0.35
+line_width = =machine_nozzle_size/machine_nozzle_size*0.4
+wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3
-infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.43
-support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
 wall_0_wipe_dist = =machine_nozzle_size/2
-speed_print = 55
-speed_wall = =math.ceil(speed_print * 40/55)
-speed_wall_0 = =math.ceil(speed_wall * 30/40)
-speed_topbottom = =math.ceil(speed_print * 35/55)
-speed_layer_0 = =math.ceil(speed_print * 20/55)
+speed_print = 50
+speed_wall = =math.ceil(speed_print * 35/50)
+speed_wall_0 = =math.ceil(speed_wall * 30/35)
+speed_topbottom = =math.ceil(speed_print * 35/50)
+speed_layer_0 = =math.ceil(speed_print * 20/50)
 speed_slowdown_layers = 2
 cool_fan_enabled = True
 cool_fan_speed = 100

resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_B.inst.cfg

@@ -8,21 +8,20 @@ setting_version = 10
 type = quality
 quality_type = b
 weight = 0
-material = generic_pla
+material = emotiontech_pla
 variant = Standard 0.4
 
 [values]
 layer_height_0 = =round(0.67*machine_nozzle_size, 2)
-line_width = =machine_nozzle_size/machine_nozzle_size*0.35
+line_width = =machine_nozzle_size/machine_nozzle_size*0.4
+wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3
-infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.43
-support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
 wall_0_wipe_dist = =machine_nozzle_size/2
-speed_print = 60
-speed_wall = =math.ceil(speed_print * 43/60)
-speed_wall_0 = =math.ceil(speed_wall * 33/43)
-speed_topbottom = =math.ceil(speed_print * 37/60)
-speed_layer_0 = =math.ceil(speed_print * 25/60)
+speed_print = 55
+speed_wall = =math.ceil(speed_print * 37/55)
+speed_wall_0 = =math.ceil(speed_wall * 33/37)
+speed_topbottom = =math.ceil(speed_print * 37/55)
+speed_layer_0 = =math.ceil(speed_print * 25/55)
 speed_slowdown_layers = 2
 cool_fan_enabled = True
 cool_fan_speed = 100

resources/quality/strateo3d/Standard_0.4/s3d_std0.4_PLA_C.inst.cfg

@@ -8,21 +8,20 @@ setting_version = 10
 type = quality
 quality_type = c
 weight = -1
-material = generic_pla
+material = emotiontech_pla
 variant = Standard 0.4
 
 [values]
 layer_height_0 = =round(0.75*machine_nozzle_size, 2)
-line_width = =machine_nozzle_size/machine_nozzle_size*0.35
+line_width = =machine_nozzle_size/machine_nozzle_size*0.4
+wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
 wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3
-infill_line_width = =machine_nozzle_size/machine_nozzle_size*0.43
-support_line_width = =machine_nozzle_size/machine_nozzle_size*0.35
 wall_0_wipe_dist = =machine_nozzle_size/2
-speed_print = 65
-speed_wall = =math.ceil(speed_print * 45/65)
-speed_wall_0 = =math.ceil(speed_wall * 35/45)
-speed_topbottom = =math.ceil(speed_print * 40/65)
-speed_layer_0 = =math.ceil(speed_print * 30/65)
+speed_print = 60
+speed_wall = =math.ceil(speed_print * 40/60)
+speed_wall_0 = =math.ceil(speed_wall * 35/40)
+speed_topbottom = =math.ceil(speed_print * 40/60)
+speed_layer_0 = =math.ceil(speed_print * 30/60)
 speed_slowdown_layers = 2
 cool_fan_enabled = True
 cool_fan_speed = 100