From f192df875b6948887aa85e7e3bf0324dea0eb9db Mon Sep 17 00:00:00 2001 From: whoseyoung Date: Sat, 10 Dec 2022 17:17:49 +0800 Subject: [PATCH] update official profiles for Geeetech printers --- resources/definitions/Geeetech_base.def.json | 126 ++++++++---------- .../definitions/geeetech_A10Pro.def.json | 5 +- resources/definitions/geeetech_A20.def.json | 5 +- .../definitions/geeetech_A30Pro.def.json | 5 +- resources/definitions/geeetech_E180.def.json | 5 +- .../geeetech_GiantArmD200.def.json | 10 +- .../definitions/geeetech_I3ProB.def.json | 7 +- .../definitions/geeetech_I3ProC.def.json | 2 +- .../definitions/geeetech_I3ProW.def.json | 7 +- .../definitions/geeetech_MeCreator.def.json | 7 +- .../definitions/geeetech_MeCreator2.def.json | 7 +- .../definitions/geeetech_MeDucer.def.json | 7 +- resources/definitions/geeetech_Mizar.def.json | 5 +- .../definitions/geeetech_MizarM.def.json | 2 +- .../definitions/geeetech_MizarPro.def.json | 5 +- .../definitions/geeetech_MizarS.def.json | 7 +- .../definitions/geeetech_Thunder.def.json | 71 +++++----- .../variants/geeetech_MeCreator2_0.2.inst.cfg | 2 +- 18 files changed, 160 insertions(+), 125 deletions(-) diff --git a/resources/definitions/Geeetech_base.def.json b/resources/definitions/Geeetech_base.def.json index 910d6a351d..bb30682803 100644 --- a/resources/definitions/Geeetech_base.def.json +++ b/resources/definitions/Geeetech_base.def.json @@ -14,22 +14,19 @@ "variants_name": "Nozzle Size", "preferred_variant_name": "0.4mm Nozzle", "preferred_quality_type": "standard", - "preferred_material": "generic_pla", - "machine_extruder_trains": { - "0": "Geeetech_base_extruder_0" - } + "preferred_material": "generic_pla" }, "overrides":{ "machine_name": { "default_value": "Geeetech Base Printer" }, - "machine_width": { "default_value": 300 }, - "machine_depth": { "default_value": 300 }, - "machine_height": {"default_value": 300 }, + "machine_width": { "default_value": 350 }, + "machine_depth": { "default_value": 350 }, + "machine_height": {"default_value": 350 }, "machine_head_with_fans_polygon": { "default_value": [[-40, 40], [40, 40], [40, -40], [-40, -40]] }, "gantry_height": { "value": 40 }, "machine_start_gcode": { "default_value": ";Geeetech Custom Start G-code\nM104 S{material_print_temperature_layer_0} ;Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ;Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nG28 ;Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ;ON Light\n;M106 P0 S383 ;ON MainFan 150% if need\n;M106 P1 S255 ;ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ;Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ;Draw the first line\nG92 E0 ;Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ;Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ;Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": ";Geeetech Custom end G-code\nG91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers\n\n\n" }, + "machine_end_gcode": { "default_value": ";Geeetech Custom end G-code\nG91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers\n\n\n" }, "machine_heated_bed": { "default_value": true }, "machine_max_feedrate_x": { "value": 500 }, @@ -48,73 +45,68 @@ "acceleration_print": { "value": 500 }, "acceleration_travel": { "value": 500 }, "acceleration_travel_layer_0": { "value": "acceleration_travel" }, - "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, - "line_width": {"value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size"}, - "retraction_speed": {"default_value": 40 }, - "infill_pattern": {"value": "'lines' if infill_sparse_density > 50 else 'grid'" }, - "small_hole_max_size":{"value": "5 if speed_infill>=150 else 0" }, - "cool_min_layer_time":{"value": "1.3 if speed_infill>=200 else 5" }, - "material_print_temperature": {"default_value": 200,"value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230", "maximum_value": "250" }, - "material_print_temperature_layer_0": {"value": "material_print_temperature + 5", "maximum_value_warning": 250 }, - "material_initial_print_temperature": {"value": "material_print_temperature - 5", "minimum_value_warning": "material_standby_temperature - 10" }, - "material_final_print_temperature": {"value": "material_print_temperature" }, - "material_bed_temperature": {"maximum_value_warning": 110 }, + "line_width": { "value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size" }, + "retraction_speed": { "value": 40 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" }, + "small_hole_max_size":{ "value": "5 if speed_infill>=150 else 0" }, + "cool_min_layer_time":{ "value": "1.3 if speed_infill>=200 else 5" }, + "material_print_temperature": { "value": "200 if speed_infill <=100 else 210 if speed_infill <= 150 else 220 if speed_infill <= 180 else 230", "maximum_value": "250" }, + "material_print_temperature_layer_0": { "value": "material_print_temperature + 5", "maximum_value_warning": 250 }, + "material_initial_print_temperature": { "value": "material_print_temperature - 5", "minimum_value_warning": "material_standby_temperature - 10" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_bed_temperature": { "maximum_value_warning": 110 }, - "speed_wall": {"value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))"}, - "speed_wall_0": {"value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))"}, - "speed_wall_x": {"value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))"}, - "speed_topbottom": {"value": "speed_print"}, - "speed_travel": {"value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120"}, - "speed_layer_0": {"value":"50 if speed_infill <= 150 else 75","maximum_value_warning": "100"}, - "speed_print_layer_0": {"value": "25 if speed_infill <= 150 else 35","maximum_value_warning": "60"}, - "speed_travel_layer_0": {"value": "speed_layer_0","maximum_value_warning": "150"}, - "skirt_brim_speed": {"value":"speed_print_layer_0","maximum_value_warning": "60"}, + "speed_wall": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "speed_wall_0": { "value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))" }, + "speed_wall_x": { "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))" }, + "speed_topbottom": { "value": "speed_print" }, + "speed_travel": { "value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120" }, + "speed_layer_0": { "value":"50 if speed_infill <= 150 else 75","maximum_value_warning": "100" }, + "speed_print_layer_0": { "value": "25 if speed_infill <= 150 else 35","maximum_value_warning": "60" }, + "speed_travel_layer_0": { "value": "speed_layer_0","maximum_value_warning": "150" }, + "skirt_brim_speed": { "value":"speed_print_layer_0","maximum_value_warning": "60" }, - "speed_support": {"value": "speed_print*0.5"}, - "speed_support_interface": {"value": "speed_support / 0.8"}, - "speed_support_roof": {"value": "speed_support_interface / 2"}, - "speed_support_bottom": {"value": "speed_support_roof"}, + "speed_support": { "value": "speed_print*0.5" }, + "speed_support_interface": { "value": "speed_support / 0.8" }, + "speed_support_roof": { "value": "speed_support_interface / 2" }, + "speed_support_bottom": { "value": "speed_support_roof" }, - "wall_transition_filter_deviation":{"value": 0.15 }, - "travel_avoid_supports": {"value": true }, - "retraction_hop": {"value": 0.5 }, - "retraction_combing": {"value": "'off' if retraction_hop_enabled else 'all'" }, - "retraction_combing_max_distance": {"value": 30 }, - "optimize_wall_printing_order": {"value": true }, - "z_seam_type": {"value": "'sharpest_corner'"}, - "z_seam_corner": {"value": "'z_seam_corner_inner'"}, + "wall_transition_filter_deviation":{ "value": 0.15 }, + "travel_avoid_supports": { "value": true }, + "retraction_hop": { "value": 0.5 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'all'" }, + "retraction_combing_max_distance": { "value": 30 }, + "optimize_wall_printing_order": { "value": true }, + "z_seam_type": { "value": "'sharpest_corner'" }, + "z_seam_corner": { "value": "'z_seam_corner_inner'" }, - "support_type": {"default_value": "'everywhere'" }, - "support_use_towers": {"value": false }, - "support_pattern": {"value": "'zigzag'" }, - "support_wall_count": {"value": 0 }, - "support_infill_rate": {"value": "0 if support_enable and support_structure == 'tree' else 20" }, - "support_brim_enable": {"value": true }, - "support_brim_width": {"value": 5 }, - "support_z_distance": {"value": "layer_height if layer_height >= 0.16 else layer_height*2" }, - "support_xy_distance": {"value": "wall_line_width_0 * 2" }, - "support_xy_distance_overhang": {"value": "wall_line_width_0" }, + "support_use_towers": { "value": false }, + "support_pattern": { "value": "'zigzag'" }, + "support_wall_count": { "value": 0 }, + "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 5 }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "support_xy_distance": { "value": "wall_line_width_0 * 2" }, + "support_xy_distance_overhang": { "value": "wall_line_width_0" }, - "support_interface_height": {"value": "layer_height * 3" }, - "support_interface_density": {"value": 33.333 }, - "support_interface_skip_height": {"value": 0.2 }, - "support_interface_pattern": {"default_value": "zigzag" }, - "support_roof_pattern": {"default_value": "zigzag" }, - "support_bottom_pattern": {"default_value": "zigzag" }, + "support_interface_height": { "value": "layer_height * 3" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_skip_height": { "value": 0.2 }, + "support_interface_pattern": { "value": "zigzag" }, - "minimum_support_area": {"value": 2 }, - "minimum_interface_area": {"value": 10 }, - "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, - "wall_thickness": {"value": "line_width * 2" }, + "minimum_support_area": { "value": 2 }, + "minimum_interface_area": { "value": 10 }, + "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, + "wall_thickness": { "value": "line_width * 2" }, - "adhesion_type": {"value": "'skirt'" }, - "brim_replaces_support": {"value": false }, - "skirt_gap": {"value": 6 }, - "brim_line_count": {"default_value": 5 }, + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "skirt_gap": { "value": 6 }, - "prime_tower_size": { "value": 30 }, - "prime_tower_min_volume":{ "value": 85, "maximum_value_warning":150 }, - "prime_tower_brim_enable":{ "value": true } + "prime_tower_size": { "value": 30 }, + "prime_tower_min_volume": { "value": 85, "maximum_value_warning":150 }, + "prime_tower_brim_enable": { "value": true } } } diff --git a/resources/definitions/geeetech_A10Pro.def.json b/resources/definitions/geeetech_A10Pro.def.json index bb93eb67b1..eb9616bf64 100644 --- a/resources/definitions/geeetech_A10Pro.def.json +++ b/resources/definitions/geeetech_A10Pro.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/geeetech_A20.def.json b/resources/definitions/geeetech_A20.def.json index 0caa866b7b..0d38988d16 100644 --- a/resources/definitions/geeetech_A20.def.json +++ b/resources/definitions/geeetech_A20.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/geeetech_A30Pro.def.json b/resources/definitions/geeetech_A30Pro.def.json index 5b428080fc..ebf23a0eef 100644 --- a/resources/definitions/geeetech_A30Pro.def.json +++ b/resources/definitions/geeetech_A30Pro.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/geeetech_E180.def.json b/resources/definitions/geeetech_E180.def.json index 28e93ab57b..d61086259b 100644 --- a/resources/definitions/geeetech_E180.def.json +++ b/resources/definitions/geeetech_E180.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/geeetech_GiantArmD200.def.json b/resources/definitions/geeetech_GiantArmD200.def.json index 137bf8924e..663b206ba7 100644 --- a/resources/definitions/geeetech_GiantArmD200.def.json +++ b/resources/definitions/geeetech_GiantArmD200.def.json @@ -7,16 +7,20 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { - "machine_name": { "default_value": "Geeetech GiantArmD200" }, + "machine_name": { "default_value": "Geeetech GiantArmD200" }, + "machine_width": { "default_value": 300 }, "machine_depth": { "default_value": 180 }, "machine_height": {"default_value": 180 }, "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, "gantry_height": { "value": 45 }, - "retraction_amount": { "default_value": 2 }, + "retraction_amount": { "value": 2 }, "machine_start_gcode": { "default_value": ";Geeetech GiantArmD200 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y160.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y160.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } diff --git a/resources/definitions/geeetech_I3ProB.def.json b/resources/definitions/geeetech_I3ProB.def.json index 25b7a6c987..399ec0df0a 100644 --- a/resources/definitions/geeetech_I3ProB.def.json +++ b/resources/definitions/geeetech_I3ProB.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { @@ -17,7 +20,7 @@ "machine_height": {"default_value": 180 }, "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, "gantry_height": { "value": 45 }, - "retraction_amount": { "default_value": 2 }, + "retraction_amount": { "value": 2 }, "machine_start_gcode": { "default_value": ";Geeetech I3ProB Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y180.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y180.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } diff --git a/resources/definitions/geeetech_I3ProC.def.json b/resources/definitions/geeetech_I3ProC.def.json index c7e5d01410..e4fdbff3ea 100644 --- a/resources/definitions/geeetech_I3ProC.def.json +++ b/resources/definitions/geeetech_I3ProC.def.json @@ -21,7 +21,7 @@ "machine_height": {"default_value": 180 }, "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, "gantry_height": { "value": 45 }, - "retraction_amount": { "default_value": 2 }, + "retraction_amount": { "value": 2 }, "brim_width":{ "value": 10 }, "prime_tower_position_x":{ "value": 170 }, "prime_tower_position_y":{ "value": 140 }, diff --git a/resources/definitions/geeetech_I3ProW.def.json b/resources/definitions/geeetech_I3ProW.def.json index 1db41552db..acb0bb10ad 100644 --- a/resources/definitions/geeetech_I3ProW.def.json +++ b/resources/definitions/geeetech_I3ProW.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { @@ -17,7 +20,7 @@ "machine_height": {"default_value": 180 }, "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, "gantry_height": { "value": 45 }, - "retraction_amount": { "default_value": 2 }, + "retraction_amount": { "value": 2 }, "machine_start_gcode": { "default_value": ";Geeetech I3ProW Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y180.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y180.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } diff --git a/resources/definitions/geeetech_MeCreator.def.json b/resources/definitions/geeetech_MeCreator.def.json index a35756f440..1f9ed2c6b9 100644 --- a/resources/definitions/geeetech_MeCreator.def.json +++ b/resources/definitions/geeetech_MeCreator.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { @@ -17,7 +20,7 @@ "machine_height": {"default_value": 125 }, "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, "gantry_height": { "value": 45 }, - "retraction_amount": { "default_value": 2 }, + "retraction_amount": { "value": 2 }, "machine_start_gcode": { "default_value": ";Geeetech MeCreator Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y130.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y130.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } diff --git a/resources/definitions/geeetech_MeCreator2.def.json b/resources/definitions/geeetech_MeCreator2.def.json index c9bed615fa..3a856ca67a 100644 --- a/resources/definitions/geeetech_MeCreator2.def.json +++ b/resources/definitions/geeetech_MeCreator2.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { @@ -17,7 +20,7 @@ "machine_height": {"default_value": 160 }, "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, "gantry_height": { "value": 45 }, - "retraction_amount": { "default_value": 2 }, + "retraction_amount": { "value": 2 }, "machine_start_gcode": { "default_value": ";Geeetech MeCreator2 Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y140.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y140.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } diff --git a/resources/definitions/geeetech_MeDucer.def.json b/resources/definitions/geeetech_MeDucer.def.json index c4b65bfe3b..ef17de75c3 100644 --- a/resources/definitions/geeetech_MeDucer.def.json +++ b/resources/definitions/geeetech_MeDucer.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { @@ -17,7 +20,7 @@ "machine_height": {"default_value": 150 }, "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, "gantry_height": { "value": 45 }, - "retraction_amount": { "default_value": 2 }, + "retraction_amount": { "value": 2 }, "machine_start_gcode": { "default_value": ";Geeetech MeDucer Custom Start G-code\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y10 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y130.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y130.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y10 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y10 Z0.4 F3000.0 ; Scrape off nozzle residue" }, "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-1.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } diff --git a/resources/definitions/geeetech_Mizar.def.json b/resources/definitions/geeetech_Mizar.def.json index 38fcb151e6..b9569c7649 100644 --- a/resources/definitions/geeetech_Mizar.def.json +++ b/resources/definitions/geeetech_Mizar.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/geeetech_MizarM.def.json b/resources/definitions/geeetech_MizarM.def.json index 28bf7dfe76..3a8f31bf9b 100644 --- a/resources/definitions/geeetech_MizarM.def.json +++ b/resources/definitions/geeetech_MizarM.def.json @@ -20,7 +20,7 @@ "machine_depth": { "default_value": 255 }, "machine_height": {"default_value": 260 }, "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, - "gantry_height": { "value": 35 }, + "gantry_height": { "value": 35 }, "brim_width":{ "value": 10 }, "prime_tower_position_x":{ "value": 225 }, "prime_tower_position_y":{ "value": 195 }, diff --git a/resources/definitions/geeetech_MizarPro.def.json b/resources/definitions/geeetech_MizarPro.def.json index 0040fb3dd8..b91ef3e066 100644 --- a/resources/definitions/geeetech_MizarPro.def.json +++ b/resources/definitions/geeetech_MizarPro.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { diff --git a/resources/definitions/geeetech_MizarS.def.json b/resources/definitions/geeetech_MizarS.def.json index 8f097e2bde..f2d026aeb8 100644 --- a/resources/definitions/geeetech_MizarS.def.json +++ b/resources/definitions/geeetech_MizarS.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { @@ -19,6 +22,6 @@ "gantry_height": { "value": 35 }, "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarS: https://github.com/Geeetech3D/Mizar-S \n\nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM190 S{material_bed_temperature_layer_0} ; Wait for Bed Temperature\nM109 S{material_print_temperature_layer_0} ; Wait for Hotend Temperature\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 P0 ;Off Main Fan\nM107 P1 ;Off Aux Fan\nM2012 P8 S1 F100 ; ON Light\n;M106 P0 S383 ; ON MainFan 150% if need\n;M106 P1 S255 ; ON Aux Fan 100% if need\nG1 Z5.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.8 F5000 ; Move to start position\nG1 X0.1 Y200.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y200.0 Z1.2 F3000 ; Move to side a little\nG1 X0.4 Y20 Z1.2 F1500 E25 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.4 F3000.0 ; Scrape off nozzle residue" }, - "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } + "machine_end_gcode": { "default_value": "G91 ;Switch to relative positioning\nG1 E-2.5 F2700 ;Retract filament\nG1 E-1.5 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Move away\nG1 Z10 ;lift print head\nG90 ;Switch to absolute positioning\nG28 X Y ;homing XY\nM106 S0 ;off Fan\nM104 S0 ;Cooldown hotend\nM140 S0 ;Cooldown bed\nM84 X Y E ;Disable steppers" } } } diff --git a/resources/definitions/geeetech_Thunder.def.json b/resources/definitions/geeetech_Thunder.def.json index 0261b5396a..141459dae8 100644 --- a/resources/definitions/geeetech_Thunder.def.json +++ b/resources/definitions/geeetech_Thunder.def.json @@ -7,7 +7,10 @@ "visible": true, "has_materials": true, "has_variants": true, - "has_machine_quality": true + "has_machine_quality": true, + "machine_extruder_trains": { + "0": "Geeetech_base_extruder_0" + } }, "overrides": { @@ -29,46 +32,46 @@ "machine_max_jerk_xy": { "value": 45 }, "machine_max_jerk_z": { "value": 0.8 }, "machine_max_jerk_e": { "value": 8 }, - "acceleration_print": { "value": 3500 }, + "acceleration_print": { "value": 3500 }, "acceleration_travel": { "value": 5000 }, - "line_width": {"value": "1.2*machine_nozzle_size if speed_infill>=200 else machine_nozzle_size"}, - "fill_outline_gaps": {"label": "Print Thin Walls", "value": false }, - "retraction_speed": { "default_value": 35 }, - "infill_sparse_density": {"label": "Infill Density","value": "15" }, - "small_hole_max_size":{"value": "8 if speed_infill>=200 else 0" }, - "cool_min_layer_time":{"value": "1.3 if speed_infill>=200 else 2.5" }, - "cool_fan_full_at_height": {"label": "Regular Fan Speed at Height","value": "layer_height_0 + layer_height" }, - "cool_fan_speed":{"maximum_value": "151","default_value": 100,"value": "151 if speed_infill>=200 else 100" }, - "cool_fan_speed_min":{"maximum_value": "151","default_value": 100,"value": "cool_fan_speed"}, - "cool_fan_speed_max":{"maximum_value": "151","default_value": 100,"value": "cool_fan_speed"}, + "line_width": { "value": "1.2*machine_nozzle_size if speed_infill>=200 else machine_nozzle_size" }, + "fill_outline_gaps": { "label": "Print Thin Walls", "value": false }, + "retraction_speed": { "value": 35 }, + "infill_sparse_density": { "label": "Infill Density","value": "15" }, + "small_hole_max_size":{ "value": "8 if speed_infill>=200 else 0" }, + "cool_min_layer_time":{ "value": "1.3 if speed_infill>=200 else 2.5" }, + "cool_fan_full_at_height": { "label": "Regular Fan Speed at Height","value": "layer_height_0 + layer_height" }, + "cool_fan_speed":{ "maximum_value": "151","value": "151 if speed_infill>=200 else 100" }, + "cool_fan_speed_min":{ "maximum_value": "151","value": "cool_fan_speed" }, + "cool_fan_speed_max":{ "maximum_value": "151","value": "cool_fan_speed" }, - "material_print_temperature": {"value": "200 if speed_infill <=150 else 205 if speed_infill <= 200 else 215 if speed_infill <= 260 else 220","maximum_value": "250" }, + "material_print_temperature": { "value": "200 if speed_infill <=150 else 205 if speed_infill <= 200 else 215 if speed_infill <= 260 else 220","maximum_value": "250" }, "material_print_temperature_layer_0": { "value": "material_print_temperature" }, - "material_initial_print_temperature": { "value": "material_print_temperature - 5 " }, - "material_flow_layer_0": { "default_value": 95 }, + "material_initial_print_temperature": { "value": "material_print_temperature - 5" }, + "material_flow_layer_0": { "value": 95 }, - "speed_print": { "default_value":250, "maximum_value_warning": "300" }, - "speed_infill": {"maximum_value_warning": "300"}, - "speed_wall": {"maximum_value_warning": "300"}, - "speed_wall_0": {"maximum_value_warning": "300"}, - "speed_wall_x": {"maximum_value_warning": "300"}, - "speed_topbottom": {"maximum_value_warning": "300"}, - "speed_roofing":{"maximum_value_warning": "300"}, - "speed_travel_layer_0": {"maximum_value_warning": "200"}, + "speed_print": { "value":250, "maximum_value_warning": "300" }, + "speed_infill": { "maximum_value_warning": "300" }, + "speed_wall": { "maximum_value_warning": "300" }, + "speed_wall_0": { "maximum_value_warning": "300" }, + "speed_wall_x": { "maximum_value_warning": "300" }, + "speed_topbottom": { "maximum_value_warning": "300" }, + "speed_roofing": { "maximum_value_warning": "300" }, + "speed_travel_layer_0": { "maximum_value_warning": "200" }, - "speed_support": {"maximum_value_warning": "200"}, - "speed_support_infill": {"maximum_value_warning": "200"}, - "speed_support_interface": {"maximum_value_warning": "200"}, - "speed_support_roof": {"maximum_value_warning": "200"}, - "speed_support_bottom": {"maximum_value_warning": "200"}, + "speed_support": { "maximum_value_warning": "200" }, + "speed_support_infill": { "maximum_value_warning": "200" }, + "speed_support_interface": { "maximum_value_warning": "200" }, + "speed_support_roof": { "maximum_value_warning": "200" }, + "speed_support_bottom": { "maximum_value_warning": "200" }, - "infill_before_walls": {"label": "Infill Before Walls", "value": false }, - "infill_wipe_dist": {"label": "Infill Wipe Distance", "value": 0.0 }, - "wall_0_wipe_dist": {"label": "Outer Wall Wipe Distance","value": 0.0 }, + "infill_before_walls": { "label": "Infill Before Walls", "value": false }, + "infill_wipe_dist": { "label": "Infill Wipe Distance", "value": 0.0 }, + "wall_0_wipe_dist": { "label": "Outer Wall Wipe Distance","value": 0.0 }, - "infill_overlap": {"label": "Infill Overlap Percentage", "value": 10.0 }, - "skin_overlap": {"label": "Skin Overlap Percentage", "value": 10.0 }, - "zig_zaggify_infill": {"label": "Connect Infill Lines","value": true } + "infill_overlap": { "label": "Infill Overlap Percentage", "value": 10.0 }, + "skin_overlap": { "label": "Skin Overlap Percentage", "value": 10.0 }, + "zig_zaggify_infill": { "label": "Connect Infill Lines","value": true } } } diff --git a/resources/variants/geeetech_MeCreator2_0.2.inst.cfg b/resources/variants/geeetech_MeCreator2_0.2.inst.cfg index ed4ccbb000..96c7308b11 100644 --- a/resources/variants/geeetech_MeCreator2_0.2.inst.cfg +++ b/resources/variants/geeetech_MeCreator2_0.2.inst.cfg @@ -1,7 +1,7 @@ [general] name = 0.2mm Nozzle version = 4 -definition = geeetech_MMeCreator2 +definition = geeetech_MeCreator2 [metadata] setting_version = 20