From 0e008064d1982ee3f16a3ba6726206d231e867b5 Mon Sep 17 00:00:00 2001 From: Eazao Date: Wed, 26 Jul 2023 22:05:23 +0800 Subject: [PATCH 01/54] Add new 3D printer Eazao M500, M600, M700 to Cura --- resources/definitions/eazao_m500.def.json | 43 +++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 resources/definitions/eazao_m500.def.json diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json new file mode 100644 index 0000000000..256cc4b833 --- /dev/null +++ b/resources/definitions/eazao_m500.def.json @@ -0,0 +1,43 @@ +{ + "version": 2, + "name": "Eazao Matrix", + "inherits": "eazao", + "metadata": + { + "visible": true, + "author": "Eazao", + "manufacturer": "Eazao", + "file_formats": "text/x-gcode", + "exclude_materials": "generic_pla", + "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": { "0": "eazao_matrix_extruder_0" }, + "weight": 4 + }, + "overrides": + { + "cool_fan_speed_0": { "value": 0 }, + "gantry_height": { "value": "55" }, + "infill_before_walls": { "value": "False" }, + "layer_height_0": { "value": 0.3 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 320 }, + "machine_end_gcode": { "value": "G92 Z0\nG1 F1500 Z10\nG28 X0 Y300 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-75, 35], + [-75, -18], + [18, 35], + [18, -18] + ] + }, + "machine_height": { "default_value": 520 }, + "machine_name": { "default_value": "Eazao M500" }, + "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.85; Set Mix Factor\nM163 S1 P0.15; Set Mix Factor\nM164 S0" }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 320 }, + "speed_slowdown_layers": { "value": 2 } + } +} \ No newline at end of file From d6a78abcc7def7f7b1fb7c262cd448222b2b3068 Mon Sep 17 00:00:00 2001 From: Eazao Date: Wed, 26 Jul 2023 22:06:07 +0800 Subject: [PATCH 02/54] Add new 3D printer Eazao Matrix extruder to Cura --- .../extruders/eazao_matrix_extruder_0.def.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 resources/extruders/eazao_matrix_extruder_0.def.json diff --git a/resources/extruders/eazao_matrix_extruder_0.def.json b/resources/extruders/eazao_matrix_extruder_0.def.json new file mode 100644 index 0000000000..6f95c06cc9 --- /dev/null +++ b/resources/extruders/eazao_matrix_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "eazao_m500", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 2.3 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file From f27fed1647d0c8ff0dad105e45cbf8a2e2167fb3 Mon Sep 17 00:00:00 2001 From: Eazao Date: Wed, 26 Jul 2023 22:28:22 +0800 Subject: [PATCH 03/54] Delete eazao_m500.def.json --- resources/definitions/eazao_m500.def.json | 43 ----------------------- 1 file changed, 43 deletions(-) delete mode 100644 resources/definitions/eazao_m500.def.json diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json deleted file mode 100644 index 256cc4b833..0000000000 --- a/resources/definitions/eazao_m500.def.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "version": 2, - "name": "Eazao Matrix", - "inherits": "eazao", - "metadata": - { - "visible": true, - "author": "Eazao", - "manufacturer": "Eazao", - "file_formats": "text/x-gcode", - "exclude_materials": "generic_pla", - "has_machine_quality": true, - "has_materials": true, - "machine_extruder_trains": { "0": "eazao_matrix_extruder_0" }, - "weight": 4 - }, - "overrides": - { - "cool_fan_speed_0": { "value": 0 }, - "gantry_height": { "value": "55" }, - "infill_before_walls": { "value": "False" }, - "layer_height_0": { "value": 0.3 }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 320 }, - "machine_end_gcode": { "value": "G92 Z0\nG1 F1500 Z10\nG28 X0 Y300 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_head_with_fans_polygon": - { - "default_value": [ - [-75, 35], - [-75, -18], - [18, 35], - [18, -18] - ] - }, - "machine_height": { "default_value": 520 }, - "machine_name": { "default_value": "Eazao M500" }, - "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.85; Set Mix Factor\nM163 S1 P0.15; Set Mix Factor\nM164 S0" }, - "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, - "machine_width": { "default_value": 320 }, - "speed_slowdown_layers": { "value": 2 } - } -} \ No newline at end of file From f589bc8f20c79816eadd455acdae16ff20a6b847 Mon Sep 17 00:00:00 2001 From: Eazao Date: Wed, 26 Jul 2023 22:28:51 +0800 Subject: [PATCH 04/54] Delete eazao_matrix_extruder_0.def.json --- .../extruders/eazao_matrix_extruder_0.def.json | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 resources/extruders/eazao_matrix_extruder_0.def.json diff --git a/resources/extruders/eazao_matrix_extruder_0.def.json b/resources/extruders/eazao_matrix_extruder_0.def.json deleted file mode 100644 index 6f95c06cc9..0000000000 --- a/resources/extruders/eazao_matrix_extruder_0.def.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": - { - "machine": "eazao_m500", - "position": "0" - }, - "overrides": - { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 2.3 }, - "material_diameter": { "default_value": 1.75 } - } -} \ No newline at end of file From 1a6ddd9ff072e8599c3f4a88588636391b2f9363 Mon Sep 17 00:00:00 2001 From: Eazao Date: Wed, 26 Jul 2023 22:29:18 +0800 Subject: [PATCH 05/54] Add files via upload --- .../extruders/eazao_matrix_extruder_0.def.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 resources/extruders/eazao_matrix_extruder_0.def.json diff --git a/resources/extruders/eazao_matrix_extruder_0.def.json b/resources/extruders/eazao_matrix_extruder_0.def.json new file mode 100644 index 0000000000..6729ff222a --- /dev/null +++ b/resources/extruders/eazao_matrix_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "eazao_matrix", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 2.3 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file From 8bf03e548af869aa7e7c809d8ea8b073a731ae32 Mon Sep 17 00:00:00 2001 From: Eazao Date: Wed, 26 Jul 2023 22:29:50 +0800 Subject: [PATCH 06/54] Add files via upload --- resources/definitions/eazao_m500.def.json | 81 +++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 resources/definitions/eazao_m500.def.json diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json new file mode 100644 index 0000000000..c97143849c --- /dev/null +++ b/resources/definitions/eazao_m500.def.json @@ -0,0 +1,81 @@ +{ + "version": 2, + "name": "Eazao M500", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Eazao", + "manufacturer": "Eazao", + "file_formats": "text/x-gcode", + "has_machine_quality": false, + "has_materials": true, + "machine_extruder_trains": { "0": "eazao_matrix_extruder_0" }, + "preferred_material": "generic_pla", + "preferred_quality_type": "normal" + }, + "overrides": + { + "acceleration_enabled": { "value": false }, + "acceleration_print": { "value": 300 }, + "acceleration_travel": { "value": 300 }, + "adhesion_type": { "default_value": "none" }, + "bottom_layers": { "value": 2 }, + "cool_fan_enabled": { "value": false }, + "infill_sparse_density": { "value": 0 }, + "initial_bottom_layers": { "value": 2 }, + "jerk_enabled": { "value": false }, + "jerk_print": { "value": 10 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + "layer_height": { "value": 1.0 }, + "layer_height_0": { "value": 1.0 }, + "line_width": { "value": 3.0 }, + "machine_acceleration": { "value": 300 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 320 }, + "machine_end_gcode": { "default_value": "G92 Z0\nG1 F1500 Z10\nG28 X0 Y300 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 520 }, + "machine_max_acceleration_e": { "value": 500 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 50 }, + "machine_max_feedrate_e": { "value": 25 }, + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 5 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_name": { "default_value": "Eazao M500" }, + "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.85; Set Mix Factor\nM163 S1 P0.15; Set Mix Factor\nM164 S0" }, + "machine_width": { "default_value": 320 }, + "material_final_print_temperature": { "value": "0" }, + "material_initial_print_temperature": { "value": "0" }, + "material_print_temperature": { "value": "0" }, + "material_print_temperature_layer_0": { "value": "0" }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "value": 7 }, + "retraction_combing": { "value": "'noskin'" }, + "retraction_combing_max_distance": { "value": 0 }, + "retraction_count_max": { "value": 100 }, + "retraction_enable": { "value": false }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_hop": { "value": 0.2 }, + "retraction_hop_enabled": { "value": false }, + "retraction_speed": { "value": 25 }, + "speed_print": { "value": 20.0 }, + "speed_travel": { "value": 20.0 }, + "speed_wall": { "value": 20.0 }, + "speed_wall_0": { "value": 20.0 }, + "speed_wall_x": { "value": 20.0 }, + "speed_z_hop": { "value": "machine_max_feedrate_z" }, + "top_bottom_thickness": { "value": 0 }, + "travel_avoid_other_parts": { "value": true }, + "travel_avoid_supports": { "value": false }, + "travel_retract_before_outer_wall": { "value": false }, + "wall_thickness": { "value": 3.0 } + } +} \ No newline at end of file From e84c30580f52a9a952f593117aa54230b66df761 Mon Sep 17 00:00:00 2001 From: Eazao Date: Wed, 26 Jul 2023 22:42:47 +0800 Subject: [PATCH 07/54] Delete eazao_m500.def.json --- resources/definitions/eazao_m500.def.json | 81 ----------------------- 1 file changed, 81 deletions(-) delete mode 100644 resources/definitions/eazao_m500.def.json diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json deleted file mode 100644 index c97143849c..0000000000 --- a/resources/definitions/eazao_m500.def.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "version": 2, - "name": "Eazao M500", - "inherits": "fdmprinter", - "metadata": - { - "visible": true, - "author": "Eazao", - "manufacturer": "Eazao", - "file_formats": "text/x-gcode", - "has_machine_quality": false, - "has_materials": true, - "machine_extruder_trains": { "0": "eazao_matrix_extruder_0" }, - "preferred_material": "generic_pla", - "preferred_quality_type": "normal" - }, - "overrides": - { - "acceleration_enabled": { "value": false }, - "acceleration_print": { "value": 300 }, - "acceleration_travel": { "value": 300 }, - "adhesion_type": { "default_value": "none" }, - "bottom_layers": { "value": 2 }, - "cool_fan_enabled": { "value": false }, - "infill_sparse_density": { "value": 0 }, - "initial_bottom_layers": { "value": 2 }, - "jerk_enabled": { "value": false }, - "jerk_print": { "value": 10 }, - "jerk_travel": { "value": "jerk_print" }, - "jerk_travel_layer_0": { "value": "jerk_travel" }, - "layer_height": { "value": 1.0 }, - "layer_height_0": { "value": 1.0 }, - "line_width": { "value": 3.0 }, - "machine_acceleration": { "value": 300 }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 320 }, - "machine_end_gcode": { "default_value": "G92 Z0\nG1 F1500 Z10\nG28 X0 Y300 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_heated_bed": { "default_value": false }, - "machine_height": { "default_value": 520 }, - "machine_max_acceleration_e": { "value": 500 }, - "machine_max_acceleration_x": { "value": 500 }, - "machine_max_acceleration_y": { "value": 500 }, - "machine_max_acceleration_z": { "value": 50 }, - "machine_max_feedrate_e": { "value": 25 }, - "machine_max_feedrate_x": { "value": 100 }, - "machine_max_feedrate_y": { "value": 100 }, - "machine_max_feedrate_z": { "value": 5 }, - "machine_max_jerk_e": { "value": 5 }, - "machine_max_jerk_xy": { "value": 10 }, - "machine_max_jerk_z": { "value": 0.3 }, - "machine_name": { "default_value": "Eazao M500" }, - "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.85; Set Mix Factor\nM163 S1 P0.15; Set Mix Factor\nM164 S0" }, - "machine_width": { "default_value": 320 }, - "material_final_print_temperature": { "value": "0" }, - "material_initial_print_temperature": { "value": "0" }, - "material_print_temperature": { "value": "0" }, - "material_print_temperature_layer_0": { "value": "0" }, - "optimize_wall_printing_order": { "value": "True" }, - "retraction_amount": { "value": 7 }, - "retraction_combing": { "value": "'noskin'" }, - "retraction_combing_max_distance": { "value": 0 }, - "retraction_count_max": { "value": 100 }, - "retraction_enable": { "value": false }, - "retraction_extrusion_window": { "value": 10 }, - "retraction_hop": { "value": 0.2 }, - "retraction_hop_enabled": { "value": false }, - "retraction_speed": { "value": 25 }, - "speed_print": { "value": 20.0 }, - "speed_travel": { "value": 20.0 }, - "speed_wall": { "value": 20.0 }, - "speed_wall_0": { "value": 20.0 }, - "speed_wall_x": { "value": 20.0 }, - "speed_z_hop": { "value": "machine_max_feedrate_z" }, - "top_bottom_thickness": { "value": 0 }, - "travel_avoid_other_parts": { "value": true }, - "travel_avoid_supports": { "value": false }, - "travel_retract_before_outer_wall": { "value": false }, - "wall_thickness": { "value": 3.0 } - } -} \ No newline at end of file From d8ef5255f19f408c1b59efe541d655eddba48b82 Mon Sep 17 00:00:00 2001 From: Eazao Date: Wed, 26 Jul 2023 22:43:02 +0800 Subject: [PATCH 08/54] Add files via upload --- resources/definitions/eazao_m500.def.json | 81 +++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 resources/definitions/eazao_m500.def.json diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json new file mode 100644 index 0000000000..ecc5467062 --- /dev/null +++ b/resources/definitions/eazao_m500.def.json @@ -0,0 +1,81 @@ +{ + "version": 2, + "name": "Eazao M500", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Eazao", + "manufacturer": "Eazao", + "file_formats": "text/x-gcode", + "has_machine_quality": false, + "has_materials": true, + "machine_extruder_trains": { "0": "eazao_matrix_extruder_0" }, + "preferred_material": "generic_pla", + "preferred_quality_type": "normal" + }, + "overrides": + { + + "acceleration_print": { "value": 300 }, + "acceleration_travel": { "value": 300 }, + "adhesion_type": { "default_value": "none" }, + "bottom_layers": { "value": 2 }, + "cool_fan_enabled": { "value": false }, + "infill_sparse_density": { "value": 0 }, + "initial_bottom_layers": { "value": 2 }, + + "jerk_print": { "value": 10 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + "layer_height": { "value": 1.0 }, + "layer_height_0": { "value": 1.0 }, + "line_width": { "value": 3.0 }, + "machine_acceleration": { "value": 300 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 320 }, + "machine_end_gcode": { "default_value": "G92 Z0\nG1 F1500 Z10\nG28 X0 Y300 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 520 }, + "machine_max_acceleration_e": { "value": 500 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 50 }, + "machine_max_feedrate_e": { "value": 25 }, + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 5 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_name": { "default_value": "Eazao M500" }, + "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.85; Set Mix Factor\nM163 S1 P0.15; Set Mix Factor\nM164 S0" }, + "machine_width": { "default_value": 320 }, + "material_final_print_temperature": { "value": "0" }, + "material_initial_print_temperature": { "value": "0" }, + "material_print_temperature": { "value": "0" }, + "material_print_temperature_layer_0": { "value": "0" }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "value": 7 }, + "retraction_combing": { "value": "'noskin'" }, + + "retraction_count_max": { "value": 100 }, + "retraction_enable": { "value": false }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_hop": { "value": 0.2 }, + + + "speed_print": { "value": 20.0 }, + "speed_travel": { "value": 20.0 }, + "speed_wall": { "value": 20.0 }, + "speed_wall_0": { "value": 20.0 }, + "speed_wall_x": { "value": 20.0 }, + "speed_z_hop": { "value": "machine_max_feedrate_z" }, + "top_bottom_thickness": { "value": 0 }, + + + + "wall_thickness": { "value": 3.0 } + } +} \ No newline at end of file From 2b2387c87ba485e445f3deebc5cd0baa6902f413 Mon Sep 17 00:00:00 2001 From: Eazao Date: Wed, 26 Jul 2023 23:10:13 +0800 Subject: [PATCH 09/54] Update eazao_m500.def.json --- resources/definitions/eazao_m500.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index ecc5467062..d733170bae 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -49,7 +49,7 @@ "machine_max_jerk_e": { "value": 5 }, "machine_max_jerk_xy": { "value": 10 }, "machine_max_jerk_z": { "value": 0.3 }, - "machine_name": { "default_value": "Eazao M500" }, + "machine_name": { "default_value": "Eazao Matrix" }, "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.85; Set Mix Factor\nM163 S1 P0.15; Set Mix Factor\nM164 S0" }, "machine_width": { "default_value": 320 }, "material_final_print_temperature": { "value": "0" }, @@ -78,4 +78,4 @@ "wall_thickness": { "value": 3.0 } } -} \ No newline at end of file +} From 1c397e71010fa62c29077eb936a8a00c6b1f04a7 Mon Sep 17 00:00:00 2001 From: Eazao Date: Wed, 26 Jul 2023 23:39:02 +0800 Subject: [PATCH 10/54] Update eazao_m500.def.json --- resources/definitions/eazao_m500.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index d733170bae..dc539408d9 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -49,7 +49,7 @@ "machine_max_jerk_e": { "value": 5 }, "machine_max_jerk_xy": { "value": 10 }, "machine_max_jerk_z": { "value": 0.3 }, - "machine_name": { "default_value": "Eazao Matrix" }, + "machine_name": { "default_value": "Eazao M500" }, "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.85; Set Mix Factor\nM163 S1 P0.15; Set Mix Factor\nM164 S0" }, "machine_width": { "default_value": 320 }, "material_final_print_temperature": { "value": "0" }, From 9b1c01a145d4b504c0c65fcf06c040da05b7042a Mon Sep 17 00:00:00 2001 From: Eazao Date: Wed, 26 Jul 2023 23:39:24 +0800 Subject: [PATCH 11/54] Update eazao_matrix_extruder_0.def.json --- resources/extruders/eazao_matrix_extruder_0.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/extruders/eazao_matrix_extruder_0.def.json b/resources/extruders/eazao_matrix_extruder_0.def.json index 6729ff222a..8f030ec438 100644 --- a/resources/extruders/eazao_matrix_extruder_0.def.json +++ b/resources/extruders/eazao_matrix_extruder_0.def.json @@ -4,7 +4,7 @@ "inherits": "fdmextruder", "metadata": { - "machine": "eazao_matrix", + "machine": "eazao_m500", "position": "0" }, "overrides": @@ -13,4 +13,4 @@ "machine_nozzle_size": { "default_value": 2.3 }, "material_diameter": { "default_value": 1.75 } } -} \ No newline at end of file +} From 9896420af39ce0b54610c2af3626ecf1c2c31803 Mon Sep 17 00:00:00 2001 From: Eazao Date: Wed, 26 Jul 2023 23:40:52 +0800 Subject: [PATCH 12/54] Rename eazao_matrix_extruder_0.def.json to eazao_m500_extruder_0.def.json --- ..._matrix_extruder_0.def.json => eazao_m500_extruder_0.def.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename resources/extruders/{eazao_matrix_extruder_0.def.json => eazao_m500_extruder_0.def.json} (100%) diff --git a/resources/extruders/eazao_matrix_extruder_0.def.json b/resources/extruders/eazao_m500_extruder_0.def.json similarity index 100% rename from resources/extruders/eazao_matrix_extruder_0.def.json rename to resources/extruders/eazao_m500_extruder_0.def.json From 34d40817948ed6abe25f2da85572c2307290ebfa Mon Sep 17 00:00:00 2001 From: Eazao Date: Wed, 26 Jul 2023 23:42:27 +0800 Subject: [PATCH 13/54] Update eazao_m500.def.json --- resources/definitions/eazao_m500.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index dc539408d9..5899d791b0 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "has_machine_quality": false, "has_materials": true, - "machine_extruder_trains": { "0": "eazao_matrix_extruder_0" }, + "machine_extruder_trains": { "0": "eazao_m500_extruder_0" }, "preferred_material": "generic_pla", "preferred_quality_type": "normal" }, From 3a4bbd1e0621739265a9a40f4cc0c75fe7cc9d91 Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 27 Jul 2023 11:30:01 +0800 Subject: [PATCH 14/54] Delete eazao_m500_extruder_0.def.json --- .../extruders/eazao_m500_extruder_0.def.json | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 resources/extruders/eazao_m500_extruder_0.def.json diff --git a/resources/extruders/eazao_m500_extruder_0.def.json b/resources/extruders/eazao_m500_extruder_0.def.json deleted file mode 100644 index 8f030ec438..0000000000 --- a/resources/extruders/eazao_m500_extruder_0.def.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": - { - "machine": "eazao_m500", - "position": "0" - }, - "overrides": - { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 2.3 }, - "material_diameter": { "default_value": 1.75 } - } -} From b19f262c2e5826a4397ffcdd0b95219ce2b695c6 Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 27 Jul 2023 11:30:11 +0800 Subject: [PATCH 15/54] Delete eazao_m500.def.json --- resources/definitions/eazao_m500.def.json | 81 ----------------------- 1 file changed, 81 deletions(-) delete mode 100644 resources/definitions/eazao_m500.def.json diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json deleted file mode 100644 index 5899d791b0..0000000000 --- a/resources/definitions/eazao_m500.def.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - "version": 2, - "name": "Eazao M500", - "inherits": "fdmprinter", - "metadata": - { - "visible": true, - "author": "Eazao", - "manufacturer": "Eazao", - "file_formats": "text/x-gcode", - "has_machine_quality": false, - "has_materials": true, - "machine_extruder_trains": { "0": "eazao_m500_extruder_0" }, - "preferred_material": "generic_pla", - "preferred_quality_type": "normal" - }, - "overrides": - { - - "acceleration_print": { "value": 300 }, - "acceleration_travel": { "value": 300 }, - "adhesion_type": { "default_value": "none" }, - "bottom_layers": { "value": 2 }, - "cool_fan_enabled": { "value": false }, - "infill_sparse_density": { "value": 0 }, - "initial_bottom_layers": { "value": 2 }, - - "jerk_print": { "value": 10 }, - "jerk_travel": { "value": "jerk_print" }, - "jerk_travel_layer_0": { "value": "jerk_travel" }, - "layer_height": { "value": 1.0 }, - "layer_height_0": { "value": 1.0 }, - "line_width": { "value": 3.0 }, - "machine_acceleration": { "value": 300 }, - "machine_center_is_zero": { "default_value": false }, - "machine_depth": { "default_value": 320 }, - "machine_end_gcode": { "default_value": "G92 Z0\nG1 F1500 Z10\nG28 X0 Y300 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_heated_bed": { "default_value": false }, - "machine_height": { "default_value": 520 }, - "machine_max_acceleration_e": { "value": 500 }, - "machine_max_acceleration_x": { "value": 500 }, - "machine_max_acceleration_y": { "value": 500 }, - "machine_max_acceleration_z": { "value": 50 }, - "machine_max_feedrate_e": { "value": 25 }, - "machine_max_feedrate_x": { "value": 100 }, - "machine_max_feedrate_y": { "value": 100 }, - "machine_max_feedrate_z": { "value": 5 }, - "machine_max_jerk_e": { "value": 5 }, - "machine_max_jerk_xy": { "value": 10 }, - "machine_max_jerk_z": { "value": 0.3 }, - "machine_name": { "default_value": "Eazao M500" }, - "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.85; Set Mix Factor\nM163 S1 P0.15; Set Mix Factor\nM164 S0" }, - "machine_width": { "default_value": 320 }, - "material_final_print_temperature": { "value": "0" }, - "material_initial_print_temperature": { "value": "0" }, - "material_print_temperature": { "value": "0" }, - "material_print_temperature_layer_0": { "value": "0" }, - "optimize_wall_printing_order": { "value": "True" }, - "retraction_amount": { "value": 7 }, - "retraction_combing": { "value": "'noskin'" }, - - "retraction_count_max": { "value": 100 }, - "retraction_enable": { "value": false }, - "retraction_extrusion_window": { "value": 10 }, - "retraction_hop": { "value": 0.2 }, - - - "speed_print": { "value": 20.0 }, - "speed_travel": { "value": 20.0 }, - "speed_wall": { "value": 20.0 }, - "speed_wall_0": { "value": 20.0 }, - "speed_wall_x": { "value": 20.0 }, - "speed_z_hop": { "value": "machine_max_feedrate_z" }, - "top_bottom_thickness": { "value": 0 }, - - - - "wall_thickness": { "value": 3.0 } - } -} From 418b9de1539e8e312cfd93a1e0902a2394e974b7 Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 27 Jul 2023 11:31:00 +0800 Subject: [PATCH 16/54] Add new 3D printer Eazao M500, M600, M700 to Cura --- resources/definitions/eazao_m500.def.json | 81 +++++++++++++++++++++++ resources/definitions/eazao_m600.def.json | 81 +++++++++++++++++++++++ resources/definitions/eazao_m700.def.json | 81 +++++++++++++++++++++++ 3 files changed, 243 insertions(+) create mode 100644 resources/definitions/eazao_m500.def.json create mode 100644 resources/definitions/eazao_m600.def.json create mode 100644 resources/definitions/eazao_m700.def.json diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json new file mode 100644 index 0000000000..0d7def4305 --- /dev/null +++ b/resources/definitions/eazao_m500.def.json @@ -0,0 +1,81 @@ +{ + "version": 2, + "name": "Eazao M500", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Eazao", + "manufacturer": "Eazao", + "file_formats": "text/x-gcode", + "has_machine_quality": false, + "has_materials": true, + "machine_extruder_trains": { "0": "eazao_m500_extruder_0" }, + "preferred_material": "generic_pla", + "preferred_quality_type": "normal" + }, + "overrides": + { + + "acceleration_print": { "value": 300 }, + "acceleration_travel": { "value": 300 }, + "adhesion_type": { "default_value": "none" }, + "bottom_layers": { "value": 2 }, + "cool_fan_enabled": { "value": false }, + "infill_sparse_density": { "value": 0 }, + "initial_bottom_layers": { "value": 2 }, + + "jerk_print": { "value": 10 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + "layer_height": { "value": 1.0 }, + "layer_height_0": { "value": 1.0 }, + "line_width": { "value": 3.0 }, + "machine_acceleration": { "value": 300 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 320 }, + "machine_end_gcode": { "default_value": "G92 Z0\nG1 F1500 Z10\nG28 X0 Y300 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 520 }, + "machine_max_acceleration_e": { "value": 500 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 50 }, + "machine_max_feedrate_e": { "value": 25 }, + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 5 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_name": { "default_value": "Eazao M500" }, + "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.85; Set Mix Factor\nM163 S1 P0.15; Set Mix Factor\nM164 S0" }, + "machine_width": { "default_value": 320 }, + "material_final_print_temperature": { "value": "0" }, + "material_initial_print_temperature": { "value": "0" }, + "material_print_temperature": { "value": "0" }, + "material_print_temperature_layer_0": { "value": "0" }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "value": 7 }, + "retraction_combing": { "value": "'noskin'" }, + + "retraction_count_max": { "value": 100 }, + "retraction_enable": { "value": false }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_hop": { "value": 0.2 }, + + + "speed_print": { "value": 20.0 }, + "speed_travel": { "value": 20.0 }, + "speed_wall": { "value": 20.0 }, + "speed_wall_0": { "value": 20.0 }, + "speed_wall_x": { "value": 20.0 }, + "speed_z_hop": { "value": "machine_max_feedrate_z" }, + "top_bottom_thickness": { "value": 0 }, + + + + "wall_thickness": { "value": 5.0 } + } +} diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json new file mode 100644 index 0000000000..884dbbfbc5 --- /dev/null +++ b/resources/definitions/eazao_m600.def.json @@ -0,0 +1,81 @@ +{ + "version": 2, + "name": "Eazao M600", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Eazao", + "manufacturer": "Eazao", + "file_formats": "text/x-gcode", + "has_machine_quality": false, + "has_materials": true, + "machine_extruder_trains": { "0": "eazao_m600_extruder_0" }, + "preferred_material": "generic_pla", + "preferred_quality_type": "normal" + }, + "overrides": + { + + "acceleration_print": { "value": 300 }, + "acceleration_travel": { "value": 300 }, + "adhesion_type": { "default_value": "none" }, + "bottom_layers": { "value": 2 }, + "cool_fan_enabled": { "value": false }, + "infill_sparse_density": { "value": 0 }, + "initial_bottom_layers": { "value": 2 }, + + "jerk_print": { "value": 10 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + "layer_height": { "value": 1.0 }, + "layer_height_0": { "value": 1.0 }, + "line_width": { "value": 3.0 }, + "machine_acceleration": { "value": 300 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 420 }, + "machine_end_gcode": { "default_value": "G92 Z0\nG1 F1500 Z10\nG28 X0 Y400 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 620 }, + "machine_max_acceleration_e": { "value": 500 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 50 }, + "machine_max_feedrate_e": { "value": 25 }, + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 5 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_name": { "default_value": "Eazao M600" }, + "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.87; Set Mix Factor\nM163 S1 P0.13; Set Mix Factor\nM164 S0" }, + "machine_width": { "default_value": 420 }, + "material_final_print_temperature": { "value": "0" }, + "material_initial_print_temperature": { "value": "0" }, + "material_print_temperature": { "value": "0" }, + "material_print_temperature_layer_0": { "value": "0" }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "value": 7 }, + "retraction_combing": { "value": "'noskin'" }, + + "retraction_count_max": { "value": 100 }, + "retraction_enable": { "value": false }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_hop": { "value": 0.2 }, + + + "speed_print": { "value": 20.0 }, + "speed_travel": { "value": 20.0 }, + "speed_wall": { "value": 20.0 }, + "speed_wall_0": { "value": 20.0 }, + "speed_wall_x": { "value": 20.0 }, + "speed_z_hop": { "value": "machine_max_feedrate_z" }, + "top_bottom_thickness": { "value": 0 }, + + + + "wall_thickness": { "value": 5.0 } + } +} diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json new file mode 100644 index 0000000000..58afbb4381 --- /dev/null +++ b/resources/definitions/eazao_m700.def.json @@ -0,0 +1,81 @@ +{ + "version": 2, + "name": "Eazao M700", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Eazao", + "manufacturer": "Eazao", + "file_formats": "text/x-gcode", + "has_machine_quality": false, + "has_materials": true, + "machine_extruder_trains": { "0": "eazao_m700_extruder_0" }, + "preferred_material": "generic_pla", + "preferred_quality_type": "normal" + }, + "overrides": + { + + "acceleration_print": { "value": 300 }, + "acceleration_travel": { "value": 300 }, + "adhesion_type": { "default_value": "none" }, + "bottom_layers": { "value": 2 }, + "cool_fan_enabled": { "value": false }, + "infill_sparse_density": { "value": 0 }, + "initial_bottom_layers": { "value": 2 }, + + "jerk_print": { "value": 10 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + "layer_height": { "value": 1.0 }, + "layer_height_0": { "value": 1.0 }, + "line_width": { "value": 3.0 }, + "machine_acceleration": { "value": 300 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 520 }, + "machine_end_gcode": { "default_value": "G92 Z0\nG1 F1500 Z10\nG28 X0 Y500 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 720 }, + "machine_max_acceleration_e": { "value": 500 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 50 }, + "machine_max_feedrate_e": { "value": 25 }, + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 5 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_name": { "default_value": "Eazao M700" }, + "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.87; Set Mix Factor\nM163 S1 P0.13; Set Mix Factor\nM164 S0" }, + "machine_width": { "default_value": 520 }, + "material_final_print_temperature": { "value": "0" }, + "material_initial_print_temperature": { "value": "0" }, + "material_print_temperature": { "value": "0" }, + "material_print_temperature_layer_0": { "value": "0" }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "value": 7 }, + "retraction_combing": { "value": "'noskin'" }, + + "retraction_count_max": { "value": 100 }, + "retraction_enable": { "value": false }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_hop": { "value": 0.2 }, + + + "speed_print": { "value": 20.0 }, + "speed_travel": { "value": 20.0 }, + "speed_wall": { "value": 20.0 }, + "speed_wall_0": { "value": 20.0 }, + "speed_wall_x": { "value": 20.0 }, + "speed_z_hop": { "value": "machine_max_feedrate_z" }, + "top_bottom_thickness": { "value": 0 }, + + + + "wall_thickness": { "value": 5.0 } + } +} From 3176cae9533c1da060f59c6f5d33744841c75a16 Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 27 Jul 2023 11:31:19 +0800 Subject: [PATCH 17/54] Add new 3D printer Eazao M500, M600, M700 to Cura --- .../extruders/eazao_m500_extruder_0.def.json | 16 ++++++++++++++++ .../extruders/eazao_m600_extruder_0.def.json | 16 ++++++++++++++++ .../extruders/eazao_m700_extruder_0.def.json | 16 ++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 resources/extruders/eazao_m500_extruder_0.def.json create mode 100644 resources/extruders/eazao_m600_extruder_0.def.json create mode 100644 resources/extruders/eazao_m700_extruder_0.def.json diff --git a/resources/extruders/eazao_m500_extruder_0.def.json b/resources/extruders/eazao_m500_extruder_0.def.json new file mode 100644 index 0000000000..8f030ec438 --- /dev/null +++ b/resources/extruders/eazao_m500_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "eazao_m500", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 2.3 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/eazao_m600_extruder_0.def.json b/resources/extruders/eazao_m600_extruder_0.def.json new file mode 100644 index 0000000000..34c98b2170 --- /dev/null +++ b/resources/extruders/eazao_m600_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "eazao_m600", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 2.3 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/eazao_m700_extruder_0.def.json b/resources/extruders/eazao_m700_extruder_0.def.json new file mode 100644 index 0000000000..b545608c5c --- /dev/null +++ b/resources/extruders/eazao_m700_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "eazao_m700", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 2.3 }, + "material_diameter": { "default_value": 1.75 } + } +} From 77e42761dad01cdcbeb2409807c392f763092d9f Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 17 Aug 2023 08:55:43 +0800 Subject: [PATCH 18/54] Update eazao_m500.def.json Modify the following content: "has_materials": false, --- resources/definitions/eazao_m500.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index 0d7def4305..cacda2773c 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -9,7 +9,7 @@ "manufacturer": "Eazao", "file_formats": "text/x-gcode", "has_machine_quality": false, - "has_materials": true, + "has_materials": false, "machine_extruder_trains": { "0": "eazao_m500_extruder_0" }, "preferred_material": "generic_pla", "preferred_quality_type": "normal" From 0dcb392b9891da062bf25c07b7b20e63d6eb731c Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 17 Aug 2023 08:57:07 +0800 Subject: [PATCH 19/54] Update eazao_m600.def.json Modify the following content: "has_materials": false, --- resources/definitions/eazao_m600.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json index 884dbbfbc5..2705dc6c82 100644 --- a/resources/definitions/eazao_m600.def.json +++ b/resources/definitions/eazao_m600.def.json @@ -9,7 +9,7 @@ "manufacturer": "Eazao", "file_formats": "text/x-gcode", "has_machine_quality": false, - "has_materials": true, + "has_materials": false, "machine_extruder_trains": { "0": "eazao_m600_extruder_0" }, "preferred_material": "generic_pla", "preferred_quality_type": "normal" From 76fad93d3ffa8d1c528358374ed821c0a8dcf677 Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 17 Aug 2023 08:57:35 +0800 Subject: [PATCH 20/54] Update eazao_m700.def.json Modify the following content: "has_materials": false, --- resources/definitions/eazao_m700.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json index 58afbb4381..a6aa2efe96 100644 --- a/resources/definitions/eazao_m700.def.json +++ b/resources/definitions/eazao_m700.def.json @@ -9,7 +9,7 @@ "manufacturer": "Eazao", "file_formats": "text/x-gcode", "has_machine_quality": false, - "has_materials": true, + "has_materials": false, "machine_extruder_trains": { "0": "eazao_m700_extruder_0" }, "preferred_material": "generic_pla", "preferred_quality_type": "normal" From 2e4e9b4afa56057acbfdec330c4d80482d5f62eb Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 17 Aug 2023 09:11:36 +0800 Subject: [PATCH 21/54] Apply suggestions from code review Co-authored-by: Jelle Spijker --- resources/definitions/eazao_m500.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index cacda2773c..50bdfaa7f9 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -19,7 +19,7 @@ "acceleration_print": { "value": 300 }, "acceleration_travel": { "value": 300 }, - "adhesion_type": { "default_value": "none" }, + "adhesion_type": { "default_value": "'none'" }, "bottom_layers": { "value": 2 }, "cool_fan_enabled": { "value": false }, "infill_sparse_density": { "value": 0 }, From 4b81cae0c55174f9d3ece0d19be895e4ac7af404 Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 17 Aug 2023 09:11:53 +0800 Subject: [PATCH 22/54] Apply suggestions from code review Co-authored-by: Jelle Spijker --- resources/definitions/eazao_m600.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json index 2705dc6c82..50e4ae137e 100644 --- a/resources/definitions/eazao_m600.def.json +++ b/resources/definitions/eazao_m600.def.json @@ -19,7 +19,7 @@ "acceleration_print": { "value": 300 }, "acceleration_travel": { "value": 300 }, - "adhesion_type": { "default_value": "none" }, + "adhesion_type": { "default_value": "'none'" }, "bottom_layers": { "value": 2 }, "cool_fan_enabled": { "value": false }, "infill_sparse_density": { "value": 0 }, From b3143a1d19e3a69825f4e4f5fd8cebb20b9ee86f Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 17 Aug 2023 09:12:03 +0800 Subject: [PATCH 23/54] Apply suggestions from code review Co-authored-by: Jelle Spijker --- resources/definitions/eazao_m500.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index 50bdfaa7f9..96b99e3cb0 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -24,7 +24,6 @@ "cool_fan_enabled": { "value": false }, "infill_sparse_density": { "value": 0 }, "initial_bottom_layers": { "value": 2 }, - "jerk_print": { "value": 10 }, "jerk_travel": { "value": "jerk_print" }, "jerk_travel_layer_0": { "value": "jerk_travel" }, From fc510bed1f2e91f05117c04fbc11c507e00e0b82 Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 17 Aug 2023 09:12:13 +0800 Subject: [PATCH 24/54] Apply suggestions from code review Co-authored-by: Jelle Spijker --- resources/definitions/eazao_m500.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index 96b99e3cb0..6d9ea5f12b 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -58,7 +58,6 @@ "optimize_wall_printing_order": { "value": "True" }, "retraction_amount": { "value": 7 }, "retraction_combing": { "value": "'noskin'" }, - "retraction_count_max": { "value": 100 }, "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, From d668795c44e863fd22326a807acabac0e15a097e Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 17 Aug 2023 09:12:23 +0800 Subject: [PATCH 25/54] Apply suggestions from code review Co-authored-by: Jelle Spijker --- resources/definitions/eazao_m500.def.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index 6d9ea5f12b..5f3fe3a8e8 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -62,8 +62,6 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, - - "speed_print": { "value": 20.0 }, "speed_travel": { "value": 20.0 }, "speed_wall": { "value": 20.0 }, From c2af64c9b0eeb9d75b13c0d56944a2cbb0fa19fe Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 17 Aug 2023 09:12:30 +0800 Subject: [PATCH 26/54] Apply suggestions from code review Co-authored-by: Jelle Spijker --- resources/definitions/eazao_m500.def.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index 5f3fe3a8e8..1e9c0dc414 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -69,9 +69,6 @@ "speed_wall_x": { "value": 20.0 }, "speed_z_hop": { "value": "machine_max_feedrate_z" }, "top_bottom_thickness": { "value": 0 }, - - - "wall_thickness": { "value": 5.0 } } } From 7e414713946724dc55e719ea6ff238da9007cb5d Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 17 Aug 2023 09:12:42 +0800 Subject: [PATCH 27/54] Apply suggestions from code review Co-authored-by: Jelle Spijker --- resources/definitions/eazao_m600.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json index 50e4ae137e..907ce33eb4 100644 --- a/resources/definitions/eazao_m600.def.json +++ b/resources/definitions/eazao_m600.def.json @@ -24,7 +24,6 @@ "cool_fan_enabled": { "value": false }, "infill_sparse_density": { "value": 0 }, "initial_bottom_layers": { "value": 2 }, - "jerk_print": { "value": 10 }, "jerk_travel": { "value": "jerk_print" }, "jerk_travel_layer_0": { "value": "jerk_travel" }, From 0185ab2eb70ecf64f1fa0349984a26d577cbce34 Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 17 Aug 2023 09:12:50 +0800 Subject: [PATCH 28/54] Apply suggestions from code review Co-authored-by: Jelle Spijker --- resources/definitions/eazao_m600.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json index 907ce33eb4..f85d2e693a 100644 --- a/resources/definitions/eazao_m600.def.json +++ b/resources/definitions/eazao_m600.def.json @@ -58,7 +58,6 @@ "optimize_wall_printing_order": { "value": "True" }, "retraction_amount": { "value": 7 }, "retraction_combing": { "value": "'noskin'" }, - "retraction_count_max": { "value": 100 }, "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, From 65da32ba6b28da276222a5515922d2327f0b8f37 Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 17 Aug 2023 09:12:57 +0800 Subject: [PATCH 29/54] Apply suggestions from code review Co-authored-by: Jelle Spijker --- resources/definitions/eazao_m600.def.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json index f85d2e693a..f050913c5b 100644 --- a/resources/definitions/eazao_m600.def.json +++ b/resources/definitions/eazao_m600.def.json @@ -62,8 +62,6 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, - - "speed_print": { "value": 20.0 }, "speed_travel": { "value": 20.0 }, "speed_wall": { "value": 20.0 }, From ed66101e1e04d9e7bb16f441aadeb825512da6cf Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 17 Aug 2023 09:13:03 +0800 Subject: [PATCH 30/54] Apply suggestions from code review Co-authored-by: Jelle Spijker --- resources/definitions/eazao_m600.def.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json index f050913c5b..288d5a8ae8 100644 --- a/resources/definitions/eazao_m600.def.json +++ b/resources/definitions/eazao_m600.def.json @@ -69,9 +69,6 @@ "speed_wall_x": { "value": 20.0 }, "speed_z_hop": { "value": "machine_max_feedrate_z" }, "top_bottom_thickness": { "value": 0 }, - - - "wall_thickness": { "value": 5.0 } } } From 0a79ccd9337008a404bd38c1d214125a9b27d938 Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 17 Aug 2023 09:13:10 +0800 Subject: [PATCH 31/54] Apply suggestions from code review Co-authored-by: Jelle Spijker --- resources/definitions/eazao_m700.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json index a6aa2efe96..03bdea2a9d 100644 --- a/resources/definitions/eazao_m700.def.json +++ b/resources/definitions/eazao_m700.def.json @@ -16,7 +16,6 @@ }, "overrides": { - "acceleration_print": { "value": 300 }, "acceleration_travel": { "value": 300 }, "adhesion_type": { "default_value": "none" }, From a4b6a3c4a7bf3dafe9dfbfbe9d75caff8f83d0af Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 17 Aug 2023 09:13:16 +0800 Subject: [PATCH 32/54] Apply suggestions from code review Co-authored-by: Jelle Spijker --- resources/definitions/eazao_m700.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json index 03bdea2a9d..b560772cde 100644 --- a/resources/definitions/eazao_m700.def.json +++ b/resources/definitions/eazao_m700.def.json @@ -23,7 +23,6 @@ "cool_fan_enabled": { "value": false }, "infill_sparse_density": { "value": 0 }, "initial_bottom_layers": { "value": 2 }, - "jerk_print": { "value": 10 }, "jerk_travel": { "value": "jerk_print" }, "jerk_travel_layer_0": { "value": "jerk_travel" }, From a97638db52cf512f07dbded5583a65403955fae6 Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 17 Aug 2023 09:13:22 +0800 Subject: [PATCH 33/54] Apply suggestions from code review Co-authored-by: Jelle Spijker --- resources/definitions/eazao_m700.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json index b560772cde..2adcdd14b7 100644 --- a/resources/definitions/eazao_m700.def.json +++ b/resources/definitions/eazao_m700.def.json @@ -57,7 +57,6 @@ "optimize_wall_printing_order": { "value": "True" }, "retraction_amount": { "value": 7 }, "retraction_combing": { "value": "'noskin'" }, - "retraction_count_max": { "value": 100 }, "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, From 0916b4221d72d3b2315b54eb1654a232c117b9ea Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 17 Aug 2023 09:13:28 +0800 Subject: [PATCH 34/54] Apply suggestions from code review Co-authored-by: Jelle Spijker --- resources/definitions/eazao_m700.def.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json index 2adcdd14b7..d3e26d83da 100644 --- a/resources/definitions/eazao_m700.def.json +++ b/resources/definitions/eazao_m700.def.json @@ -61,8 +61,6 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, - - "speed_print": { "value": 20.0 }, "speed_travel": { "value": 20.0 }, "speed_wall": { "value": 20.0 }, From 93e597f3d29a3f3db913ac433dbec78453bf95ad Mon Sep 17 00:00:00 2001 From: Eazao Date: Thu, 17 Aug 2023 09:13:34 +0800 Subject: [PATCH 35/54] Apply suggestions from code review Co-authored-by: Jelle Spijker --- resources/definitions/eazao_m700.def.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json index d3e26d83da..c2a6910add 100644 --- a/resources/definitions/eazao_m700.def.json +++ b/resources/definitions/eazao_m700.def.json @@ -68,9 +68,6 @@ "speed_wall_x": { "value": 20.0 }, "speed_z_hop": { "value": "machine_max_feedrate_z" }, "top_bottom_thickness": { "value": 0 }, - - - "wall_thickness": { "value": 5.0 } } } From a6e51d3f66abe31fcb0c715e0b0034a45a2af1d8 Mon Sep 17 00:00:00 2001 From: Eazao Date: Wed, 24 Jul 2024 11:20:00 +0800 Subject: [PATCH 36/54] Add files via upload Eazao Potter is a ceramic 3D printer used to print clay. We have previously uploaded Eazao Zero, Eazao M500, Eazao M600, and Eazao M700. --- resources/definitions/eazao_potter.def.json | 74 +++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 resources/definitions/eazao_potter.def.json diff --git a/resources/definitions/eazao_potter.def.json b/resources/definitions/eazao_potter.def.json new file mode 100644 index 0000000000..382aa7e685 --- /dev/null +++ b/resources/definitions/eazao_potter.def.json @@ -0,0 +1,74 @@ +{ + "version": 2, + "name": "Eazao Potter", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Eazao", + "manufacturer": "Eazao", + "file_formats": "text/x-gcode", + "has_machine_quality": false, + "has_materials": false, + "machine_extruder_trains": { "0": "eazao_potter_extruder_0" }, + "preferred_material": "generic_pla", + "preferred_quality_type": "normal" + }, + "overrides": + { + + "acceleration_print": { "value": 300 }, + "acceleration_travel": { "value": 300 }, + "adhesion_type": { "default_value": "'none'" }, + "bottom_layers": { "value": 3 }, + "cool_fan_enabled": { "value": false }, + "infill_sparse_density": { "value": 0 }, + "initial_bottom_layers": { "value": 3 }, + "jerk_print": { "value": 10 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + "layer_height": { "value": 1.0 }, + "layer_height_0": { "value": 1.0 }, + "line_width": { "value": 3.0 }, + "machine_acceleration": { "value": 300 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 167 }, + "machine_end_gcode": { "default_value": "G92 Z0 E0\nG1 F1500 Z10 E-2\nM82\nM84 ;steppers off\n" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 280 }, + "machine_max_acceleration_e": { "value": 500 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 50 }, + "machine_max_feedrate_e": { "value": 25 }, + "machine_max_feedrate_x": { "value": 100 }, + "machine_max_feedrate_y": { "value": 100 }, + "machine_max_feedrate_z": { "value": 5 }, + "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_name": { "default_value": "Eazao Potter" }, + "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 25mm\nG92 E0 ;extruder reset\nG1 F1500 E2\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.85; Set Mix Factor\nM163 S1 P0.15; Set Mix Factor\nM164 S0" }, + "machine_width": { "default_value": 167 }, + "material_final_print_temperature": { "value": "0" }, + "material_initial_print_temperature": { "value": "0" }, + "material_print_temperature": { "value": "0" }, + "material_print_temperature_layer_0": { "value": "0" }, + "optimize_wall_printing_order": { "value": "True" }, + "retraction_amount": { "value": 7 }, + "retraction_combing": { "value": "'noskin'" }, + "retraction_count_max": { "value": 100 }, + "retraction_enable": { "value": false }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_hop": { "value": 0.2 }, + "speed_print": { "value": 25.0 }, + "speed_travel": { "value": 25.0 }, + "speed_wall": { "value": 25.0 }, + "speed_wall_0": { "value": 25.0 }, + "speed_wall_x": { "value": 25.0 }, + "speed_z_hop": { "value": "machine_max_feedrate_z" }, + "top_bottom_thickness": { "value": 0 }, + "wall_thickness": { "value": 3.0 } + } +} From 3d5b041cd440c33653808757cdd567914904ba69 Mon Sep 17 00:00:00 2001 From: Eazao Date: Wed, 24 Jul 2024 11:20:37 +0800 Subject: [PATCH 37/54] Add files via upload Eazao Potter is a ceramic 3D printer used to print clay. We have previously uploaded Eazao Zero, Eazao M500, Eazao M600, and Eazao M700. --- .../extruders/eazao_potter_extruder_0.def.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 resources/extruders/eazao_potter_extruder_0.def.json diff --git a/resources/extruders/eazao_potter_extruder_0.def.json b/resources/extruders/eazao_potter_extruder_0.def.json new file mode 100644 index 0000000000..efde9ddc1a --- /dev/null +++ b/resources/extruders/eazao_potter_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "eazao_potter", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 1.6 }, + "material_diameter": { "default_value": 1.75 } + } +} From 07076dc2e91cd6e1df222b9321cce3a0856ad8e0 Mon Sep 17 00:00:00 2001 From: Eazao Date: Wed, 24 Jul 2024 11:38:22 +0800 Subject: [PATCH 38/54] Update eazao_zero.def.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We have updated some parameter settings of Eazao Zero, including the values ​​of printing speed and other parameters. --- resources/definitions/eazao_zero.def.json | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index f849e25eb5..42cf8292e4 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -9,7 +9,7 @@ "manufacturer": "Eazao", "file_formats": "text/x-gcode", "has_machine_quality": false, - "has_materials": true, + "has_materials": false, "machine_extruder_trains": { "0": "eazao_zero_extruder_0" }, "preferred_material": "generic_pla", "preferred_quality_type": "normal" @@ -20,10 +20,10 @@ "acceleration_print": { "value": 300 }, "acceleration_travel": { "value": 300 }, "adhesion_type": { "default_value": "none" }, - "bottom_layers": { "value": 2 }, + "bottom_layers": { "value": 3 }, "cool_fan_enabled": { "value": false }, "infill_sparse_density": { "value": 0 }, - "initial_bottom_layers": { "value": 2 }, + "initial_bottom_layers": { "value": 3 }, "jerk_enabled": { "value": false }, "jerk_print": { "value": 10 }, "jerk_travel": { "value": "jerk_print" }, @@ -34,7 +34,7 @@ "machine_acceleration": { "value": 300 }, "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 150 }, - "machine_end_gcode": { "default_value": "G92 E10\nG1 E-10 F300\nG28 X0 Y0 ;move X Y to min endstops\nM82\nM84 ;steppers off\n" }, + "machine_end_gcode": { "default_value": "G92 Z0 E0\nG1 F1500 E-2\nG1 F1500 Z10\nG28 X0;move X Y to min endstops\nM82\nM84 ;steppers off\n" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_heated_bed": { "default_value": false }, "machine_height": { "default_value": 240 }, @@ -49,8 +49,8 @@ "machine_max_jerk_e": { "value": 5 }, "machine_max_jerk_xy": { "value": 10 }, "machine_max_jerk_z": { "value": 0.3 }, - "machine_name": { "default_value": "EAZAO Zero" }, - "machine_start_gcode": { "default_value": "G21 \nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home \nG1 Z15.0 F1500 ;move the platform down 15mm\nG92 E0 \nG1 F300 E10\nG92 E0\nM302\nM163 S0 P0.9; Set Mix Factor\nM163 S1 P0.1; Set Mix Factor\nM164 S0\n" }, + "machine_name": { "default_value": "Eazao Zero" }, + "machine_start_gcode": { "default_value": "G21 \nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home \nG1 Z15.0 F1500 ;move the platform down 15mm\nG92 E0 \nG1 F1500 E2\nG92 E0\nM302\nM163 S0 P0.8; Set Mix Factor\nM163 S1 P0.2; Set Mix Factor\nM164 S0\n" }, "machine_width": { "default_value": 150 }, "material_final_print_temperature": { "value": "0" }, "material_initial_print_temperature": { "value": "0" }, @@ -66,11 +66,11 @@ "retraction_hop": { "value": 0.2 }, "retraction_hop_enabled": { "value": false }, "retraction_speed": { "value": 25 }, - "speed_print": { "value": 20.0 }, - "speed_travel": { "value": 20.0 }, - "speed_wall": { "value": 20.0 }, - "speed_wall_0": { "value": 20.0 }, - "speed_wall_x": { "value": 20.0 }, + "speed_print": { "value": 25.0 }, + "speed_travel": { "value": 25.0 }, + "speed_wall": { "value": 25.0 }, + "speed_wall_0": { "value": 25.0 }, + "speed_wall_x": { "value": 25.0 }, "speed_z_hop": { "value": "machine_max_feedrate_z" }, "top_bottom_thickness": { "value": 0 }, "travel_avoid_other_parts": { "value": true }, @@ -78,4 +78,4 @@ "travel_retract_before_outer_wall": { "value": false }, "wall_thickness": { "value": 3.0 } } -} \ No newline at end of file +} From 044967c54a5c310bc7baa713c06b5c53234f7a4b Mon Sep 17 00:00:00 2001 From: Eazao Date: Wed, 24 Jul 2024 11:39:43 +0800 Subject: [PATCH 39/54] Update eazao_zero_extruder_0.def.json We changed the nozzle to 1.6. --- resources/extruders/eazao_zero_extruder_0.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/extruders/eazao_zero_extruder_0.def.json b/resources/extruders/eazao_zero_extruder_0.def.json index 5d34008337..5bec712d06 100644 --- a/resources/extruders/eazao_zero_extruder_0.def.json +++ b/resources/extruders/eazao_zero_extruder_0.def.json @@ -10,7 +10,7 @@ "overrides": { "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 1.5 }, + "machine_nozzle_size": { "default_value": 1.6 }, "material_diameter": { "default_value": 1.75 } } -} \ No newline at end of file +} From 28a59c3da13e87c3af907600557d04b20c6c28af Mon Sep 17 00:00:00 2001 From: Eazao Date: Wed, 24 Jul 2024 11:47:31 +0800 Subject: [PATCH 40/54] Update eazao_zero.def.json Make the changes as suggested. --- resources/definitions/eazao_zero.def.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index 42cf8292e4..adba642200 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -24,7 +24,6 @@ "cool_fan_enabled": { "value": false }, "infill_sparse_density": { "value": 0 }, "initial_bottom_layers": { "value": 3 }, - "jerk_enabled": { "value": false }, "jerk_print": { "value": 10 }, "jerk_travel": { "value": "jerk_print" }, "jerk_travel_layer_0": { "value": "jerk_travel" }, @@ -64,13 +63,7 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, - "retraction_hop_enabled": { "value": false }, - "retraction_speed": { "value": 25 }, "speed_print": { "value": 25.0 }, - "speed_travel": { "value": 25.0 }, - "speed_wall": { "value": 25.0 }, - "speed_wall_0": { "value": 25.0 }, - "speed_wall_x": { "value": 25.0 }, "speed_z_hop": { "value": "machine_max_feedrate_z" }, "top_bottom_thickness": { "value": 0 }, "travel_avoid_other_parts": { "value": true }, From a9687914907974638f924e933568fe1e4f98b060 Mon Sep 17 00:00:00 2001 From: Eazao Date: Wed, 24 Jul 2024 11:49:07 +0800 Subject: [PATCH 41/54] Update eazao_zero.def.json Make the changes as suggested. --- resources/definitions/eazao_zero.def.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index adba642200..897acccb34 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -66,9 +66,6 @@ "speed_print": { "value": 25.0 }, "speed_z_hop": { "value": "machine_max_feedrate_z" }, "top_bottom_thickness": { "value": 0 }, - "travel_avoid_other_parts": { "value": true }, - "travel_avoid_supports": { "value": false }, - "travel_retract_before_outer_wall": { "value": false }, "wall_thickness": { "value": 3.0 } } } From b0aae9a6dfd61f8d6bdc613c6e25485cf7862ea0 Mon Sep 17 00:00:00 2001 From: Oliver Mattos Date: Mon, 29 Jul 2024 16:16:09 +0100 Subject: [PATCH 42/54] Add setting for extra_infill_lines_to_support_skins --- resources/definitions/fdmprinter.def.json | 19 +++++++++++++++++-- resources/definitions/ultimaker.def.json | 1 - resources/setting_visibility/expert.cfg | 1 + 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 045bec05a4..65de59c27f 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2326,7 +2326,7 @@ "label": "Skin Edge Support Thickness", "description": "The thickness of the extra infill that supports skin edges.", "unit": "mm", - "default_value": 0.8, + "default_value": 0, "minimum_value": "0", "maximum_value": "machine_height", "maximum_value_warning": "resolveOrValue('infill_sparse_thickness') * 10", @@ -2341,7 +2341,7 @@ { "label": "Skin Edge Support Layers", "description": "The number of infill layers that supports skin edges.", - "default_value": 4, + "default_value": 0, "minimum_value": "0", "maximum_value_warning": "10", "type": "int", @@ -2353,6 +2353,21 @@ } } }, + "extra_infill_lines_to_support_skins": + { + "label": "Extra Infill Lines To Support Skins", + "description": "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above.", + "type": "enum", + "options": + { + "walls_and_lines": "Walls and Lines", + "walls": "Walls Only", + "none": "None" + }, + "default_value": "walls_and_lines", + "value": "'none' if infill_sparse_density > 50 else 'walls' if skin_edge_support_thickness > 0 else 'walls_and_lines'", + "enabled": "infill_sparse_density > 0" + }, "lightning_infill_support_angle": { "label": "Lightning Infill Support Angle", diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 918db0d0ea..0d0b162c01 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -111,7 +111,6 @@ "roofing_layer_count": { "value": "1" }, "roofing_material_flow": { "value": "material_flow" }, "skin_angles": { "value": "[] if infill_pattern not in ['cross', 'cross_3d'] else [20, 110]" }, - "skin_edge_support_thickness": { "value": "4 * layer_height if infill_sparse_density < 30 else 0" }, "skin_material_flow": { "value": "0.95 * material_flow" }, "skin_material_flow_layer_0": { "value": "95" }, "skin_monotonic": { "value": "roofing_layer_count == 0" }, diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index f0ba478a53..9950957081 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -110,6 +110,7 @@ min_skin_width_for_expansion infill_randomize_start_location skin_edge_support_thickness skin_edge_support_layers +extra_infill_lines_to_support_skins [material] default_material_print_temperature From 1d9f049ff3d999796c62be776223434bb42e7bd3 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 7 Aug 2024 09:27:05 +0200 Subject: [PATCH 43/54] Helping out PR: Proposed change to Eazao (spiralized). --- resources/definitions/eazao_m500.def.json | 6 +++--- resources/definitions/eazao_m600.def.json | 6 +++--- resources/definitions/eazao_m700.def.json | 5 +++-- resources/definitions/eazao_potter.def.json | 6 +++--- resources/definitions/eazao_zero.def.json | 5 +++-- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index 1e9c0dc414..3adabc7f21 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -11,12 +11,10 @@ "has_machine_quality": false, "has_materials": false, "machine_extruder_trains": { "0": "eazao_m500_extruder_0" }, - "preferred_material": "generic_pla", "preferred_quality_type": "normal" }, "overrides": { - "acceleration_print": { "value": 300 }, "acceleration_travel": { "value": 300 }, "adhesion_type": { "default_value": "'none'" }, @@ -51,6 +49,7 @@ "machine_name": { "default_value": "Eazao M500" }, "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.85; Set Mix Factor\nM163 S1 P0.15; Set Mix Factor\nM164 S0" }, "machine_width": { "default_value": 320 }, + "magic_spiralize": { "value": true }, "material_final_print_temperature": { "value": "0" }, "material_initial_print_temperature": { "value": "0" }, "material_print_temperature": { "value": "0" }, @@ -62,13 +61,14 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, + "smooth_spiralized_contours": {"value": true}, "speed_print": { "value": 20.0 }, "speed_travel": { "value": 20.0 }, "speed_wall": { "value": 20.0 }, "speed_wall_0": { "value": 20.0 }, "speed_wall_x": { "value": 20.0 }, "speed_z_hop": { "value": "machine_max_feedrate_z" }, - "top_bottom_thickness": { "value": 0 }, + "top_bottom_thickness": { "value": 3 }, "wall_thickness": { "value": 5.0 } } } diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json index 288d5a8ae8..10bd0bb101 100644 --- a/resources/definitions/eazao_m600.def.json +++ b/resources/definitions/eazao_m600.def.json @@ -11,12 +11,10 @@ "has_machine_quality": false, "has_materials": false, "machine_extruder_trains": { "0": "eazao_m600_extruder_0" }, - "preferred_material": "generic_pla", "preferred_quality_type": "normal" }, "overrides": { - "acceleration_print": { "value": 300 }, "acceleration_travel": { "value": 300 }, "adhesion_type": { "default_value": "'none'" }, @@ -51,6 +49,7 @@ "machine_name": { "default_value": "Eazao M600" }, "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.87; Set Mix Factor\nM163 S1 P0.13; Set Mix Factor\nM164 S0" }, "machine_width": { "default_value": 420 }, + "magic_spiralize": { "value": true }, "material_final_print_temperature": { "value": "0" }, "material_initial_print_temperature": { "value": "0" }, "material_print_temperature": { "value": "0" }, @@ -62,13 +61,14 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, + "smooth_spiralized_contours": {"value": true}, "speed_print": { "value": 20.0 }, "speed_travel": { "value": 20.0 }, "speed_wall": { "value": 20.0 }, "speed_wall_0": { "value": 20.0 }, "speed_wall_x": { "value": 20.0 }, "speed_z_hop": { "value": "machine_max_feedrate_z" }, - "top_bottom_thickness": { "value": 0 }, + "top_bottom_thickness": { "value": 3 }, "wall_thickness": { "value": 5.0 } } } diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json index c2a6910add..8f665714a6 100644 --- a/resources/definitions/eazao_m700.def.json +++ b/resources/definitions/eazao_m700.def.json @@ -11,7 +11,6 @@ "has_machine_quality": false, "has_materials": false, "machine_extruder_trains": { "0": "eazao_m700_extruder_0" }, - "preferred_material": "generic_pla", "preferred_quality_type": "normal" }, "overrides": @@ -50,6 +49,7 @@ "machine_name": { "default_value": "Eazao M700" }, "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 15mm\nG92 E0 ;extruder reset\nG1 F300 E5\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.87; Set Mix Factor\nM163 S1 P0.13; Set Mix Factor\nM164 S0" }, "machine_width": { "default_value": 520 }, + "magic_spiralize": { "value": true }, "material_final_print_temperature": { "value": "0" }, "material_initial_print_temperature": { "value": "0" }, "material_print_temperature": { "value": "0" }, @@ -61,13 +61,14 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, + "smooth_spiralized_contours": {"value": true}, "speed_print": { "value": 20.0 }, "speed_travel": { "value": 20.0 }, "speed_wall": { "value": 20.0 }, "speed_wall_0": { "value": 20.0 }, "speed_wall_x": { "value": 20.0 }, "speed_z_hop": { "value": "machine_max_feedrate_z" }, - "top_bottom_thickness": { "value": 0 }, + "top_bottom_thickness": { "value": 3 }, "wall_thickness": { "value": 5.0 } } } diff --git a/resources/definitions/eazao_potter.def.json b/resources/definitions/eazao_potter.def.json index 382aa7e685..1e04d22a78 100644 --- a/resources/definitions/eazao_potter.def.json +++ b/resources/definitions/eazao_potter.def.json @@ -11,12 +11,10 @@ "has_machine_quality": false, "has_materials": false, "machine_extruder_trains": { "0": "eazao_potter_extruder_0" }, - "preferred_material": "generic_pla", "preferred_quality_type": "normal" }, "overrides": { - "acceleration_print": { "value": 300 }, "acceleration_travel": { "value": 300 }, "adhesion_type": { "default_value": "'none'" }, @@ -51,6 +49,7 @@ "machine_name": { "default_value": "Eazao Potter" }, "machine_start_gcode": { "default_value": "G21 ;set units to millimeters\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home\nG1 Z25.0 F1500 ;move the platform down 25mm\nG92 E0 ;extruder reset\nG1 F1500 E2\nG92 E0 ;The extruder is forced to zero again\nM302\nM163 S0 P0.85; Set Mix Factor\nM163 S1 P0.15; Set Mix Factor\nM164 S0" }, "machine_width": { "default_value": 167 }, + "magic_spiralize": { "value": true }, "material_final_print_temperature": { "value": "0" }, "material_initial_print_temperature": { "value": "0" }, "material_print_temperature": { "value": "0" }, @@ -62,13 +61,14 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, + "smooth_spiralized_contours": {"value": true}, "speed_print": { "value": 25.0 }, "speed_travel": { "value": 25.0 }, "speed_wall": { "value": 25.0 }, "speed_wall_0": { "value": 25.0 }, "speed_wall_x": { "value": 25.0 }, "speed_z_hop": { "value": "machine_max_feedrate_z" }, - "top_bottom_thickness": { "value": 0 }, + "top_bottom_thickness": { "value": 3 }, "wall_thickness": { "value": 3.0 } } } diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index 897acccb34..3ef0b4c4c1 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -11,7 +11,6 @@ "has_machine_quality": false, "has_materials": false, "machine_extruder_trains": { "0": "eazao_zero_extruder_0" }, - "preferred_material": "generic_pla", "preferred_quality_type": "normal" }, "overrides": @@ -51,6 +50,7 @@ "machine_name": { "default_value": "Eazao Zero" }, "machine_start_gcode": { "default_value": "G21 \nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ;Home \nG1 Z15.0 F1500 ;move the platform down 15mm\nG92 E0 \nG1 F1500 E2\nG92 E0\nM302\nM163 S0 P0.8; Set Mix Factor\nM163 S1 P0.2; Set Mix Factor\nM164 S0\n" }, "machine_width": { "default_value": 150 }, + "magic_spiralize": { "value": true }, "material_final_print_temperature": { "value": "0" }, "material_initial_print_temperature": { "value": "0" }, "material_print_temperature": { "value": "0" }, @@ -63,9 +63,10 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, + "smooth_spiralized_contours": {"value": true}, "speed_print": { "value": 25.0 }, "speed_z_hop": { "value": "machine_max_feedrate_z" }, - "top_bottom_thickness": { "value": 0 }, + "top_bottom_thickness": { "value": 3 }, "wall_thickness": { "value": 3.0 } } } From 24aa10fd5e05bd5a546090b03716706485af9d7c Mon Sep 17 00:00:00 2001 From: rburema Date: Wed, 7 Aug 2024 08:00:11 +0000 Subject: [PATCH 44/54] Applied printer-linter format --- resources/definitions/eazao_m500.def.json | 4 ++-- resources/definitions/eazao_m600.def.json | 4 ++-- resources/definitions/eazao_m700.def.json | 4 ++-- resources/definitions/eazao_potter.def.json | 4 ++-- resources/definitions/eazao_zero.def.json | 4 ++-- resources/extruders/eazao_m500_extruder_0.def.json | 2 +- resources/extruders/eazao_m600_extruder_0.def.json | 2 +- resources/extruders/eazao_m700_extruder_0.def.json | 2 +- resources/extruders/eazao_potter_extruder_0.def.json | 2 +- resources/extruders/eazao_zero_extruder_0.def.json | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index 3adabc7f21..026d377616 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -61,7 +61,7 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, - "smooth_spiralized_contours": {"value": true}, + "smooth_spiralized_contours": { "value": true }, "speed_print": { "value": 20.0 }, "speed_travel": { "value": 20.0 }, "speed_wall": { "value": 20.0 }, @@ -71,4 +71,4 @@ "top_bottom_thickness": { "value": 3 }, "wall_thickness": { "value": 5.0 } } -} +} \ No newline at end of file diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json index 10bd0bb101..c487af3836 100644 --- a/resources/definitions/eazao_m600.def.json +++ b/resources/definitions/eazao_m600.def.json @@ -61,7 +61,7 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, - "smooth_spiralized_contours": {"value": true}, + "smooth_spiralized_contours": { "value": true }, "speed_print": { "value": 20.0 }, "speed_travel": { "value": 20.0 }, "speed_wall": { "value": 20.0 }, @@ -71,4 +71,4 @@ "top_bottom_thickness": { "value": 3 }, "wall_thickness": { "value": 5.0 } } -} +} \ No newline at end of file diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json index 8f665714a6..54f8316282 100644 --- a/resources/definitions/eazao_m700.def.json +++ b/resources/definitions/eazao_m700.def.json @@ -61,7 +61,7 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, - "smooth_spiralized_contours": {"value": true}, + "smooth_spiralized_contours": { "value": true }, "speed_print": { "value": 20.0 }, "speed_travel": { "value": 20.0 }, "speed_wall": { "value": 20.0 }, @@ -71,4 +71,4 @@ "top_bottom_thickness": { "value": 3 }, "wall_thickness": { "value": 5.0 } } -} +} \ No newline at end of file diff --git a/resources/definitions/eazao_potter.def.json b/resources/definitions/eazao_potter.def.json index 1e04d22a78..0d09bb10bf 100644 --- a/resources/definitions/eazao_potter.def.json +++ b/resources/definitions/eazao_potter.def.json @@ -61,7 +61,7 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, - "smooth_spiralized_contours": {"value": true}, + "smooth_spiralized_contours": { "value": true }, "speed_print": { "value": 25.0 }, "speed_travel": { "value": 25.0 }, "speed_wall": { "value": 25.0 }, @@ -71,4 +71,4 @@ "top_bottom_thickness": { "value": 3 }, "wall_thickness": { "value": 3.0 } } -} +} \ No newline at end of file diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index 3ef0b4c4c1..c1552a6657 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -63,10 +63,10 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, - "smooth_spiralized_contours": {"value": true}, + "smooth_spiralized_contours": { "value": true }, "speed_print": { "value": 25.0 }, "speed_z_hop": { "value": "machine_max_feedrate_z" }, "top_bottom_thickness": { "value": 3 }, "wall_thickness": { "value": 3.0 } } -} +} \ No newline at end of file diff --git a/resources/extruders/eazao_m500_extruder_0.def.json b/resources/extruders/eazao_m500_extruder_0.def.json index 8f030ec438..6f95c06cc9 100644 --- a/resources/extruders/eazao_m500_extruder_0.def.json +++ b/resources/extruders/eazao_m500_extruder_0.def.json @@ -13,4 +13,4 @@ "machine_nozzle_size": { "default_value": 2.3 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/eazao_m600_extruder_0.def.json b/resources/extruders/eazao_m600_extruder_0.def.json index 34c98b2170..bcbad3ab0f 100644 --- a/resources/extruders/eazao_m600_extruder_0.def.json +++ b/resources/extruders/eazao_m600_extruder_0.def.json @@ -13,4 +13,4 @@ "machine_nozzle_size": { "default_value": 2.3 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/eazao_m700_extruder_0.def.json b/resources/extruders/eazao_m700_extruder_0.def.json index b545608c5c..fada355172 100644 --- a/resources/extruders/eazao_m700_extruder_0.def.json +++ b/resources/extruders/eazao_m700_extruder_0.def.json @@ -13,4 +13,4 @@ "machine_nozzle_size": { "default_value": 2.3 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/eazao_potter_extruder_0.def.json b/resources/extruders/eazao_potter_extruder_0.def.json index efde9ddc1a..e2c1451896 100644 --- a/resources/extruders/eazao_potter_extruder_0.def.json +++ b/resources/extruders/eazao_potter_extruder_0.def.json @@ -13,4 +13,4 @@ "machine_nozzle_size": { "default_value": 1.6 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/eazao_zero_extruder_0.def.json b/resources/extruders/eazao_zero_extruder_0.def.json index 5bec712d06..f4b958fba7 100644 --- a/resources/extruders/eazao_zero_extruder_0.def.json +++ b/resources/extruders/eazao_zero_extruder_0.def.json @@ -13,4 +13,4 @@ "machine_nozzle_size": { "default_value": 1.6 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file From 8f46c17408b7fadb5658b12caf158fdc8b031ea3 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 7 Aug 2024 10:12:49 +0200 Subject: [PATCH 45/54] Help out PR: Set Eazao t/b pattern to concentric. --- resources/definitions/eazao_m500.def.json | 1 + resources/definitions/eazao_m600.def.json | 1 + resources/definitions/eazao_m700.def.json | 1 + resources/definitions/eazao_potter.def.json | 1 + resources/definitions/eazao_zero.def.json | 1 + 5 files changed, 5 insertions(+) diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index 026d377616..4bc977e7b0 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -68,6 +68,7 @@ "speed_wall_0": { "value": 20.0 }, "speed_wall_x": { "value": 20.0 }, "speed_z_hop": { "value": "machine_max_feedrate_z" }, + "top_bottom_pattern": { "value": "concentric" }, "top_bottom_thickness": { "value": 3 }, "wall_thickness": { "value": 5.0 } } diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json index c487af3836..12e359ba13 100644 --- a/resources/definitions/eazao_m600.def.json +++ b/resources/definitions/eazao_m600.def.json @@ -68,6 +68,7 @@ "speed_wall_0": { "value": 20.0 }, "speed_wall_x": { "value": 20.0 }, "speed_z_hop": { "value": "machine_max_feedrate_z" }, + "top_bottom_pattern": { "value": "concentric" }, "top_bottom_thickness": { "value": 3 }, "wall_thickness": { "value": 5.0 } } diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json index 54f8316282..7de1b54c0d 100644 --- a/resources/definitions/eazao_m700.def.json +++ b/resources/definitions/eazao_m700.def.json @@ -68,6 +68,7 @@ "speed_wall_0": { "value": 20.0 }, "speed_wall_x": { "value": 20.0 }, "speed_z_hop": { "value": "machine_max_feedrate_z" }, + "top_bottom_pattern": { "value": "concentric" }, "top_bottom_thickness": { "value": 3 }, "wall_thickness": { "value": 5.0 } } diff --git a/resources/definitions/eazao_potter.def.json b/resources/definitions/eazao_potter.def.json index 0d09bb10bf..579ad10292 100644 --- a/resources/definitions/eazao_potter.def.json +++ b/resources/definitions/eazao_potter.def.json @@ -68,6 +68,7 @@ "speed_wall_0": { "value": 25.0 }, "speed_wall_x": { "value": 25.0 }, "speed_z_hop": { "value": "machine_max_feedrate_z" }, + "top_bottom_pattern": { "value": "concentric" }, "top_bottom_thickness": { "value": 3 }, "wall_thickness": { "value": 3.0 } } diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index c1552a6657..45fade6a10 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -66,6 +66,7 @@ "smooth_spiralized_contours": { "value": true }, "speed_print": { "value": 25.0 }, "speed_z_hop": { "value": "machine_max_feedrate_z" }, + "top_bottom_pattern": { "value": "concentric" }, "top_bottom_thickness": { "value": 3 }, "wall_thickness": { "value": 3.0 } } From acf5a222cd8c64b1c2eb719280bdc3421bb119e9 Mon Sep 17 00:00:00 2001 From: Oliver Mattos Date: Thu, 8 Aug 2024 15:38:14 +0100 Subject: [PATCH 46/54] Adjust enable criteria and expand on description --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 65de59c27f..661cb6d0dd 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2356,7 +2356,7 @@ "extra_infill_lines_to_support_skins": { "label": "Extra Infill Lines To Support Skins", - "description": "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above.", + "description": "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin.", "type": "enum", "options": { @@ -2366,7 +2366,7 @@ }, "default_value": "walls_and_lines", "value": "'none' if infill_sparse_density > 50 else 'walls' if skin_edge_support_thickness > 0 else 'walls_and_lines'", - "enabled": "infill_sparse_density > 0" + "enabled": "infill_sparse_density > 0 and infill_pattern not in ('lightning', 'concentric', 'cross','cross_3d')" }, "lightning_infill_support_angle": { From dc4a92d960613dea31745bcbc77cf27dca74c42a Mon Sep 17 00:00:00 2001 From: Oliver Mattos Date: Thu, 8 Aug 2024 17:39:58 +0100 Subject: [PATCH 47/54] A few more enable conditions for extra_infill_lines_to_support_skins --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 00e2f76f1e..579197d024 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2367,7 +2367,7 @@ }, "default_value": "walls_and_lines", "value": "'none' if infill_sparse_density > 50 else 'walls' if skin_edge_support_thickness > 0 else 'walls_and_lines'", - "enabled": "infill_sparse_density > 0 and infill_pattern not in ('lightning', 'concentric', 'cross','cross_3d')" + "enabled": "infill_sparse_density > 0 and infill_pattern not in ('lightning', 'concentric', 'cross','cross_3d') and wall_line_count > 0 and top_layers > 0" }, "lightning_infill_support_angle": { From da1f7edd013c40493e868eb2e5ec9ded708eb0ba Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 13 Aug 2024 15:43:52 +0200 Subject: [PATCH 48/54] Update the release tag if already existing --- .github/workflows/release-process_release-candidate.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 3d59817996..82714e874e 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -76,11 +76,16 @@ jobs: ref: ${{ needs.parse-version.outputs.branch_name }} token: ${{ secrets.CURA_AUTORELEASE_PAT }} - - name: Create tag + - name: Create RC tag run: | git tag ${{ needs.find-rc-tag.outputs.tag_name }} git push origin tag ${{ needs.find-rc-tag.outputs.tag_name }} + - name: Create release tag + run: | + git tag -f ${{ inputs.cura_version }} + git push -f origin tag ${{ inputs.cura_version }} + create-dependencies-packages: name: Create conan packages for dependencies uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@main From ce7743b7d638359b5c485d39fc945b07a15f2aaf Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 13 Aug 2024 16:02:38 +0200 Subject: [PATCH 49/54] Use only the relevant tag when creating a release candidate --- .github/workflows/release-process_release-candidate.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 82714e874e..edcbffedd4 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -146,16 +146,9 @@ jobs: - name: Extract changelog run: python ./scripts/extract_changelog.py --version ${{ needs.parse-version.outputs.version_major }}.${{ needs.parse-version.outputs.version_minor }}.${{ needs.parse-version.outputs.version_patch }} --changelog ./resources/texts/change_log.txt > formatted_changelog.txt - - name: Get commit id for release - id: get-commit-id - uses: iawia002/get-tag-or-commit-id@v1.0.1 - with: - length: 40 - - name: Create release uses: notpeelz/action-gh-create-release@v5.0.1 with: - target: ${{ steps.get-commit-id.outputs.id }} tag: ${{ inputs.cura_version }} strategy: replace title: UltiMaker Cura ${{ inputs.cura_version }} From 2428e6c7417ea1bf347e0b97c0c311659ca0e15c Mon Sep 17 00:00:00 2001 From: Remco Burema <41987080+rburema@users.noreply.github.com> Date: Tue, 13 Aug 2024 17:29:16 +0200 Subject: [PATCH 50/54] Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/eazao_m500.def.json | 3 +-- resources/definitions/eazao_m600.def.json | 3 +-- resources/definitions/eazao_m700.def.json | 3 +-- resources/definitions/eazao_potter.def.json | 3 +-- resources/definitions/eazao_zero.def.json | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index 4bc977e7b0..aa45e01468 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -61,8 +61,7 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, - "smooth_spiralized_contours": { "value": true }, - "speed_print": { "value": 20.0 }, + "speed_print": { "value": 20.0 }, "speed_travel": { "value": 20.0 }, "speed_wall": { "value": 20.0 }, "speed_wall_0": { "value": 20.0 }, diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json index 12e359ba13..1cd1f5304e 100644 --- a/resources/definitions/eazao_m600.def.json +++ b/resources/definitions/eazao_m600.def.json @@ -61,8 +61,7 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, - "smooth_spiralized_contours": { "value": true }, - "speed_print": { "value": 20.0 }, + "speed_print": { "value": 20.0 }, "speed_travel": { "value": 20.0 }, "speed_wall": { "value": 20.0 }, "speed_wall_0": { "value": 20.0 }, diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json index 7de1b54c0d..baa1084d25 100644 --- a/resources/definitions/eazao_m700.def.json +++ b/resources/definitions/eazao_m700.def.json @@ -61,8 +61,7 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, - "smooth_spiralized_contours": { "value": true }, - "speed_print": { "value": 20.0 }, + "speed_print": { "value": 20.0 }, "speed_travel": { "value": 20.0 }, "speed_wall": { "value": 20.0 }, "speed_wall_0": { "value": 20.0 }, diff --git a/resources/definitions/eazao_potter.def.json b/resources/definitions/eazao_potter.def.json index 579ad10292..4b570580ce 100644 --- a/resources/definitions/eazao_potter.def.json +++ b/resources/definitions/eazao_potter.def.json @@ -61,8 +61,7 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, - "smooth_spiralized_contours": { "value": true }, - "speed_print": { "value": 25.0 }, + "speed_print": { "value": 25.0 }, "speed_travel": { "value": 25.0 }, "speed_wall": { "value": 25.0 }, "speed_wall_0": { "value": 25.0 }, diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index 45fade6a10..3a59f03fe3 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -63,8 +63,7 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, - "smooth_spiralized_contours": { "value": true }, - "speed_print": { "value": 25.0 }, + "speed_print": { "value": 25.0 }, "speed_z_hop": { "value": "machine_max_feedrate_z" }, "top_bottom_pattern": { "value": "concentric" }, "top_bottom_thickness": { "value": 3 }, From 4973eb625c31ecfad698fd12e01100c352e017b3 Mon Sep 17 00:00:00 2001 From: rburema Date: Tue, 13 Aug 2024 15:30:15 +0000 Subject: [PATCH 51/54] Applied printer-linter format --- resources/definitions/eazao_m500.def.json | 2 +- resources/definitions/eazao_m600.def.json | 2 +- resources/definitions/eazao_m700.def.json | 2 +- resources/definitions/eazao_potter.def.json | 2 +- resources/definitions/eazao_zero.def.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index aa45e01468..70ab78a5a6 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -61,7 +61,7 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, - "speed_print": { "value": 20.0 }, + "speed_print": { "value": 20.0 }, "speed_travel": { "value": 20.0 }, "speed_wall": { "value": 20.0 }, "speed_wall_0": { "value": 20.0 }, diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json index 1cd1f5304e..35a946e25e 100644 --- a/resources/definitions/eazao_m600.def.json +++ b/resources/definitions/eazao_m600.def.json @@ -61,7 +61,7 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, - "speed_print": { "value": 20.0 }, + "speed_print": { "value": 20.0 }, "speed_travel": { "value": 20.0 }, "speed_wall": { "value": 20.0 }, "speed_wall_0": { "value": 20.0 }, diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json index baa1084d25..8459b3625d 100644 --- a/resources/definitions/eazao_m700.def.json +++ b/resources/definitions/eazao_m700.def.json @@ -61,7 +61,7 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, - "speed_print": { "value": 20.0 }, + "speed_print": { "value": 20.0 }, "speed_travel": { "value": 20.0 }, "speed_wall": { "value": 20.0 }, "speed_wall_0": { "value": 20.0 }, diff --git a/resources/definitions/eazao_potter.def.json b/resources/definitions/eazao_potter.def.json index 4b570580ce..0ff84ab429 100644 --- a/resources/definitions/eazao_potter.def.json +++ b/resources/definitions/eazao_potter.def.json @@ -61,7 +61,7 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, - "speed_print": { "value": 25.0 }, + "speed_print": { "value": 25.0 }, "speed_travel": { "value": 25.0 }, "speed_wall": { "value": 25.0 }, "speed_wall_0": { "value": 25.0 }, diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index 3a59f03fe3..df6f4faa18 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -63,7 +63,7 @@ "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, - "speed_print": { "value": 25.0 }, + "speed_print": { "value": 25.0 }, "speed_z_hop": { "value": "machine_max_feedrate_z" }, "top_bottom_pattern": { "value": "concentric" }, "top_bottom_thickness": { "value": 3 }, From 7a944e94bb530c537bd580877fe0d8024db05928 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 14 Aug 2024 08:55:51 +0200 Subject: [PATCH 52/54] Get the proper commit to create the release --- .../release-process_release-candidate.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index edcbffedd4..47b07381b5 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -65,6 +65,8 @@ jobs: name: Create tags runs-on: ubuntu-latest needs: [parse-version, find-rc-tag] + outputs: + main_commit: ${{ steps.export-main-commit.main_commit }} strategy: matrix: repository: [Cura, Uranium, CuraEngine, cura-binary-data, fdm_materials] @@ -81,11 +83,18 @@ jobs: git tag ${{ needs.find-rc-tag.outputs.tag_name }} git push origin tag ${{ needs.find-rc-tag.outputs.tag_name }} - - name: Create release tag + - name: Create or update release tag run: | git tag -f ${{ inputs.cura_version }} git push -f origin tag ${{ inputs.cura_version }} + - name: Export Cura tagged commit + id: export-main-commit + if: ${{ matrix.repository == "Cura" }} + run: | + echo "main_commit=`git rev-parse HEAD`" >> "$GITHUB_OUTPUT" + + create-dependencies-packages: name: Create conan packages for dependencies uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@main @@ -136,7 +145,7 @@ jobs: create-release-draft: name: Create the release draft runs-on: ubuntu-latest - needs: [create-installers, parse-version] + needs: [create-installers, parse-version, create-tags] steps: - name: Checkout Cura repo uses: actions/checkout@v4 @@ -149,6 +158,7 @@ jobs: - name: Create release uses: notpeelz/action-gh-create-release@v5.0.1 with: + target: ${{ needs.create-tags.outputs.main_commit }} tag: ${{ inputs.cura_version }} strategy: replace title: UltiMaker Cura ${{ inputs.cura_version }} From e63619d6f6a81a225316175c25a1bcbdc51c1fac Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 14 Aug 2024 09:00:21 +0200 Subject: [PATCH 53/54] Fix script syntax --- .github/workflows/release-process_release-candidate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 47b07381b5..196b4783b6 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -90,7 +90,7 @@ jobs: - name: Export Cura tagged commit id: export-main-commit - if: ${{ matrix.repository == "Cura" }} + if: ${{ matrix.repository == 'Cura' }} run: | echo "main_commit=`git rev-parse HEAD`" >> "$GITHUB_OUTPUT" From 69bb46298053b2bccfa9f3437803eac393e8fd9b Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 14 Aug 2024 10:18:37 +0200 Subject: [PATCH 54/54] Fix outputting the main commit --- .github/workflows/release-process_release-candidate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 196b4783b6..d14701d278 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -66,7 +66,7 @@ jobs: runs-on: ubuntu-latest needs: [parse-version, find-rc-tag] outputs: - main_commit: ${{ steps.export-main-commit.main_commit }} + main_commit: ${{ steps.export-main-commit.outputs.main_commit }} strategy: matrix: repository: [Cura, Uranium, CuraEngine, cura-binary-data, fdm_materials]