Просмотр исходного кода

Removing nozzle variants, adding material definitions

Tyler Gibson 7 лет назад
Родитель
Сommit
c885341e5a

+ 6 - 11
resources/definitions/malyan_m200.def.json

@@ -4,19 +4,14 @@
     "name": "Malyan M200",
     "inherits": "fdmprinter",
     "metadata": {
-        "author": "Brian Corbino",
+        "author": "Brian Corbino, Tyler Gibson",
         "manufacturer": "Malyan",
         "category": "Other",
         "file_formats": "text/x-gcode",
         "platform": "malyan_m200_platform.stl",
-        "has_variants": true,
-        "has_variant_materials": false,
-        "has_materials": true,
-        "has_machine_materials": false,
         "has_machine_quality": true,
-        "preferred_variant": "*0.4*",
-        "preferred_quality": "*0.175*",
-        "variants_name": "Nozzle size",
+        "has_materials": true,
+        "preferred_quality": "*normal*",
         "supports_usb_connection": true,
         "visible": true,
         "first_start_actions": ["MachineSettingsAction"],
@@ -39,9 +34,9 @@
         "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" },
 
         "material_print_temperature": { "minimum_value": "0" },
-        "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
+        "material_print_temperature_layer_0": { "value": "min(material_print_temperature + 5, 245)" },
         "material_bed_temperature": { "minimum_value": "0" },
-        "material_bed_temperature_layer_0": { "value": "material_bed_temperature + 5" },
+        "material_bed_temperature_layer_0": { "value": "min(material_bed_temperature + 5, 70)" },
         "material_standby_temperature": { "minimum_value": "0" },
         "machine_show_variants": { "default_value": true },
         "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
@@ -59,7 +54,7 @@
         "material_diameter": { "value": 1.75 },
         "machine_nozzle_size": {
             "default_value": 0.4,
-            "minimum_value": "0.15"
+            "minimum_value": 0.15
         },
         "machine_max_feedrate_x": { "default_value": 150 },
         "machine_max_feedrate_y": { "default_value": 150 },

+ 1 - 1
resources/definitions/monoprice_select_mini_v1.def.json

@@ -4,7 +4,7 @@
     "name": "Monoprice Select Mini V1",
     "inherits": "malyan_m200",
     "metadata": {
-        "author": "Brian Corbino",
+        "author": "Brian Corbino, Tyler Gibson",
         "manufacturer": "Monoprice",
         "category": "Other",
         "file_formats": "text/x-gcode",

+ 6 - 3
resources/definitions/monoprice_select_mini_v2.def.json

@@ -4,11 +4,13 @@
     "name": "Monoprice Select Mini V2 (E3D)",
     "inherits": "malyan_m200",
     "metadata": {
-        "author": "Brian Corbino",
+        "author": "Tyler Gibson",
         "manufacturer": "Monoprice",
         "category": "Other",
         "file_formats": "text/x-gcode",
-        "quality_definition": "malyan_m200",
+        "has_machine_quality": true,
+        "has_materials": true,
+        "preferred_quality": "*normal*",
         "visible": true
    },
 
@@ -17,6 +19,7 @@
         "adhesion_type": { "default_value": "brim" },
         "retraction_combing": { "default_value": "noskin" },
         "retraction_amount" : { "default_value": 2.5},
-        "retraction_speed" : { "default_value": 40}
+        "retraction_speed" : { "default_value": 40},
+        "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
     }
 }

+ 15 - 0
resources/quality/malyan_m200/abs/malyan_m200_abs_draft.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 2
+name = Fast
+definition = malyan_m200
+
+[metadata]
+type = quality
+quality_type = draft
+material = generic_abs_175
+weight = -2
+setting_version = 4
+
+[values]
+material_bed_temperature = 70
+material_bed_temperature_layer_0 = 70

+ 15 - 0
resources/quality/malyan_m200/abs/malyan_m200_abs_fast.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 2
+name = Normal
+definition = malyan_m200
+
+[metadata]
+type = quality
+quality_type = fast
+material = generic_abs_175
+weight = -1
+setting_version = 4
+
+[values]
+material_bed_temperature = 70
+material_bed_temperature_layer_0 = 70

+ 15 - 0
resources/quality/malyan_m200/abs/malyan_m200_abs_high.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 2
+name = Finer
+definition = malyan_m200
+
+[metadata]
+type = quality
+quality_type = high
+material = generic_abs_175
+weight = 1
+setting_version = 4
+
+[values]
+material_bed_temperature = 70
+material_bed_temperature_layer_0 = 70

+ 15 - 0
resources/quality/malyan_m200/abs/malyan_m200_abs_normal.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 2
+name = Fine
+definition = malyan_m200
+
+[metadata]
+type = quality
+quality_type = normal
+material = generic_abs_175
+weight = 0
+setting_version = 4
+
+[values]
+material_bed_temperature = 70
+material_bed_temperature_layer_0 = 70

+ 15 - 0
resources/quality/malyan_m200/abs/malyan_m200_abs_superdraft.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 2
+name = Lowest Quality Draft
+definition = malyan_m200
+
+[metadata]
+type = quality
+quality_type = superdraft
+material = generic_abs_175
+weight = -5
+setting_version = 4
+
+[values]
+material_bed_temperature = 70
+material_bed_temperature_layer_0 = 70

+ 15 - 0
resources/quality/malyan_m200/abs/malyan_m200_abs_thickerdraft.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 2
+name = Draft
+definition = malyan_m200
+
+[metadata]
+type = quality
+quality_type = thickerdraft
+material = generic_abs_175
+weight = -3
+setting_version = 4
+
+[values]
+material_bed_temperature = 70
+material_bed_temperature_layer_0 = 70

+ 15 - 0
resources/quality/malyan_m200/abs/malyan_m200_abs_ultra.inst.cfg

@@ -0,0 +1,15 @@
+[general]
+version = 2
+name = Ultra Fine
+definition = malyan_m200
+
+[metadata]
+type = quality
+quality_type = ultra
+material = generic_abs_175
+weight = 2
+setting_version = 4
+
+[values]
+material_bed_temperature = 70
+material_bed_temperature_layer_0 = 70

Некоторые файлы не были показаны из-за большого количества измененных файлов