Browse Source

Merge pull request #6329 from maukcc/master

HMS434 change
Lipu Fei 5 years ago
parent
commit
a6218179a9

+ 31 - 7
resources/definitions/hms434.def.json

@@ -5,12 +5,29 @@
     "metadata": {
         "visible":      true,
         "author":       "Scheepers",
-        "manufacturer": "MaukCC",
+        "manufacturer": "Hybrid AM Systems",
         "file_formats": "text/x-gcode",
 
         "has_materials":         true,
+        "has_machine_materials": true,
         "preferred_material":    "generic_pla",
-        "exclude_materials": [ "chromatik_pla", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "imade3d_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "tizyx_abs", "tizyx_pla", "tizyx_pla_bois", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla", "generic_cpe_175", "generic_nylon_175", "dsm_arnitel2045_175", "dsm_novamid1070_175", "generic_tpu_175", "generic_pc_175" ],
+        "exclude_materials": [
+ "chromatik_pla",
+ "dsm_arnitel2045_175", "dsm_novamid1070_175",
+ "emotiontech_abs", "emotiontech_petg", "emotiontech_pla", "emotiontech_pva-m", "emotiontech_pva-oks", "emotiontech_pva-s", "emotiontech_tpu98a",
+ "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu",
+ "fiberlogy_hd_pla",
+ "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red",
+ "generic_abs_175", "generic_cpe_175", "generic_hips_175", "generic_nylon_175", "generic_pc_175", "generic_petg_175",  "generic_pva_175", "generic_tpu_175",
+ "imade3d_generic_petg_175", "imade3d_generic_pla_175",
+ "innofill_innoflex60_175",
+ "octofiber_pla",
+ "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla",
+ "verbatim_bvoh_175",
+ "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_PLA_Glitter", "Vertex_Delta_PLA_Mat", "Vertex_Delta_PLA_Satin", "Vertex_Delta_PLA_Wood", "Vertex_Delta_TPU",
+ "tizyx_abs", "tizyx_flex", "tizyx_petg", "tizyx_pla", "tizyx_pla_bois", "tizyx_pva",
+ "zyyx_pro_flex", "zyyx_pro_pla"
+ ],
 
         "has_variants":           true,
         "variants_name":          "Tool",
@@ -41,16 +58,17 @@
         "machine_extruder_count":     {"default_value": 2 },
         "material_diameter":          {"default_value": 1.75 },
         "machine_heated_bed":         {"default_value": true },
+        "machine_heated_build_volume":{"default_value": true },
         "machine_center_is_zero":     {"default_value": false },
         "gantry_height":              {"value": "35" },
         "machine_height":             {"default_value": 400 },
         "machine_depth":              {"default_value": 325 },
         "machine_width":              {"default_value": 450 },
         "machine_gcode_flavor":       {"default_value": "RepRap (RepRap)" },
-        "material_print_temp_wait":   {"default_value": true},
-        "material_bed_temp_wait":     {"default_value": true },
+        "material_print_temp_wait":   {"default_value": false },
+        "material_bed_temp_wait":     {"default_value": false },
         "machine_max_feedrate_z":     {"default_value": 1200 },
-        "machine_start_gcode":        {"default_value": "\n;Neither MaukCC nor any of MaukCC representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 X-44 Y-100 F9000;go to wipe point\nG1 Z0 F900\nG1 Z0.2 F900\nM117 HMS434 Printing ...\n\n" },
+        "machine_start_gcode":        {"default_value": "\n;Neither Hybrid AM Systems nor any of Hybrid AM Systems representatives has any liabilities or gives any warranties on this .gcode file, or on any or all objects made with this .gcode file.\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 X-44 Y-100 F9000;go to wipe point\nG1 Z0 F900\nG1 Z0.2 F900\nM117 HMS434 Printing ...\n\n" },
         "machine_end_gcode":          {"default_value": "" },
 
         "retraction_extra_prime_amount":      {"minimum_value_warning": "-2.0" },
@@ -71,10 +89,16 @@
         "top_layers":                {"value": "4" },
         "bottom_layers":             {"value": "(top_layers)" },
         "wall_0_inset":              {"value": "0" },
+        "outer_inset_first":         {"value": true },
         "alternate_extra_perimeter": {"value": false },
         "filter_out_tiny_gaps":      {"value": false },
         "fill_outline_gaps":         {"value": true },
         "skin_outline_count":        {"value": "0"},
+        "ironing_enabled":           {"value": true },
+        "ironing_line_spacing":      {"value": "line_width"},
+        "ironing_flow":              {"value": "0"},
+        "ironing_inset":             {"value": "line_width"},
+        "speed_ironing":             {"value": "150"},
  
         "infill_sparse_density": {"value": 30},
         "infill_pattern":        {"value": "'lines'"},
@@ -103,7 +127,7 @@
         "speed_wall_x":            {"value": "speed_wall"},
         "speed_layer_0":           {"value": "(speed_print/5*4) if speed_print < 51 else speed_print"},
         "speed_topbottom":         {"value": "speed_layer_0"},
-        "speed_travel":            {"value": "100"},
+        "speed_travel":            {"value": "150"},
         "speed_travel_layer_0":    {"value": "speed_travel"},
         "speed_support_interface": {"value": "speed_topbottom"},
         "speed_slowdown_layers":   {"value": 1},
@@ -130,7 +154,7 @@
         "support_interface_height":  {"value": 0.5},
         "support_interface_pattern": {"value": "'lines'"},
 
-        "adhesion_type":             {"value": "'skirt'"},
+        "adhesion_type":             {"value": "'none'"},
         "skirt_gap":                 {"value": 1},
         "skirt_brim_minimal_length": {"value": 50},
 

+ 3 - 3
resources/quality/hms434/hms434_global_Coarse_Quality.inst.cfg

@@ -4,12 +4,12 @@ name = Coarse
 definition = hms434
 
 [metadata]
-setting_version = 9
+setting_version = 8
 type = quality
 quality_type = coarse
-weight = -3
+weight = -1
 global_quality = True
 
 [values]
 layer_height = 0.4
-layer_height_0 = 0.4
+layer_height_0 = 0.2

+ 0 - 15
resources/quality/hms434/hms434_global_Extra_Coarse_Quality.inst.cfg

@@ -1,15 +0,0 @@
-[general]
-version = 4
-name = Extra Coarse
-definition = hms434
-
-[metadata]
-setting_version = 9
-type = quality
-quality_type = extra coarse
-weight = -4
-global_quality = True
-
-[values]
-layer_height = 0.6
-layer_height_0 = 0.6

+ 1 - 1
resources/quality/hms434/hms434_global_High_Quality.inst.cfg

@@ -4,7 +4,7 @@ name = High
 definition = hms434
 
 [metadata]
-setting_version = 9
+setting_version = 8
 type = quality
 quality_type = high
 weight = 1

+ 1 - 1
resources/quality/hms434/hms434_global_Normal_Quality.inst.cfg

@@ -4,7 +4,7 @@ name = Normal
 definition = hms434
 
 [metadata]
-setting_version = 9
+setting_version = 8
 type = quality
 quality_type = normal
 weight = 0

+ 0 - 16
resources/quality/hms434/hms434_global_Super_Coarse_Quality.inst.cfg

@@ -1,16 +0,0 @@
-[general]
-version = 4
-name = Super Coarse
-definition = hms434
-
-[metadata]
-setting_version = 9
-type = quality
-quality_type = super coarse
-weight = -4
-global_quality = True
-
-[values]
-layer_height = 0.8
-layer_height_0 = 0.8
-

+ 0 - 15
resources/quality/hms434/hms434_global_Ultra_Coarse_Quality.inst.cfg

@@ -1,15 +0,0 @@
-[general]
-version = 4
-name = Ultra Coarse
-definition = hms434
-
-[metadata]
-setting_version = 9
-type = quality
-quality_type = ultra coarse
-weight = -4
-global_quality = True
-
-[values]
-layer_height = 1.0
-layer_height_0 = 1.0

+ 36 - 0
resources/quality/hms434/pla/hms434_0.4_pla_high.inst.cfg

@@ -0,0 +1,36 @@
+[general]
+version = 4
+name = High
+definition = hms434
+
+[metadata]
+setting_version = 8
+type = quality
+quality_type = high
+weight = 1
+material = generic_pla
+variant = 0.4mm TP extruder
+
+[values]
+
+wall_0_wipe_dist = 0.0
+
+infill_overlap_mm = -0.1
+infill_wipe_dist = 0
+
+default_material_print_temperature = 190
+material_standby_temperature = 160
+default_material_bed_temperature = 45
+build_volume_temperature = 43
+material_flow = 100
+retraction_amount = 1
+retraction_speed = 40
+retraction_prime_speed = 8
+retraction_extra_prime_amount = 0
+switch_extruder_retraction_amount = 2
+
+speed_print = 50
+
+coasting_volume = 0.05
+coasting_min_volume = 0.17
+coasting_speed = 100

+ 36 - 0
resources/quality/hms434/pla/hms434_0.4_pla_normal.inst.cfg

@@ -0,0 +1,36 @@
+[general]
+version = 4
+name = Normal
+definition = hms434
+
+[metadata]
+setting_version = 8
+type = quality
+quality_type = normal
+weight = 0
+material = generic_pla
+variant = 0.4mm TP extruder
+
+[values]
+
+wall_0_wipe_dist = 0.0
+
+infill_overlap_mm = -0.1
+infill_wipe_dist = 0
+
+default_material_print_temperature = 190
+material_standby_temperature = 160
+default_material_bed_temperature = 45
+build_volume_temperature = 43
+material_flow = 100
+retraction_amount = 1
+retraction_speed = 40
+retraction_prime_speed = 8
+retraction_extra_prime_amount = 0
+switch_extruder_retraction_amount = 2
+
+speed_print = 50
+
+coasting_volume = 0.05
+coasting_min_volume = 0.17
+coasting_speed = 100

+ 36 - 0
resources/quality/hms434/pla/hms434_0.8_pla_coarse.inst.cfg

@@ -0,0 +1,36 @@
+[general]
+version = 4
+name = Coarse
+definition = hms434
+
+[metadata]
+setting_version = 8
+type = quality
+quality_type = coarse
+weight = -1
+material = generic_pla
+variant = 0.8mm TP extruder
+
+[values]
+
+wall_0_wipe_dist = 0.0
+
+infill_overlap_mm = -0.1
+infill_wipe_dist = 0
+
+default_material_print_temperature = 190
+material_standby_temperature = 160
+default_material_bed_temperature = 45
+build_volume_temperature = 43
+material_flow = 100
+retraction_amount = 1
+retraction_speed = 40
+retraction_prime_speed = 8
+retraction_extra_prime_amount = 0
+switch_extruder_retraction_amount = 2
+
+speed_print = 50
+
+coasting_volume = 0.05
+coasting_min_volume = 0.17
+coasting_speed = 100

Some files were not shown because too many files changed in this diff