Merge branch 'maukcc-master'

resources/definitions/cartesio.def.json

@@ -12,6 +12,9 @@
         "has_machine_materials": true,
         "has_variants": true,
         "variants_name": "Nozzle size",
+        "preferred_variant": "*0.4*",
+        "preferred_material": "*pla*",
+        "preferred_quality": "*draft*",
         "machine_extruder_trains":
         {
             "0": "cartesio_extruder_0",
@@ -29,6 +32,7 @@
         "machine_extruder_count": { "default_value": 4 },
         "machine_heated_bed": { "default_value": true },
         "machine_center_is_zero": { "default_value": false },
+        "gantry_height": { "default_value": 35 },
         "machine_height": { "default_value": 400 },
         "machine_depth": { "default_value": 270 },
         "machine_width": { "default_value": 430 },
@@ -39,6 +43,8 @@
         "machine_end_gcode": {
             "default_value": "; -- END GCODE --\nM106 S255\nM140 S5\nM104 S5 T0\nM104 S5 T1\nG1 X20.0 Y260.0 F6000\nG4 S7\nM84\nG4 S90\nM107\nM42 P12 S0\nM42 P13 S0\nM84\n; -- end of END GCODE --"
         },
+        "layer_height": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" },
+        "layer_height_0": { "maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" },
         "machine_nozzle_heat_up_speed": {"default_value": 20},
         "machine_nozzle_cool_down_speed": {"default_value": 20},
         "machine_min_cool_heat_time_window": {"default_value": 5}

resources/quality/coarse.inst.cfg

@@ -0,0 +1,13 @@
+[general]
+version = 2
+name = Coarse Quality
+definition = fdmprinter
+
+[metadata]
+type = quality
+quality_type = coarse
+global_quality = True
+weight = -3
+
+[values]
+layer_height = 0.4

resources/quality/draft.inst.cfg

@@ -0,0 +1,14 @@
+
+[general]
+version = 2
+name = Draft Quality
+definition = fdmprinter
+
+[metadata]
+type = quality
+quality_type = draft
+global_quality = True
+weight = -2
+
+[values]
+layer_height = 0.2

resources/quality/extra_coarse.inst.cfg

@@ -0,0 +1,13 @@
+[general]
+version = 2
+name = Extra Coarse Quality
+definition = fdmprinter
+
+[metadata]
+type = quality
+quality_type = Extra coarse
+global_quality = True
+weight = -4
+
+[values]
+layer_height = 0.6

resources/variants/cartesio_0.25.inst.cfg

@@ -18,9 +18,7 @@ wall_0_inset = -0.05
 fill_perimeter_gaps = nowhere
 travel_compensate_overlapping_walls_enabled = 
 
-infill_sparse_density = 25
-infill_overlap = -50
-skin_overlap = -40
+infill_sparse_density = 30
 
 material_print_temperature_layer_0 = =round(material_print_temperature)
 material_initial_print_temperature = =round(material_print_temperature)