From f5f86e8e4b2cdd4c49fff32bcce466d936ca43e1 Mon Sep 17 00:00:00 2001 From: "jos@mauk.cc" Date: Thu, 19 Dec 2019 15:49:15 +0100 Subject: [PATCH 01/13] HMS434 update Material exclusion update --- resources/definitions/hms434.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index be78df9daa..e5f32283d8 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -12,7 +12,7 @@ "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", + "emotiontech_abs", "emotiontech_asax", "emotiontech_hips", "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", @@ -67,7 +67,7 @@ "material_print_temp_wait": {"default_value": false }, "material_bed_temp_wait": {"default_value": false }, "machine_max_feedrate_z": {"default_value": 10 }, - "machine_acceleration": {"default_value": 500 }, + "machine_acceleration": {"default_value": 180 }, "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\nM140 S{material_bed_temperature_layer_0}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 Z10 F900\nG1 X-30 Y100 F12000\n\nM190 S{material_bed_temperature_layer_0}\nM117 HMS434 Printing ...\n\n" }, "machine_end_gcode": {"default_value": "" }, From 7eacb9f13cbe900f7ee27249732333533221d8ee Mon Sep 17 00:00:00 2001 From: "jos@mauk.cc" Date: Thu, 16 Jan 2020 16:21:06 +0100 Subject: [PATCH 02/13] HMS434 update excluded materials speed settings toolchange settings --- resources/definitions/hms434.def.json | 9 +++++---- resources/extruders/hms434_tool_1.def.json | 2 +- resources/extruders/hms434_tool_2.def.json | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index e5f32283d8..d0a48ada52 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -13,6 +13,7 @@ "chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "emotiontech_abs", "emotiontech_asax", "emotiontech_hips", "emotiontech_petg", "emotiontech_pla", "emotiontech_pva-m", "emotiontech_pva-oks", "emotiontech_pva-s", "emotiontech_tpu98a", + "eSUN_PETG_Black", "eSUN_PETG_Grey", "eSUN_PETG_Purple", "eSUN_PLA_PRO_Black", "eSUN_PLA_PRO_Grey", "eSUN_PLA_PRO_Purple", "eSUN_PLA_PRO_White", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", @@ -130,9 +131,9 @@ "speed_print": {"value": "50"}, "speed_infill": {"value": "speed_print"}, - "speed_wall": {"value": "(speed_print/5*3) if speed_print < 51 else speed_print"}, + "speed_wall": {"value": "(speed_print/5*3) if speed_print > 45 else speed_print"}, "speed_wall_x": {"value": "speed_wall"}, - "speed_layer_0": {"value": "(speed_print/5*4) if speed_print < 51 else speed_print"}, + "speed_layer_0": {"value": "(speed_print/5*4) if speed_print > 45 else speed_print"}, "speed_topbottom": {"value": "speed_layer_0"}, "speed_travel": {"value": "150"}, "speed_travel_layer_0": {"value": "speed_travel"}, @@ -151,8 +152,8 @@ "cool_fan_speed": {"value": 0}, "cool_fan_enabled": {"value": true}, "cool_min_layer_time_fan_speed_max": {"value": "cool_min_layer_time"}, - "cool_min_layer_time": {"value": 20}, - "cool_min_speed": {"value": "10"}, + "cool_min_layer_time": {"value": 30}, + "cool_min_speed": {"value": "5"}, "cool_lift_head": {"value": false}, "support_infill_rate": {"value": 25}, diff --git a/resources/extruders/hms434_tool_1.def.json b/resources/extruders/hms434_tool_1.def.json index ddd46e60f3..3fde2a997d 100644 --- a/resources/extruders/hms434_tool_1.def.json +++ b/resources/extruders/hms434_tool_1.def.json @@ -16,7 +16,7 @@ "machine_nozzle_offset_y": { "default_value": 0.0 }, "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { - "default_value": "\n;changing to tool1\nM109 T0 S{material_print_temperature}\nG1 Y120 F3000\nG1 X10 F12000\n\n" + "default_value": "\n;changing to tool1\nM83\nM109 T0 S{material_print_temperature}\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 Y120 F3000\nG1 X10 F12000\nG1 E-{switch_extruder_retraction_amount} F2400\n\n" }, "machine_extruder_end_code": { "default_value": "\nG1 X10 Y120 F12000\nG1 X-40 F12000\nM109 T0 R{material_standby_temperature}\nG1 Y100 F3000\n; ending tool1\n\n" diff --git a/resources/extruders/hms434_tool_2.def.json b/resources/extruders/hms434_tool_2.def.json index aec54238f3..1be433dca7 100644 --- a/resources/extruders/hms434_tool_2.def.json +++ b/resources/extruders/hms434_tool_2.def.json @@ -16,7 +16,7 @@ "machine_nozzle_offset_y": { "default_value": 0.0 }, "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code": { - "default_value": "\n;changing to tool2\nM109 T1 S{material_print_temperature}\nG1 Y120 F3000\nG1 X10 F12000\n\n" + "default_value": "\n;changing to tool2\nM83\nM109 T1 S{material_print_temperature}\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 E{switch_extruder_extra_prime_amount} F480\nG1 Y120 F3000\nG1 X10 F12000\nG1 E-{switch_extruder_retraction_amount} F2400\n\n" }, "machine_extruder_end_code": { "default_value": "\nG1 X10 Y120 F12000\nG1 X-40 F12000\nM109 T1 R{material_standby_temperature}\nG1 Y100 F3000\n; ending tool2\n\n" From 96edf02f1dae3e9558525c5c6711f18a995ddacb Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 16 Jan 2020 16:24:40 +0100 Subject: [PATCH 03/13] Delete hms434.def.json --- resources/definitions/hms434.def.json | 203 -------------------------- 1 file changed, 203 deletions(-) delete mode 100644 resources/definitions/hms434.def.json diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json deleted file mode 100644 index d0a48ada52..0000000000 --- a/resources/definitions/hms434.def.json +++ /dev/null @@ -1,203 +0,0 @@ -{ - "name": "HMS434", - "version": 2, - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Scheepers", - "manufacturer": "Hybrid AM Systems", - "file_formats": "text/x-gcode", - - "has_materials": true, - "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", "dsm_novamid1070_175", - "emotiontech_abs", "emotiontech_asax", "emotiontech_hips", "emotiontech_petg", "emotiontech_pla", "emotiontech_pva-m", "emotiontech_pva-oks", "emotiontech_pva-s", "emotiontech_tpu98a", - "eSUN_PETG_Black", "eSUN_PETG_Grey", "eSUN_PETG_Purple", "eSUN_PLA_PRO_Black", "eSUN_PLA_PRO_Grey", "eSUN_PLA_PRO_Purple", "eSUN_PLA_PRO_White", - "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", - "generic_abs", "generic_abs_175", "generic_cpe_175", "generic_hips_175", "generic_nylon_175", "generic_pc_175", "generic_petg_175", "generic_pla_175", "generic_pva_175", "generic_tpu_175", - "imade3d_petg_175", "imade3d_pla_175", - "innofill_innoflex60_175", - "leapfrog_abs_natural", "leapfrog_epla_natural","leapfrog_pva_natural", - "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", - "preferred_variant_name": "0.4mm TP extruder", - - "has_machine_quality": true, - "preferred_quality_type": "normal", - - "machine_extruder_trains": - { - "0": "hms434_tool_1", - "1": "hms434_tool_2", - "2": "hms434_tool_3", - "3": "hms434_tool_4", - "4": "hms434_tool_5", - "5": "hms434_tool_6", - "6": "hms434_tool_7", - "7": "hms434_tool_8" - }, - "platform": "hms_platform.obj", - "platform_offset": [ 26, -13.2, 162.5], - "platform_texture": "hms434.png", - "first_start_actions": ["MachineSettingsAction"], - "supported_actions": ["MachineSettingsAction"] - }, - - "overrides": { - "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": false }, - "material_bed_temp_wait": {"default_value": false }, - "machine_max_feedrate_z": {"default_value": 10 }, - "machine_acceleration": {"default_value": 180 }, - "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\nM140 S{material_bed_temperature_layer_0}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 Z10 F900\nG1 X-30 Y100 F12000\n\nM190 S{material_bed_temperature_layer_0}\nM117 HMS434 Printing ...\n\n" }, - "machine_end_gcode": {"default_value": "" }, - - "retraction_extra_prime_amount": {"minimum_value_warning": "-2.0" }, - "optimize_wall_printing_order": {"default_value": true }, - "machine_nozzle_heat_up_speed": {"default_value": 12}, - "machine_nozzle_cool_down_speed": {"default_value": 20}, - "machine_min_cool_heat_time_window": {"default_value": 5}, - - "layer_height": {"maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, - "layer_height_0": {"maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, - "line_width": {"value": "(machine_nozzle_size + 0.2)" }, - "wall_line_width_0": {"value": "(machine_nozzle_size - 0.05)" }, - "infill_line_width": {"value": "(line_width)" }, - "initial_layer_line_width_factor": {"value": 110 }, - - "wall_thickness": {"value": "(line_width * 3) if infill_sparse_density < 95 else line_width" }, - "roofing_layer_count": {"value": "4" }, - "top_bottom_thickness": {"value": "(layer_height_0 + (layer_height * 3))" }, - "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": true }, - "fill_outline_gaps": {"value": true }, - "z_seam_type": {"value": "'back'"}, - "z_seam_x": {"value": "300"}, - "z_seam_y": {"value": "325"}, - "z_seam_corner": {"value": "'z_seam_corner_inner'"}, - "skin_outline_count": {"value": "0"}, - "ironing_enabled": {"value": true }, - "ironing_line_spacing": {"value": "line_width / 4 * 3"}, - "ironing_flow": {"value": "0"}, - "ironing_inset": {"value": "ironing_line_spacing"}, - "speed_ironing": {"value": "150"}, - - "infill_sparse_density": {"value": 30}, - "infill_pattern": {"value": "'lines'"}, - "infill_overlap": {"value": 5}, - "skin_overlap": {"value": 5}, - "infill_wipe_dist": {"value": 0.0}, - "infill_before_walls": {"value": false}, - - "material_print_temperature_layer_0": {"value": "material_print_temperature"}, - "material_initial_print_temperature": {"value": "material_print_temperature", - "maximum_value_warning": "material_print_temperature + 15"}, - "material_final_print_temperature": {"value": "material_print_temperature"}, - "material_bed_temperature_layer_0": {"value": "material_bed_temperature"}, - "material_flow": {"value": "100"}, - "retraction_enable": {"value": true }, - "retract_at_layer_change": {"value": true }, - "retraction_amount": {"value": "1"}, - "retraction_speed": {"value": "20"}, - "retraction_prime_speed": {"value": "8"}, - "retraction_min_travel": {"value": "(round(line_width * 10))"}, - "switch_extruder_retraction_amount": {"value": 2}, - "switch_extruder_retraction_speeds": {"value": "(retraction_speed)"}, - "switch_extruder_prime_speed": {"value": "(retraction_prime_speed)"}, - - "speed_print": {"value": "50"}, - "speed_infill": {"value": "speed_print"}, - "speed_wall": {"value": "(speed_print/5*3) if speed_print > 45 else speed_print"}, - "speed_wall_x": {"value": "speed_wall"}, - "speed_layer_0": {"value": "(speed_print/5*4) if speed_print > 45 else speed_print"}, - "speed_topbottom": {"value": "speed_layer_0"}, - "speed_travel": {"value": "150"}, - "speed_travel_layer_0": {"value": "speed_travel"}, - "speed_support_interface": {"value": "speed_topbottom"}, - "speed_z_hop": {"value": 10}, - "speed_slowdown_layers": {"value": 1}, - "acceleration_print": {"value": 1000}, - "acceleration_travel": {"value": 1000}, - "jerk_print": {"value": 10}, - "jerk_travel": {"value": 10}, - - "retraction_hop_enabled": {"value": false}, - "retraction_hop": {"value": 1}, - "retraction_combing": {"value": "'off'"}, - - "cool_fan_speed": {"value": 0}, - "cool_fan_enabled": {"value": true}, - "cool_min_layer_time_fan_speed_max": {"value": "cool_min_layer_time"}, - "cool_min_layer_time": {"value": 30}, - "cool_min_speed": {"value": "5"}, - "cool_lift_head": {"value": false}, - - "support_infill_rate": {"value": 25}, - "support_z_distance": {"value": 0}, - "support_xy_distance": {"value": 0.4}, - "support_join_distance": {"value": 10}, - "support_interface_pattern": {"value": "'lines'"}, - "support_roof_pattern": {"value": "'concentric'"}, - "support_interface_enable": {"value": true}, - "support_interface_height": {"value": 0.5}, - - "adhesion_type": {"value": "'skirt'"}, - "skirt_gap": {"value": 1}, - "skirt_brim_minimal_length": {"value": 50}, - - "prime_tower_enable": {"value": false }, - "prime_tower_size": {"value": 20.6 }, - "prime_tower_position_x": {"value": 125 }, - "prime_tower_position_y": {"value": 70 }, - "prime_blob_enable": {"default_value": false }, - - "meshfix_maximum_resolution": {"value": 0.01 }, - "meshfix_maximum_travel_resolution":{"value": 0.1 }, - "meshfix_maximum_deviation": {"value": 0.01 }, - - "minimum_polygon_circumference": {"value": 0.05 }, - "coasting_enable": {"value": true}, - "coasting_volume": {"value": 0.1}, - "coasting_min_volume": {"value": 0.17}, - "coasting_speed": {"value": 90}, - "wall_overhang_angle": {"value": 60}, - "bridge_settings_enabled": {"value": true}, - "bridge_wall_min_length": {"value": 3}, - "bridge_skin_support_threshold": {"value": 90}, - "bridge_wall_speed": {"value": 15}, - "bridge_wall_material_flow": {"value": 130}, - "bridge_skin_speed": {"value": 15}, - "bridge_skin_material_flow": {"value": 130}, - "bridge_fan_speed": {"value": 0}, - "bridge_skin_density_2": {"value": 100}, - "bridge_skin_density_3": {"value": 100}, - "bridge_skin_material_flow_2": {"value": 110}, - "bridge_skin_material_flow_3": {"value": 100}, - "bridge_skin_speed_2": {"value": 20}, - "bridge_skin_speed_3": {"value": 30} - } -} From 3b739f8443a30830d605e367e31efbdbd41fe77d Mon Sep 17 00:00:00 2001 From: MaukCC Date: Thu, 16 Jan 2020 16:35:23 +0100 Subject: [PATCH 04/13] Create hms434.def.json --- resources/definitions/hms434.def.json | 202 ++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 resources/definitions/hms434.def.json diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json new file mode 100644 index 0000000000..e5f32283d8 --- /dev/null +++ b/resources/definitions/hms434.def.json @@ -0,0 +1,202 @@ +{ + "name": "HMS434", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Scheepers", + "manufacturer": "Hybrid AM Systems", + "file_formats": "text/x-gcode", + + "has_materials": true, + "exclude_materials": [ + "chromatik_pla", + "dsm_arnitel2045_175", "dsm_novamid1070_175", + "emotiontech_abs", "emotiontech_asax", "emotiontech_hips", "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", "generic_abs_175", "generic_cpe_175", "generic_hips_175", "generic_nylon_175", "generic_pc_175", "generic_petg_175", "generic_pla_175", "generic_pva_175", "generic_tpu_175", + "imade3d_petg_175", "imade3d_pla_175", + "innofill_innoflex60_175", + "leapfrog_abs_natural", "leapfrog_epla_natural","leapfrog_pva_natural", + "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", + "preferred_variant_name": "0.4mm TP extruder", + + "has_machine_quality": true, + "preferred_quality_type": "normal", + + "machine_extruder_trains": + { + "0": "hms434_tool_1", + "1": "hms434_tool_2", + "2": "hms434_tool_3", + "3": "hms434_tool_4", + "4": "hms434_tool_5", + "5": "hms434_tool_6", + "6": "hms434_tool_7", + "7": "hms434_tool_8" + }, + "platform": "hms_platform.obj", + "platform_offset": [ 26, -13.2, 162.5], + "platform_texture": "hms434.png", + "first_start_actions": ["MachineSettingsAction"], + "supported_actions": ["MachineSettingsAction"] + }, + + "overrides": { + "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": false }, + "material_bed_temp_wait": {"default_value": false }, + "machine_max_feedrate_z": {"default_value": 10 }, + "machine_acceleration": {"default_value": 180 }, + "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\nM140 S{material_bed_temperature_layer_0}\n\nM117 Homing Y ......\nG28 Y\nM117 Homing X ......\nG28 X\nM117 Homing Z ......\nG28 Z F100\n\nG1 Z10 F900\nG1 X-30 Y100 F12000\n\nM190 S{material_bed_temperature_layer_0}\nM117 HMS434 Printing ...\n\n" }, + "machine_end_gcode": {"default_value": "" }, + + "retraction_extra_prime_amount": {"minimum_value_warning": "-2.0" }, + "optimize_wall_printing_order": {"default_value": true }, + "machine_nozzle_heat_up_speed": {"default_value": 12}, + "machine_nozzle_cool_down_speed": {"default_value": 20}, + "machine_min_cool_heat_time_window": {"default_value": 5}, + + "layer_height": {"maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, + "layer_height_0": {"maximum_value": "(0.8 * min(extruderValues('machine_nozzle_size')))" }, + "line_width": {"value": "(machine_nozzle_size + 0.2)" }, + "wall_line_width_0": {"value": "(machine_nozzle_size - 0.05)" }, + "infill_line_width": {"value": "(line_width)" }, + "initial_layer_line_width_factor": {"value": 110 }, + + "wall_thickness": {"value": "(line_width * 3) if infill_sparse_density < 95 else line_width" }, + "roofing_layer_count": {"value": "4" }, + "top_bottom_thickness": {"value": "(layer_height_0 + (layer_height * 3))" }, + "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": true }, + "fill_outline_gaps": {"value": true }, + "z_seam_type": {"value": "'back'"}, + "z_seam_x": {"value": "300"}, + "z_seam_y": {"value": "325"}, + "z_seam_corner": {"value": "'z_seam_corner_inner'"}, + "skin_outline_count": {"value": "0"}, + "ironing_enabled": {"value": true }, + "ironing_line_spacing": {"value": "line_width / 4 * 3"}, + "ironing_flow": {"value": "0"}, + "ironing_inset": {"value": "ironing_line_spacing"}, + "speed_ironing": {"value": "150"}, + + "infill_sparse_density": {"value": 30}, + "infill_pattern": {"value": "'lines'"}, + "infill_overlap": {"value": 5}, + "skin_overlap": {"value": 5}, + "infill_wipe_dist": {"value": 0.0}, + "infill_before_walls": {"value": false}, + + "material_print_temperature_layer_0": {"value": "material_print_temperature"}, + "material_initial_print_temperature": {"value": "material_print_temperature", + "maximum_value_warning": "material_print_temperature + 15"}, + "material_final_print_temperature": {"value": "material_print_temperature"}, + "material_bed_temperature_layer_0": {"value": "material_bed_temperature"}, + "material_flow": {"value": "100"}, + "retraction_enable": {"value": true }, + "retract_at_layer_change": {"value": true }, + "retraction_amount": {"value": "1"}, + "retraction_speed": {"value": "20"}, + "retraction_prime_speed": {"value": "8"}, + "retraction_min_travel": {"value": "(round(line_width * 10))"}, + "switch_extruder_retraction_amount": {"value": 2}, + "switch_extruder_retraction_speeds": {"value": "(retraction_speed)"}, + "switch_extruder_prime_speed": {"value": "(retraction_prime_speed)"}, + + "speed_print": {"value": "50"}, + "speed_infill": {"value": "speed_print"}, + "speed_wall": {"value": "(speed_print/5*3) if speed_print < 51 else speed_print"}, + "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": "150"}, + "speed_travel_layer_0": {"value": "speed_travel"}, + "speed_support_interface": {"value": "speed_topbottom"}, + "speed_z_hop": {"value": 10}, + "speed_slowdown_layers": {"value": 1}, + "acceleration_print": {"value": 1000}, + "acceleration_travel": {"value": 1000}, + "jerk_print": {"value": 10}, + "jerk_travel": {"value": 10}, + + "retraction_hop_enabled": {"value": false}, + "retraction_hop": {"value": 1}, + "retraction_combing": {"value": "'off'"}, + + "cool_fan_speed": {"value": 0}, + "cool_fan_enabled": {"value": true}, + "cool_min_layer_time_fan_speed_max": {"value": "cool_min_layer_time"}, + "cool_min_layer_time": {"value": 20}, + "cool_min_speed": {"value": "10"}, + "cool_lift_head": {"value": false}, + + "support_infill_rate": {"value": 25}, + "support_z_distance": {"value": 0}, + "support_xy_distance": {"value": 0.4}, + "support_join_distance": {"value": 10}, + "support_interface_pattern": {"value": "'lines'"}, + "support_roof_pattern": {"value": "'concentric'"}, + "support_interface_enable": {"value": true}, + "support_interface_height": {"value": 0.5}, + + "adhesion_type": {"value": "'skirt'"}, + "skirt_gap": {"value": 1}, + "skirt_brim_minimal_length": {"value": 50}, + + "prime_tower_enable": {"value": false }, + "prime_tower_size": {"value": 20.6 }, + "prime_tower_position_x": {"value": 125 }, + "prime_tower_position_y": {"value": 70 }, + "prime_blob_enable": {"default_value": false }, + + "meshfix_maximum_resolution": {"value": 0.01 }, + "meshfix_maximum_travel_resolution":{"value": 0.1 }, + "meshfix_maximum_deviation": {"value": 0.01 }, + + "minimum_polygon_circumference": {"value": 0.05 }, + "coasting_enable": {"value": true}, + "coasting_volume": {"value": 0.1}, + "coasting_min_volume": {"value": 0.17}, + "coasting_speed": {"value": 90}, + "wall_overhang_angle": {"value": 60}, + "bridge_settings_enabled": {"value": true}, + "bridge_wall_min_length": {"value": 3}, + "bridge_skin_support_threshold": {"value": 90}, + "bridge_wall_speed": {"value": 15}, + "bridge_wall_material_flow": {"value": 130}, + "bridge_skin_speed": {"value": 15}, + "bridge_skin_material_flow": {"value": 130}, + "bridge_fan_speed": {"value": 0}, + "bridge_skin_density_2": {"value": 100}, + "bridge_skin_density_3": {"value": 100}, + "bridge_skin_material_flow_2": {"value": 110}, + "bridge_skin_material_flow_3": {"value": 100}, + "bridge_skin_speed_2": {"value": 20}, + "bridge_skin_speed_3": {"value": 30} + } +} From 61f5b1a993ab37092eca45adc64cdb874aef8755 Mon Sep 17 00:00:00 2001 From: "jos@mauk.cc" Date: Thu, 16 Jan 2020 16:41:14 +0100 Subject: [PATCH 05/13] HMS434 update excluded materials speed settings --- resources/definitions/hms434.def.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index e5f32283d8..d0a48ada52 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -13,6 +13,7 @@ "chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "emotiontech_abs", "emotiontech_asax", "emotiontech_hips", "emotiontech_petg", "emotiontech_pla", "emotiontech_pva-m", "emotiontech_pva-oks", "emotiontech_pva-s", "emotiontech_tpu98a", + "eSUN_PETG_Black", "eSUN_PETG_Grey", "eSUN_PETG_Purple", "eSUN_PLA_PRO_Black", "eSUN_PLA_PRO_Grey", "eSUN_PLA_PRO_Purple", "eSUN_PLA_PRO_White", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", @@ -130,9 +131,9 @@ "speed_print": {"value": "50"}, "speed_infill": {"value": "speed_print"}, - "speed_wall": {"value": "(speed_print/5*3) if speed_print < 51 else speed_print"}, + "speed_wall": {"value": "(speed_print/5*3) if speed_print > 45 else speed_print"}, "speed_wall_x": {"value": "speed_wall"}, - "speed_layer_0": {"value": "(speed_print/5*4) if speed_print < 51 else speed_print"}, + "speed_layer_0": {"value": "(speed_print/5*4) if speed_print > 45 else speed_print"}, "speed_topbottom": {"value": "speed_layer_0"}, "speed_travel": {"value": "150"}, "speed_travel_layer_0": {"value": "speed_travel"}, @@ -151,8 +152,8 @@ "cool_fan_speed": {"value": 0}, "cool_fan_enabled": {"value": true}, "cool_min_layer_time_fan_speed_max": {"value": "cool_min_layer_time"}, - "cool_min_layer_time": {"value": 20}, - "cool_min_speed": {"value": "10"}, + "cool_min_layer_time": {"value": 30}, + "cool_min_speed": {"value": "5"}, "cool_lift_head": {"value": false}, "support_infill_rate": {"value": 25}, From 5e502115874c4022dd62728d70926341294d44f4 Mon Sep 17 00:00:00 2001 From: "jos@mauk.cc" Date: Tue, 21 Jan 2020 10:29:15 +0100 Subject: [PATCH 06/13] HMS434 update material flow --- resources/definitions/hms434.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index d0a48ada52..be8208a77a 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -119,6 +119,7 @@ "material_final_print_temperature": {"value": "material_print_temperature"}, "material_bed_temperature_layer_0": {"value": "material_bed_temperature"}, "material_flow": {"value": "100"}, + "material_flow_layer_0": {"value": "material_flow"}, "retraction_enable": {"value": true }, "retract_at_layer_change": {"value": true }, "retraction_amount": {"value": "1"}, From c54c79d2db001fdbc1e6260d3fb23e18df3a154b Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Mon, 10 Feb 2020 12:17:43 +0100 Subject: [PATCH 07/13] Fix the "save to removable drive" not appearing CURA-7203 --- .../RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py b/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py index c89bd31e21..8a183c25f4 100644 --- a/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py +++ b/plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py @@ -47,7 +47,10 @@ class WindowsRemovableDrivePlugin(RemovableDrivePlugin.RemovableDrivePlugin): def checkRemovableDrives(self): drives = {} + # The currently available disk drives, e.g.: bitmask = ...1100 <-- ...DCBA bitmask = ctypes.windll.kernel32.GetLogicalDrives() + # Since we are ignoring drives A and B, the bitmask has has to shift twice to the right + bitmask >>= 2 # Check possible drive letters, from C to Z # Note: using ascii_uppercase because we do not want this to change with locale! # Skip A and B, since those drives are typically reserved for floppy disks. From 5beba6050f4d3283a22aab7b0bbef32ffb8c84b8 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 11 Feb 2020 09:52:39 +0100 Subject: [PATCH 08/13] Fix api version checking CURA-7207 --- .../src/CloudSync/CloudPackageChecker.py | 2 +- .../src/CloudSync/SubscribedPackagesModel.py | 22 +++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py b/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py index 14db1a992d..f848f818d7 100644 --- a/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py +++ b/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py @@ -83,7 +83,7 @@ class CloudPackageChecker(QObject): package_discrepancy = list(set(user_subscribed_packages).difference(user_installed_packages)) if package_discrepancy: self._model.addDiscrepancies(package_discrepancy) - self._model.initialize(subscribed_packages_payload) + self._model.initialize(self._package_manager, subscribed_packages_payload) self._handlePackageDiscrepancies() def _handlePackageDiscrepancies(self) -> None: diff --git a/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py b/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py index 614d397d91..f29f23b001 100644 --- a/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py +++ b/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py @@ -2,9 +2,12 @@ # Cura is released under the terms of the LGPLv3 or higher. from PyQt5.QtCore import Qt, pyqtProperty, pyqtSlot + +from UM.PackageManager import PackageManager from UM.Qt.ListModel import ListModel +from UM.Version import Version + from cura import ApplicationMetadata -from UM.Logger import Logger from typing import List, Dict, Any @@ -46,7 +49,7 @@ class SubscribedPackagesModel(ListModel): def getIncompatiblePackages(self) -> List[str]: return [package["package_id"] for package in self._items if not package["is_compatible"]] - def initialize(self, subscribed_packages_payload: List[Dict[str, Any]]) -> None: + def initialize(self, package_manager: PackageManager, subscribed_packages_payload: List[Dict[str, Any]]) -> None: self._items.clear() for item in subscribed_packages_payload: if item["package_id"] not in self._discrepancies: @@ -59,10 +62,9 @@ class SubscribedPackagesModel(ListModel): "md5_hash": item["md5_hash"], "is_dismissed": False, } - if self._sdk_version not in item["sdk_versions"]: - package.update({"is_compatible": False}) - else: - package.update({"is_compatible": True}) + + package.update({"is_compatible": self._is_any_version_compatible(package_manager, item["sdk_versions"])}) + try: package.update({"icon_url": item["icon_url"]}) except KeyError: # There is no 'icon_url" in the response payload for this package @@ -70,4 +72,10 @@ class SubscribedPackagesModel(ListModel): self._items.append(package) self.setItems(self._items) - + @staticmethod + def _is_any_version_compatible(package_manager: PackageManager, api_versions: [str]) -> bool: + """:return: True when any of the provided api versions is compatible""" + for version in api_versions: + if package_manager.isPackageCompatible(Version(version)): + return True + return False From bcf4bc813886fc05f7989a983137a5b3fb688ecb Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 11 Feb 2020 11:02:32 +0100 Subject: [PATCH 09/13] Simplify _is_any_version_compatible It now literally says: for any version, is it compatible? Contributes to issue CURA-7207. --- .../Toolbox/src/CloudSync/SubscribedPackagesModel.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py b/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py index f29f23b001..8e2b4255f0 100644 --- a/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py +++ b/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py @@ -74,8 +74,9 @@ class SubscribedPackagesModel(ListModel): @staticmethod def _is_any_version_compatible(package_manager: PackageManager, api_versions: [str]) -> bool: - """:return: True when any of the provided api versions is compatible""" - for version in api_versions: - if package_manager.isPackageCompatible(Version(version)): - return True - return False + """ + Check a list of version numbers if any of them applies to our + application. + :return: ``True`` when any of the provided API versions is compatible. + """ + return any(package_manager.isPackageCompatible(Version(version)) for version in api_versions) From 0c42b1fdea9d40c90bafc5875e32d3af1556c9d0 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 11 Feb 2020 11:06:33 +0100 Subject: [PATCH 10/13] Code style: Method names with lower camelcase Contributes to issue CURA-7207. --- plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py b/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py index 8e2b4255f0..53a1b0ee71 100644 --- a/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py +++ b/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py @@ -63,7 +63,7 @@ class SubscribedPackagesModel(ListModel): "is_dismissed": False, } - package.update({"is_compatible": self._is_any_version_compatible(package_manager, item["sdk_versions"])}) + package.update({"is_compatible": self._isAnyVersionCompatible(package_manager, item["sdk_versions"])}) try: package.update({"icon_url": item["icon_url"]}) @@ -73,7 +73,7 @@ class SubscribedPackagesModel(ListModel): self.setItems(self._items) @staticmethod - def _is_any_version_compatible(package_manager: PackageManager, api_versions: [str]) -> bool: + def _isAnyVersionCompatible(package_manager: PackageManager, api_versions: [str]) -> bool: """ Check a list of version numbers if any of them applies to our application. From ea9a9d58b17e93eed22923001069fceafea8a798 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 11 Feb 2020 11:09:02 +0100 Subject: [PATCH 11/13] Fix typing of list of API versions Contributes to issue CURA-7207. --- plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py b/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py index 53a1b0ee71..da15c71fdb 100644 --- a/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py +++ b/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py @@ -73,7 +73,7 @@ class SubscribedPackagesModel(ListModel): self.setItems(self._items) @staticmethod - def _isAnyVersionCompatible(package_manager: PackageManager, api_versions: [str]) -> bool: + def _isAnyVersionCompatible(package_manager: PackageManager, api_versions: List[str]) -> bool: """ Check a list of version numbers if any of them applies to our application. From f78359ae7644751686f66775cd6624445e6165da Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 11 Feb 2020 11:09:23 +0100 Subject: [PATCH 12/13] Fix pylint typing CURA-7207 --- plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py b/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py index f29f23b001..5a2738923f 100644 --- a/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py +++ b/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py @@ -73,7 +73,7 @@ class SubscribedPackagesModel(ListModel): self.setItems(self._items) @staticmethod - def _is_any_version_compatible(package_manager: PackageManager, api_versions: [str]) -> bool: + def _is_any_version_compatible(package_manager: PackageManager, api_versions: List[str]) -> bool: """:return: True when any of the provided api versions is compatible""" for version in api_versions: if package_manager.isPackageCompatible(Version(version)): From a33cfdfba63a906ac44e6a7068845aacafb9be72 Mon Sep 17 00:00:00 2001 From: Nino van Hooff Date: Tue, 11 Feb 2020 11:21:28 +0100 Subject: [PATCH 13/13] Simplify package compatibility checking CURA-7207 --- .../Toolbox/src/CloudSync/SubscribedPackagesModel.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py b/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py index da15c71fdb..db16c5ea84 100644 --- a/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py +++ b/plugins/Toolbox/src/CloudSync/SubscribedPackagesModel.py @@ -63,7 +63,8 @@ class SubscribedPackagesModel(ListModel): "is_dismissed": False, } - package.update({"is_compatible": self._isAnyVersionCompatible(package_manager, item["sdk_versions"])}) + compatible = any(package_manager.isPackageCompatible(Version(version)) for version in item["sdk_versions"]) + package.update({"is_compatible": compatible}) try: package.update({"icon_url": item["icon_url"]}) @@ -71,12 +72,3 @@ class SubscribedPackagesModel(ListModel): package.update({"icon_url": ""}) self._items.append(package) self.setItems(self._items) - - @staticmethod - def _isAnyVersionCompatible(package_manager: PackageManager, api_versions: List[str]) -> bool: - """ - Check a list of version numbers if any of them applies to our - application. - :return: ``True`` when any of the provided API versions is compatible. - """ - return any(package_manager.isPackageCompatible(Version(version)) for version in api_versions)