From b6ab52ed0b880b73fa834747bef4f60788e13950 Mon Sep 17 00:00:00 2001 From: just-trey Date: Fri, 16 Dec 2022 11:37:14 -0500 Subject: [PATCH 1/5] reset xy_offset_layer_0 to defaults --- resources/definitions/ankermake_m5.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/ankermake_m5.def.json b/resources/definitions/ankermake_m5.def.json index ec3b01d198..d1890c269a 100644 --- a/resources/definitions/ankermake_m5.def.json +++ b/resources/definitions/ankermake_m5.def.json @@ -27,7 +27,6 @@ "machine_heated_bed": { "default_value": true }, "gantry_height": { "value": 25 }, - "xy_offset_layer_0": { "value": -0.2 }, "hole_xy_offset": { "value": 0.2 }, "top_bottom_thickness": { "value": "layer_height * 4" }, From 43cf00c63145dde11c160648feb6105e1725d79f Mon Sep 17 00:00:00 2001 From: just-trey Date: Mon, 19 Dec 2022 23:06:20 -0500 Subject: [PATCH 2/5] fix brim issue and acceleration enhancements --- resources/definitions/ankermake_m5.def.json | 26 ++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/resources/definitions/ankermake_m5.def.json b/resources/definitions/ankermake_m5.def.json index d1890c269a..ea2a332be7 100644 --- a/resources/definitions/ankermake_m5.def.json +++ b/resources/definitions/ankermake_m5.def.json @@ -68,8 +68,32 @@ "speed_support_roof": { "maximum_value_warning": 255 }, "speed_support_bottom": { "maximum_value_warning": 255 }, "speed_topbottom": { "value": 150.0 }, - "acceleration_print": { "value": "2500" }, "speed_travel": { "value": 250.0 }, + "acceleration_enabled": { "value": "true" }, + "acceleration_print": { "maximum_value_warning": "2500", "value": "2500" }, + "acceleration_infill": { "maximum_value_warning": "2500" }, + "acceleration_wall": { "maximum_value_warning": "2500" }, + "acceleration_wall_0": { "maximum_value_warning": "2500" }, + "acceleration_wall_x": { "maximum_value_warning": "2500" }, + "acceleration_roofing": { "maximum_value_warning": "2500" }, + "acceleration_topbottom": { "maximum_value_warning": "2500" }, + "acceleration_support": { "maximum_value_warning": "2500" }, + "acceleration_support_infill": { "maximum_value_warning": "2500" }, + "acceleration_support_interface": { "maximum_value_warning": "2500" }, + "acceleration_support_roof": { "maximum_value_warning": "2500" }, + "acceleration_support_bottom": { "maximum_value_warning": "2500" }, + "acceleration_prime_tower": { "maximum_value_warning": "2500" }, + "acceleration_travel": { + "maximum_value_warning": "2500", + "value": "acceleration_print" + }, + "acceleration_layer_0": { "maximum_value_warning": "2500" }, + "acceleration_print_layer_0": { "maximum_value_warning": "2500" }, + "acceleration_travel_layer_0": { + "maximum_value_warning": "2500", + "value": "acceleration_travel" + }, + "acceleration_skirt_brim": { "maximum_value_warning": "2500" }, "retraction_amount": { "default_value": 1.5 }, "retraction_speed": { "default_value": 60 }, From 0c47a8da9c8e5045e320263c031ed4b5529b85f3 Mon Sep 17 00:00:00 2001 From: just-trey Date: Mon, 19 Dec 2022 23:16:32 -0500 Subject: [PATCH 3/5] resovel conflict --- resources/definitions/ankermake_m5.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/ankermake_m5.def.json b/resources/definitions/ankermake_m5.def.json index ea2a332be7..1b7d355337 100644 --- a/resources/definitions/ankermake_m5.def.json +++ b/resources/definitions/ankermake_m5.def.json @@ -14,7 +14,6 @@ "preferred_material": "generic_pla", "preferred_quality_type": "normal" }, - "overrides": { "machine_name": { "default_value": "AnkerMake M5" }, "machine_start_gcode": { From b00388cf9ff32fc496dca4b4cc11ca39c43b1aa9 Mon Sep 17 00:00:00 2001 From: just-trey Date: Mon, 19 Dec 2022 23:19:25 -0500 Subject: [PATCH 4/5] fix merge issue --- resources/definitions/ankermake_m5.def.json | 97 --------------------- 1 file changed, 97 deletions(-) diff --git a/resources/definitions/ankermake_m5.def.json b/resources/definitions/ankermake_m5.def.json index 6ccc718db8..1b7d355337 100644 --- a/resources/definitions/ankermake_m5.def.json +++ b/resources/definitions/ankermake_m5.def.json @@ -131,100 +131,3 @@ "small_hole_max_size": { "value": 10 } } } -======= - "version": 2, - "name": "AnkerMake M5", - "inherits": "fdmprinter", - "metadata": - { - "visible": true, - "author": "just-trey", - "manufacturer": "AnkerMake", - "file_formats": "text/x-gcode", - "platform": "ankermake_m5_platform.obj", - "has_machine_quality": true, - "machine_extruder_trains": { "0": "ankermake_m5_extruder_0" }, - "platform_texture": "ankermake_m5.png", - "preferred_material": "generic_pla", - "preferred_quality_type": "normal" - }, - "overrides": - { - "acceleration_print": { "value": "2500" }, - "adhesion_type": { "default_value": "skirt" }, - "cool_min_layer_time": { "value": 6 }, - "cool_min_speed": { "value": 30 }, - "gantry_height": { "value": 25 }, - "hole_xy_offset": { "value": 0.2 }, - "infill_pattern": { "value": "'lines' if infill_sparse_density >= 25 else 'grid'" }, - "infill_sparse_density": { "value": 25 }, - "machine_depth": { "default_value": 235 }, - "machine_heated_bed": { "default_value": true }, - "machine_height": { "default_value": 250 }, - "machine_name": { "default_value": "AnkerMake M5" }, - "machine_start_gcode": { "default_value": "M104 S{material_print_temperature_layer_0} ; set final nozzle temp\nM190 S{material_bed_temperature_layer_0} ; set and wait for nozzle temp to stabilize\nM109 S{material_print_temperature_layer_0} ; wait for nozzle temp to stabilize\nG28 ;Home\nG1 E10 F3600; push out retracted filament(fix for over retraction after prime)" }, - "machine_width": { "default_value": 235 }, - "material_bed_temperature": { "maximum_value_warning": "110" }, - "material_bed_temperature_layer_0": { "maximum_value_warning": "110" }, - "material_diameter": { "default_value": 1.75 }, - "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow_layer_0": { "value": 115 }, - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "material_print_temperature": { "maximum_value_warning": "260" }, - "material_print_temperature_layer_0": - { - "maximum_value_warning": "270", - "value": "material_print_temperature + 5" - }, - "minimum_interface_area": { "value": 10 }, - "minimum_support_area": { "value": 2 }, - "retraction_amount": { "default_value": 1.5 }, - "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" }, - "retraction_hop": { "value": 0.2 }, - "retraction_speed": { "default_value": 60 }, - "skin_material_flow": { "value": 97 }, - "skin_monotonic": { "default_value": true }, - "skirt_line_count": { "value": 3 }, - "small_hole_max_size": { "value": 10 }, - "speed_infill": { "maximum_value_warning": 255 }, - "speed_print": - { - "maximum_value_warning": 255, - "value": 250.0 - }, - "speed_support": { "maximum_value_warning": 255 }, - "speed_support_bottom": { "maximum_value_warning": 255 }, - "speed_support_infill": { "maximum_value_warning": 255 }, - "speed_support_interface": { "maximum_value_warning": 255 }, - "speed_support_roof": { "maximum_value_warning": 255 }, - "speed_topbottom": { "value": 150.0 }, - "speed_travel": { "value": 250.0 }, - "speed_wall": - { - "maximum_value_warning": 255, - "value": 150.0 - }, - "speed_wall_x": - { - "maximum_value_warning": 255, - "value": 250.0 - }, - "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 /layer_height)))" }, - "support_brim_width": { "value": 4.0 }, - "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, - "support_interface_density": { "value": 33.333 }, - "support_interface_enable": { "value": true }, - "support_interface_pattern": { "value": "'grid'" }, - "support_interface_skip_height": { "value": 0.2 }, - "support_roof_enable": { "value": true }, - "support_xy_distance": { "value": "wall_line_width_0 * 2" }, - "support_xy_distance_overhang": { "value": "wall_line_width_0" }, - "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, - "support_z_distance": { "value": "layer_height * 2" }, - "top_bottom_thickness": { "value": "layer_height * 4" }, - "wall_overhang_angle": { "value": 55 }, - "wall_overhang_speed_factor": { "value": 55 }, - "xy_offset_layer_0": { "value": -0.2 }, - "zig_zaggify_infill": { "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_pattern == 'lines'" } - } -} \ No newline at end of file From c88b2030965881a34deb5a8afcb4e50b44a73f67 Mon Sep 17 00:00:00 2001 From: just-trey Date: Tue, 20 Dec 2022 04:20:38 +0000 Subject: [PATCH 5/5] Applied printer-linter format --- resources/definitions/ankermake_m5.def.json | 255 ++++++++++---------- 1 file changed, 124 insertions(+), 131 deletions(-) diff --git a/resources/definitions/ankermake_m5.def.json b/resources/definitions/ankermake_m5.def.json index 1b7d355337..6d8b0b15e9 100644 --- a/resources/definitions/ankermake_m5.def.json +++ b/resources/definitions/ankermake_m5.def.json @@ -1,133 +1,126 @@ { - "version": 2, - "name": "AnkerMake M5", - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "just-trey", - "manufacturer": "AnkerMake", - "file_formats": "text/x-gcode", - "platform": "ankermake_m5_platform.obj", - "has_machine_quality": true, - "machine_extruder_trains": { "0": "ankermake_m5_extruder_0" }, - "platform_texture": "ankermake_m5.png", - "preferred_material": "generic_pla", - "preferred_quality_type": "normal" - }, - "overrides": { - "machine_name": { "default_value": "AnkerMake M5" }, - "machine_start_gcode": { - "default_value": "M104 S{material_print_temperature_layer_0} ; set final nozzle temp\nM190 S{material_bed_temperature_layer_0} ; set and wait for nozzle temp to stabilize\nM109 S{material_print_temperature_layer_0} ; wait for nozzle temp to stabilize\nG28 ;Home\nG1 E10 F3600; push out retracted filament(fix for over retraction after prime)" + "version": 2, + "name": "AnkerMake M5", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "just-trey", + "manufacturer": "AnkerMake", + "file_formats": "text/x-gcode", + "platform": "ankermake_m5_platform.obj", + "has_machine_quality": true, + "machine_extruder_trains": { "0": "ankermake_m5_extruder_0" }, + "platform_texture": "ankermake_m5.png", + "preferred_material": "generic_pla", + "preferred_quality_type": "normal" }, - "material_diameter": { "default_value": 1.75 }, - "machine_width": { "default_value": 235 }, - "machine_depth": { "default_value": 235 }, - "machine_height": { "default_value": 250 }, - "machine_heated_bed": { "default_value": true }, - "gantry_height": { "value": 25 }, - - "hole_xy_offset": { "value": 0.2 }, - - "top_bottom_thickness": { "value": "layer_height * 4" }, - "skin_monotonic": { "default_value": true }, - - "infill_sparse_density": { "value": 25 }, - "infill_pattern": { - "value": "'lines' if infill_sparse_density >= 25 else 'grid'" - }, - "zig_zaggify_infill": { - "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_pattern == 'lines'" - }, - - "material_print_temperature": { - "maximum_value_warning": "260" - }, - "material_print_temperature_layer_0": { - "value": "material_print_temperature + 5", - "maximum_value_warning": "270" - }, - "material_initial_print_temperature": { - "value": "material_print_temperature" - }, - "material_final_print_temperature": { - "value": "material_print_temperature" - }, - "material_bed_temperature": { "maximum_value_warning": "110" }, - "material_bed_temperature_layer_0": { "maximum_value_warning": "110" }, - "skin_material_flow": { "value": 97 }, - "material_flow_layer_0": { "value": 115 }, - - "speed_print": { "value": 250.0, "maximum_value_warning": 255 }, - "speed_infill": { "maximum_value_warning": 255 }, - "speed_wall": { "value": 150.0, "maximum_value_warning": 255 }, - "speed_wall_x": { "value": 250.0, "maximum_value_warning": 255 }, - "speed_support": { "maximum_value_warning": 255 }, - "speed_support_infill": { "maximum_value_warning": 255 }, - "speed_support_interface": { "maximum_value_warning": 255 }, - "speed_support_roof": { "maximum_value_warning": 255 }, - "speed_support_bottom": { "maximum_value_warning": 255 }, - "speed_topbottom": { "value": 150.0 }, - "speed_travel": { "value": 250.0 }, - "acceleration_enabled": { "value": "true" }, - "acceleration_print": { "maximum_value_warning": "2500", "value": "2500" }, - "acceleration_infill": { "maximum_value_warning": "2500" }, - "acceleration_wall": { "maximum_value_warning": "2500" }, - "acceleration_wall_0": { "maximum_value_warning": "2500" }, - "acceleration_wall_x": { "maximum_value_warning": "2500" }, - "acceleration_roofing": { "maximum_value_warning": "2500" }, - "acceleration_topbottom": { "maximum_value_warning": "2500" }, - "acceleration_support": { "maximum_value_warning": "2500" }, - "acceleration_support_infill": { "maximum_value_warning": "2500" }, - "acceleration_support_interface": { "maximum_value_warning": "2500" }, - "acceleration_support_roof": { "maximum_value_warning": "2500" }, - "acceleration_support_bottom": { "maximum_value_warning": "2500" }, - "acceleration_prime_tower": { "maximum_value_warning": "2500" }, - "acceleration_travel": { - "maximum_value_warning": "2500", - "value": "acceleration_print" - }, - "acceleration_layer_0": { "maximum_value_warning": "2500" }, - "acceleration_print_layer_0": { "maximum_value_warning": "2500" }, - "acceleration_travel_layer_0": { - "maximum_value_warning": "2500", - "value": "acceleration_travel" - }, - "acceleration_skirt_brim": { "maximum_value_warning": "2500" }, - - "retraction_amount": { "default_value": 1.5 }, - "retraction_speed": { "default_value": 60 }, - "retraction_combing": { - "value": "'off' if retraction_hop_enabled else 'infill'" - }, - "retraction_hop": { "value": 0.2 }, - - "cool_min_layer_time": { "value": 6 }, - "cool_min_speed": { "value": 30 }, - - "support_angle": { - "value": "math.floor(math.degrees(math.atan(line_width / 2.0 /layer_height)))" - }, - "support_infill_rate": { - "value": "0 if support_enable and support_structure == 'tree' else 20" - }, - "support_z_distance": { "value": "layer_height * 2" }, - "support_xy_distance": { "value": "wall_line_width_0 * 2" }, - "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, - "support_xy_distance_overhang": { "value": "wall_line_width_0" }, - "support_brim_width": { "value": 4.0 }, - "minimum_support_area": { "value": 2 }, - "support_interface_enable": { "value": true }, - "support_roof_enable": { "value": true }, - "support_interface_skip_height": { "value": 0.2 }, - "support_interface_density": { "value": 33.333 }, - "support_interface_pattern": { "value": "'grid'" }, - "minimum_interface_area": { "value": 10 }, - - "adhesion_type": { "default_value": "skirt" }, - "skirt_line_count": { "value": 3 }, - - "wall_overhang_angle": { "value": 55 }, - "wall_overhang_speed_factor": { "value": 55 }, - "small_hole_max_size": { "value": 10 } - } -} + "overrides": + { + "acceleration_enabled": { "value": "true" }, + "acceleration_infill": { "maximum_value_warning": "2500" }, + "acceleration_layer_0": { "maximum_value_warning": "2500" }, + "acceleration_prime_tower": { "maximum_value_warning": "2500" }, + "acceleration_print": + { + "maximum_value_warning": "2500", + "value": "2500" + }, + "acceleration_print_layer_0": { "maximum_value_warning": "2500" }, + "acceleration_roofing": { "maximum_value_warning": "2500" }, + "acceleration_skirt_brim": { "maximum_value_warning": "2500" }, + "acceleration_support": { "maximum_value_warning": "2500" }, + "acceleration_support_bottom": { "maximum_value_warning": "2500" }, + "acceleration_support_infill": { "maximum_value_warning": "2500" }, + "acceleration_support_interface": { "maximum_value_warning": "2500" }, + "acceleration_support_roof": { "maximum_value_warning": "2500" }, + "acceleration_topbottom": { "maximum_value_warning": "2500" }, + "acceleration_travel": + { + "maximum_value_warning": "2500", + "value": "acceleration_print" + }, + "acceleration_travel_layer_0": + { + "maximum_value_warning": "2500", + "value": "acceleration_travel" + }, + "acceleration_wall": { "maximum_value_warning": "2500" }, + "acceleration_wall_0": { "maximum_value_warning": "2500" }, + "acceleration_wall_x": { "maximum_value_warning": "2500" }, + "adhesion_type": { "default_value": "skirt" }, + "cool_min_layer_time": { "value": 6 }, + "cool_min_speed": { "value": 30 }, + "gantry_height": { "value": 25 }, + "hole_xy_offset": { "value": 0.2 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density >= 25 else 'grid'" }, + "infill_sparse_density": { "value": 25 }, + "machine_depth": { "default_value": 235 }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "AnkerMake M5" }, + "machine_start_gcode": { "default_value": "M104 S{material_print_temperature_layer_0} ; set final nozzle temp\nM190 S{material_bed_temperature_layer_0} ; set and wait for nozzle temp to stabilize\nM109 S{material_print_temperature_layer_0} ; wait for nozzle temp to stabilize\nG28 ;Home\nG1 E10 F3600; push out retracted filament(fix for over retraction after prime)" }, + "machine_width": { "default_value": 235 }, + "material_bed_temperature": { "maximum_value_warning": "110" }, + "material_bed_temperature_layer_0": { "maximum_value_warning": "110" }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_flow_layer_0": { "value": 115 }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_print_temperature": { "maximum_value_warning": "260" }, + "material_print_temperature_layer_0": + { + "maximum_value_warning": "270", + "value": "material_print_temperature + 5" + }, + "minimum_interface_area": { "value": 10 }, + "minimum_support_area": { "value": 2 }, + "retraction_amount": { "default_value": 1.5 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'infill'" }, + "retraction_hop": { "value": 0.2 }, + "retraction_speed": { "default_value": 60 }, + "skin_material_flow": { "value": 97 }, + "skin_monotonic": { "default_value": true }, + "skirt_line_count": { "value": 3 }, + "small_hole_max_size": { "value": 10 }, + "speed_infill": { "maximum_value_warning": 255 }, + "speed_print": + { + "maximum_value_warning": 255, + "value": 250.0 + }, + "speed_support": { "maximum_value_warning": 255 }, + "speed_support_bottom": { "maximum_value_warning": 255 }, + "speed_support_infill": { "maximum_value_warning": 255 }, + "speed_support_interface": { "maximum_value_warning": 255 }, + "speed_support_roof": { "maximum_value_warning": 255 }, + "speed_topbottom": { "value": 150.0 }, + "speed_travel": { "value": 250.0 }, + "speed_wall": + { + "maximum_value_warning": 255, + "value": 150.0 + }, + "speed_wall_x": + { + "maximum_value_warning": 255, + "value": 250.0 + }, + "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 /layer_height)))" }, + "support_brim_width": { "value": 4.0 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_enable": { "value": true }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "support_roof_enable": { "value": true }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, + "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, + "support_z_distance": { "value": "layer_height * 2" }, + "top_bottom_thickness": { "value": "layer_height * 4" }, + "wall_overhang_angle": { "value": 55 }, + "wall_overhang_speed_factor": { "value": 55 }, + "zig_zaggify_infill": { "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_pattern == 'lines'" } + } +} \ No newline at end of file