skriware 2 print settings update

profiles for skriware 2 added,
def.json updated, some resolve problems fixed.

resources/definitions/skriware_2.def.json

@@ -7,6 +7,7 @@
     "author": "Skriware",
     "manufacturer": "Skriware",
     "file_formats": "text/x-gcode",
+    "has_machine_quality": true,
     "platform_offset": [
       0,
       0,
@@ -30,7 +31,9 @@
       "default_value": 10
     },
     "material_bed_temperature": {
-            "value": "50"
+      "value": "50",
+      "minimum_value_warning": "30",
+      "resolve": "extruderValues('material_bed_temperature')[adhesion_extruder_nr] if resolveOrValue('adhesion_type') == 'raft' else max(extruderValues('material_bed_temperature'))"
     },
     "raft_airgap": {
       "default_value": 0.2
@@ -48,7 +51,7 @@
       "value": "0.8"
     },
     "machine_end_gcode": {
-            "default_value": "M59\nG92 E0\nG1 E-10 F300\nM104 T0 S0\nM104 T1 S0\nM140 S0\nG28 X0 Y0\nM84\nM106 S0\nM107"
+      "default_value": "M59\nG92 E0\nG1 E-10 F300\nM104 T0 S0\nM104 T1 S0\nM140 S0\nG28 X0 Y0\nM84\nM106 S0\nM107\nM220 S100"
     },
     "wall_material_flow": {
       "value": "99"
@@ -57,7 +60,7 @@
       "value": "10"
     },
     "acceleration_topbottom": {
-            "value": "400"
+      "value": "200"
     },
     "prime_tower_size": {
       "default_value": 1
@@ -72,7 +75,7 @@
       "default_value": 0.6
     },
     "xy_offset_layer_0": {
-            "value": "-0.16"
+      "value": "0.0"
     },
     "raft_interface_fan_speed": {
       "value": "40"
@@ -93,13 +96,13 @@
       "value": "0.4"
     },
     "speed_travel_layer_0": {
-            "value": "120"
+      "value": "80"
     },
     "speed_wall_0": {
       "value": "20"
     },
     "acceleration_wall_x": {
-            "value": "400"
+      "value": "200"
     },
     "layer_0_z_overlap": {
       "value": "0.1"
@@ -141,7 +144,8 @@
       "value": "0.4"
     },
     "infill_line_distance": {
-            "value": "5.33"
+      "value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else 1))))",
+      "default_value":5.3333
     },
     "default_material_print_temperature": {
       "default_value": 200
@@ -171,7 +175,8 @@
       "default_value": 1
     },
     "support_line_distance": {
-            "value": "2"
+      "value":"0 if support_infill_rate == 0 else (support_line_width * 100) / support_infill_rate * (2 if support_pattern == 'grid' else (3 if support_pattern == 'triangles' else 1))",
+      "default_value":2
     },
     "cool_lift_head": {
       "default_value": true
@@ -216,7 +221,7 @@
       "default_value": 1.75
     },
     "xy_offset": {
-            "default_value": -0.16
+      "default_value": 0.0
     },
     "support_extruder_nr": {
       "value": "0"
@@ -237,7 +242,8 @@
       "default_value": 195
     },
     "cool_fan_speed_0": {
-            "default_value": 100
+      "default_value": 0,
+      "value": "cool_fan_speed if resolveOrValue('adhesion_type') == 'raft' else 0"
     },
     "brim_line_count": {
       "value": "17"
@@ -246,7 +252,7 @@
       "default_value": "raft"
     },
     "switch_extruder_retraction_amount": {
-            "value": "16"
+      "value": "20"
     },
     "retraction_amount": {
       "default_value": 3
@@ -279,7 +285,7 @@
       "default_value": true
     },
     "acceleration_print_layer_0": {
-            "value": "400"
+      "value": "200"
     },
     "jerk_prime_tower": {
       "value": "5"
@@ -321,7 +327,7 @@
       "value": "1"
     },
     "acceleration_layer_0": {
-            "value": "400"
+      "value": "200"
     },
     "support_z_distance": {
       "default_value": 0.2
@@ -339,10 +345,10 @@
       "default_value": 120
     },
     "machine_start_gcode": {
-            "default_value": "G90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM420 S1 Z0.6 ;enable bed levelling\nG1 Z10 F250 ;move the platform down 10mm\nM107 ;fan off\nM42 P11 S255 ;turn on front fan\nM140 S{material_bed_temperature}\nM104 T0 S{material_print_temperature, 0}\nM104 T1 S{material_print_temperature, 1}\nG1 F2500 Y260 X0\nM190 S{material_bed_temperature}\nM109 T0 S{material_print_temperature, 0}\nM109 T1 S{material_print_temperature, 1}\nM60 ;enable E-FADE Algorithm\nM62 A ;filament sensor off\nG92 E0 ;zero the extruded length\nT1\nG92 E0;zero the extruded length\nG1 F300 Z0.3\nG1 F1200 X20\nG1 F1200 X180 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E11\nG1 F300 Z1.5\nG92 E0 ;zero the extruded length again\nT0\nG92 E0 ;zero the extruded length\nG1 F1200 Y258\nG1 F300 Z0.3\nG1 F1200 X40 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E11\nG1 Z1.5\nM61 A ;filament sensor reset\nM63 A ;filament sensor on\nG92 E0 ;zero the extruded length again\nM58 ;end of Start G-Code and signal retract management\nT{initial_extruder_nr}"
+      "default_value": "G90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM420 S1 Z0.7 ;enable bed levelling\nG1 Z10 F250 ;move the platform down 10mm\nM107 ;fan off\nM42 P11 S255 ;turn on front fan\nM140 S{material_bed_temperature}\nM104 T0 S{material_print_temperature, 0}\nM104 T1 S{material_print_temperature, 1}\nG1 F2500 Y260 X0\nM190 S{material_bed_temperature}\nM109 T0 S{material_print_temperature, 0}\nM109 T1 S{material_print_temperature, 1}\nM60 ;enable E-FADE Algorithm\nM62 A ;filament sensor off\nG92 E0 ;zero the extruded length\nT1\nG92 E0;zero the extruded length\nG1 F300 Z0.3\nG1 F1200 X20\nG1 F1200 X180 E21 ;extrude 21 mm of feed stock\nG1 F1200 E11\nG1 F300 Z1.5\nG92 E0 ;zero the extruded length again\nT0\nG92 E0 ;zero the extruded length\nG1 F1200 Y258\nG1 F300 Z0.3\nG1 F1200 X40 E21 ;extrude 21 mm of feed stock\nG1 F1200 E11 ;retracting 10 mm\nG1 F300 Z1.5\nM63 A ;filament sensor reset\nM61 A ;filament sensor on\nG92 E0 ;zero the extruded length again\nM58 ;end of Start G-Code and signal retract management\nT{initial_extruder_nr}"
     },
     "bottom_skin_preshrink": {
-            "value": "0.8"
+      "value": "0.0"
     },
     "ironing_inset": {
       "value": "0.2 + (ironing_line_spacing - skin_line_width * (1.0 + ironing_flow / 100) / 2 if ironing_pattern == 'concentric' else skin_line_width * (1.0 - ironing_flow / 100) / 2)"
@@ -369,7 +375,9 @@
       "value": "195"
     },
     "material_bed_temperature_layer_0": {
-            "value": "50"
+      "value": "50",
+      "minimum_value_warning": "30",
+      "resolve": "extruderValues('material_bed_temperature_layer_0')[adhesion_extruder_nr] if resolveOrValue('adhesion_type') == 'raft' else max(extruderValues('material_bed_temperature_layer_0'))"
     },
     "wipe_retraction_retract_speed": {
       "value": "30"
@@ -399,7 +407,7 @@
       "value": "33.33"
     },
     "jerk_layer_0": {
-            "value": "10"
+      "value": "5"
     },
     "support_angle": {
       "default_value": 60
@@ -417,16 +425,16 @@
       "value": "250"
     },
     "acceleration_print": {
-            "default_value": 400
+      "default_value": 200
     },
     "acceleration_infill": {
-            "value": "500"
+      "value": "400"
     },
     "bridge_wall_speed": {
       "value": "10.0"
     },
     "acceleration_wall_0": {
-            "value": "400"
+      "value": "200"
     },
     "support_offset": {
       "default_value": 0.2
@@ -441,7 +449,7 @@
       "value": "20"
     },
     "top_skin_preshrink": {
-            "value": "0.8"
+      "value": "0.0"
     },
     "jerk_ironing": {
       "value": "5"
@@ -510,7 +518,7 @@
       "value": "15"
     },
     "raft_fan_speed": {
-            "default_value": 100
+      "default_value": 40
     },
     "wipe_retraction_amount": {
       "value": "3"
@@ -582,7 +590,7 @@
       "default_value": 40
     },
     "skin_preshrink": {
-            "value": "0.8"
+      "value": "0.0"
     },
     "speed_wall": {
       "value": "20"
@@ -630,7 +638,7 @@
       "default_value": true
     },
     "acceleration_support": {
-            "value": "400"
+      "value": "200"
     },
     "adhesion_extruder_nr": {
       "value": "0"
@@ -642,19 +650,19 @@
       "value": "False"
     },
     "jerk_wall_0": {
-            "value": "10"
+      "value": "5"
     },
     "raft_speed": {
       "value": "60"
     },
     "speed_layer_0": {
-            "value": "10.0"
+      "value": "20.0"
     },
     "machine_width": {
       "default_value": 210
     },
     "acceleration_wall": {
-            "value": "400"
+      "value": "200"
     },
     "jerk_infill": {
       "value": "10"

resources/quality/skriware_2/sk2_advanced.inst.cfg

@@ -0,0 +1,35 @@
+[general]
+version = 4
+name = Advanced
+definition = skriware_2
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = normal
+weight = 0
+global_quality = True
+
+[values]
+layer_height = 0.2
+layer_height_layer_0 = 0.2
+speed_travel = 80
+acceleration_travel = 400
+jerk_travel = 10
+acceleration_layer_0 = 200
+acceleration_print_layer_0 = 200
+acceleration_travel_layer_0 = 200
+jerk_layer_0 = 2
+jerk_print_layer_0 = 2
+jerk_travel_layer_0 = 2
+raft_interface_line_spacing = 0.8
+raft_interface_line_width = 0.6
+raft_interface_speed = 40
+raft_interface_thickness = 0.2
+raft_base_line_spacing = 1.5
+raft_base_line_width = 0.8
+raft_base_speed = 20
+raft_base_thickness = 0.3
+raft_surface_layers = 1
+raft_surface_line_spacing = 0.6
+raft_surface_speed = 60

resources/quality/skriware_2/sk2_fast.inst.cfg

@@ -0,0 +1,63 @@
+[general]
+version = 4
+name = Fast
+definition = skriware_2
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = fast
+weight = -1
+global_quality = True
+
+[values]
+layer_height = 0.3
+layer_height_layer_0 = 0.3
+support_infill_sparse_thickness = 0.3
+speed_travel = 100
+acceleration_travel = 400
+jerk_travel = 10
+speed_wall = 40
+speed_wall_0 = 30
+speed_wall_x = 40
+acceleration_wall = 400
+acceleration_wall_0 = 400
+acceleration_wall_x = 400
+jerk_wall = 10
+jerk_wall_0 = 10
+jerk_wall_x = 10
+speed_infill = 80
+acceleration_infill = 400
+jerk_infill = 10
+speed_roofing = 30
+acceleration_roofing = 400
+jerk_roofing = 10
+speed_topbottom = 30
+acceleration_topbottom = 400
+jerk_topbottom = 10
+speed_support = 50
+acceleration_support = 400
+jerk_support = 10
+speed_travel_layer_0 = 80
+speed_print_layer_0 = 20
+speed_layer_0 = 10
+acceleration_layer_0 = 200
+acceleration_print_layer_0 = 200
+acceleration_travel_layer_0 = 200
+jerk_layer_0 = 5
+jerk_print_layer_0 = 2
+jerk_travel_layer_0 = 10
+speed_print = 40
+acceleration_print = 400
+jerk_print = 10
+raft_interface_line_spacing = 0.8
+raft_interface_line_width = 0.6
+raft_interface_speed = 40
+raft_interface_thickness = 0.2
+raft_base_line_spacing = 1.5
+raft_base_line_width = 0.8
+raft_base_speed = 20
+raft_base_thickness = 0.3
+raft_surface_layers = 1
+raft_surface_line_spacing = 0.6
+raft_surface_speed = 60

resources/quality/skriware_2/sk2_precise.inst.cfg

@@ -0,0 +1,63 @@
+[general]
+version = 4
+name = Precise
+definition = skriware_2
+
+[metadata]
+setting_version = 16
+type = quality
+quality_type = best
+weight = -1
+global_quality = True
+
+[values]
+layer_height = 0.2
+layer_height_layer_0 = 0.2
+speed_print = 20
+speed_travel = 80
+acceleration_travel = 400
+jerk_travel = 10
+speed_wall = 20
+speed_wall_0 = 20
+speed_wall_x = 20
+acceleration_wall = 400
+acceleration_wall_0 = 200
+acceleration_wall_x = 200
+jerk_wall = 10
+jerk_wall_0 = 5
+jerk_wall_x = 10
+speed_infill = 80
+acceleration_infill = 400
+jerk_infill = 10
+speed_roofing = 20
+acceleration_roofing = 400
+jerk_roofing = 10
+speed_topbottom = 20
+acceleration_topbottom = 400
+jerk_topbottom = 10
+speed_support = 50
+acceleration_support = 400
+jerk_support = 10
+speed_travel_layer_0 = 80
+speed_print_layer_0 = 20
+speed_layer_0 = 20
+acceleration_layer_0 = 200
+acceleration_print_layer_0 = 200
+acceleration_travel_layer_0 = 200
+jerk_layer_0 = 10
+jerk_print_layer_0 = 10
+jerk_travel_layer_0 = 10
+speed_print = 20
+acceleration_print = 400
+jerk_print = 10
+raft_interface_line_spacing = 0.8
+raft_interface_line_width = 0.6
+raft_interface_speed = 40
+raft_interface_thickness = 0.2
+raft_base_line_spacing = 1.5
+raft_base_line_width = 0.8
+raft_base_speed = 20
+raft_base_thickness = 0.3
+raft_surface_layers = 1
+raft_surface_line_spacing = 0.6
+raft_surface_speed = 60