From 33b815dec59fc79e474017cee4d9c42515ee430d Mon Sep 17 00:00:00 2001 From: whoseyoung Date: Mon, 5 Dec 2022 18:45:09 +0800 Subject: [PATCH] add Geeetech 24 machine profiles --- resources/definitions/Geeetech_base.def.json | 151 ++++++++---------- resources/definitions/geeetech_A10M.def.json | 4 +- .../definitions/geeetech_A10Pro.def.json | 4 +- resources/definitions/geeetech_A10T.def.json | 4 +- resources/definitions/geeetech_A20.def.json | 4 +- resources/definitions/geeetech_A20M.def.json | 4 +- resources/definitions/geeetech_A20T.def.json | 4 +- resources/definitions/geeetech_A30M.def.json | 6 +- .../definitions/geeetech_A30Pro.def.json | 6 +- resources/definitions/geeetech_A30T.def.json | 6 +- resources/definitions/geeetech_E180.def.json | 1 - .../geeetech_GiantArmD200.def.json | 6 +- .../definitions/geeetech_I3ProB.def.json | 6 +- .../definitions/geeetech_I3ProC.def.json | 6 +- .../definitions/geeetech_I3ProW.def.json | 6 +- .../definitions/geeetech_MeCreator.def.json | 6 +- .../definitions/geeetech_MeCreator2.def.json | 6 +- .../definitions/geeetech_MeDucer.def.json | 6 +- resources/definitions/geeetech_Mizar.def.json | 4 +- .../definitions/geeetech_MizarM.def.json | 3 +- .../definitions/geeetech_MizarMax.def.json | 4 +- .../definitions/geeetech_MizarPro.def.json | 4 +- .../definitions/geeetech_MizarS.def.json | 4 +- .../definitions/geeetech_Thunder.def.json | 47 +++--- .../Geeetech_Dual_Extruder_0.def.json | 4 +- .../Geeetech_Dual_Extruder_1.def.json | 4 +- .../Geeetech_Multi_Extruder_0.def.json | 4 +- .../Geeetech_Multi_Extruder_1.def.json | 4 +- .../Geeetech_Multi_Extruder_2.def.json | 4 +- .../Geeetech_base_extruder_0.def.json | 4 +- 30 files changed, 141 insertions(+), 185 deletions(-) diff --git a/resources/definitions/Geeetech_base.def.json b/resources/definitions/Geeetech_base.def.json index 00f7902d8c..910d6a351d 100644 --- a/resources/definitions/Geeetech_base.def.json +++ b/resources/definitions/Geeetech_base.def.json @@ -22,122 +22,99 @@ "overrides":{ "machine_name": { "default_value": "Geeetech Base Printer" }, - "machine_width": { "default_value": 250 }, - "machine_depth": { "default_value": 250 }, - "machine_height": {"default_value": 260 }, - "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, - "gantry_height": { "value": 30 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_width": { "default_value": 300 }, + "machine_depth": { "default_value": 300 }, + "machine_height": {"default_value": 300 }, + "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": "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_extruder_count": { "default_value": 1}, - "machine_heated_bed": { "default_value": true }, - + "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 }, "machine_max_feedrate_y": { "value": 500 }, "machine_max_feedrate_z": { "value": 10 }, "machine_max_feedrate_e": { "value": 40 }, "machine_max_acceleration_x": { "value": 500 }, "machine_max_acceleration_y": { "value": 500 }, - "machine_max_acceleration_z": { "value": 100 }, + "machine_max_acceleration_z": { "value": 111 }, "machine_max_acceleration_e": { "value": 1000 }, "machine_acceleration": { "value": 500 }, "machine_max_jerk_xy": { "value": 10 }, "machine_max_jerk_z": { "value": 0.3 }, - "machine_max_jerk_e": { "value": 5 }, - "acceleration_enabled": { "value": false }, - "acceleration_travel_enabled":{ "value": false }, + "machine_max_jerk_e": { "value": 4.9 }, + "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" }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, - "line_width": {"default_value":"machine_nozzle_size","value": "1.125*machine_nozzle_size if speed_infill<=100 else machine_nozzle_size"}, - "fill_outline_gaps": {"label": "Print Thin Walls", "value": true }, - "retraction_amount": { "default_value": 6.5 }, - "retraction_enable": { "default_value": true }, - "retraction_speed": { "default_value": 40 }, - "infill_sparse_density": {"label": "Infill Density","value": "20" }, - "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" }, - "small_hole_max_size":{"default_value": 0,"value": "5 if speed_infill>=150 else 0" }, - "cool_min_layer_time":{"default_value": 5,"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": {"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 }, - "speed_print": { "default_value": 60, "maximum_value_warning": "300" }, - "speed_infill": {"default_value": 60, "value":"speed_print", "maximum_value_warning": "300"}, - "speed_wall": {"label": " Wall Speed ", "default_value": 30, "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))", "maximum_value_warning": "300"}, - "speed_wall_0": {"label": "Outer Wall Speed","default_value": 30, "value": "30 if speed_print==60 else math.ceil(round(speed_print*0.75))", "maximum_value_warning": "300"}, - "speed_wall_x": {"label": "Inner Wall Speed","default_value": 60, "value": "60 if speed_print==60 else math.ceil(round(speed_print*0.90))", "maximum_value_warning": "300"}, - "speed_roofing":{"default_value": 25, "value": "speed_print", "maximum_value_warning": "300"}, - "speed_topbottom": {"default_value": 30, "value": "speed_print", "maximum_value_warning": "300"}, - "speed_travel": {"default_value": 120, "value": "200 if 120<=speed_print<=200 else speed_print if speed_print>200 else 120", "maximum_value_warning": "300"}, - "speed_layer_0": {"default_value": 30, "value":"speed_travel_layer_0","maximum_value_warning": "300"}, - "speed_print_layer_0": {"default_value": 30, "value": "25 if speed_infill <= 150 else 35", "maximum_value_warning": "60"}, - "speed_travel_layer_0": {"default_value": 60,"value": "2*speed_print_layer_0", "maximum_value_warning": "300"}, - "skirt_brim_speed": {"default_value": 30, "value":"speed_print_layer_0", "maximum_value_warning": "60"}, - - "speed_support": {"default_value": 60, "value": "speed_print*0.5", "maximum_value_warning": "300"}, - "speed_support_infill": {"default_value":60, "value": "speed_support", "maximum_value_warning": "300"}, - "speed_support_interface": {"default_value": 40, "value": "speed_support", "maximum_value_warning": "300"}, - "speed_support_roof": {"default_value": 40, "value": "speed_support", "maximum_value_warning": "300"}, - "speed_support_bottom": {"default_value": 40, "value": "speed_support", "maximum_value_warning": "300"}, - - "wall_transition_filter_deviation":{"label": "Wall Transitioning Filter Margin","value": 0.15 }, - "inset_direction":{"label": "Wall Ordering","default_value": "inside_out" }, - "travel_avoid_other_parts": { "value": true }, - "travel_avoid_supports": { "value": true }, - "travel_retract_before_outer_wall": { "value": false }, - "retraction_hop_enabled": { "value": "False" }, - "retraction_hop": { "value": 0.2 }, - "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_enable": {"default_value": false }, - "support_use_towers": { "value": false }, - "support_angle": { "value": 50 }, - "support_type": {"default_value": "'everywhere'" }, - "support_pattern": { "value": "'zigzag'" }, - "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 25" }, - "support_xy_distance": { "value": "wall_line_width_0 * 2" }, - "support_xy_distance_overhang": { "value": "wall_line_width_0" }, - "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, - "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, - "support_wall_count": { "value": 0 }, - "support_brim_enable": { "value": true }, - "support_brim_width": { "value": 5 }, + "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"}, - "support_interface_enable": { "value": false }, - "support_roof_enable": {"default_value": false }, - "support_interface_height": { "value": "layer_height * 4" }, - "support_interface_density": { "value": 33.333 }, + "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'"}, + + "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_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_interface_skip_height": { "value": 0.2 }, "support_roof_pattern": {"default_value": "zigzag" }, "support_bottom_pattern": {"default_value": "zigzag" }, - "minimum_support_area": { "value": 2 }, - "minimum_interface_area": { "value": 10 }, + "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 }, - "skirt_line_count": { "value": 1 }, + "adhesion_type": {"value": "'skirt'" }, + "brim_replaces_support": {"value": false }, + "skirt_gap": {"value": 6 }, "brim_line_count": {"default_value": 5 }, - "prime_tower_enable":{ "value": false }, "prime_tower_size": { "value": 30 }, "prime_tower_min_volume":{ "value": 85, "maximum_value_warning":150 }, - "prime_tower_wipe_enabled":{ "value": true }, "prime_tower_brim_enable":{ "value": true } } } diff --git a/resources/definitions/geeetech_A10M.def.json b/resources/definitions/geeetech_A10M.def.json index 049a7d75bb..752db2dfa1 100644 --- a/resources/definitions/geeetech_A10M.def.json +++ b/resources/definitions/geeetech_A10M.def.json @@ -21,12 +21,12 @@ "machine_height": {"default_value": 260 }, "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, "gantry_height": { "value": 28 }, + "brim_width":{ "value": 10 }, "prime_tower_position_x":{ "value": 190 }, "prime_tower_position_y":{ "value": 160 }, "machine_start_gcode": { "default_value": ";Geeetech A10M 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": "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_extruder_count": { "default_value": 2 }, - "machine_heated_bed": { "default_value": true } + "machine_extruder_count": { "default_value": 2 } } } diff --git a/resources/definitions/geeetech_A10Pro.def.json b/resources/definitions/geeetech_A10Pro.def.json index 7bc2384f40..bb93eb67b1 100644 --- a/resources/definitions/geeetech_A10Pro.def.json +++ b/resources/definitions/geeetech_A10Pro.def.json @@ -19,8 +19,6 @@ "gantry_height": { "value": 28 }, "machine_start_gcode": { "default_value": ";Geeetech A10Pro 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 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_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true } + "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_A10T.def.json b/resources/definitions/geeetech_A10T.def.json index 30437723be..8ce9b67bd7 100644 --- a/resources/definitions/geeetech_A10T.def.json +++ b/resources/definitions/geeetech_A10T.def.json @@ -21,12 +21,12 @@ "machine_height": {"default_value": 260 }, "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, "gantry_height": { "value": 28 }, + "brim_width":{ "value": 10 }, "prime_tower_position_x":{ "value": 190 }, "prime_tower_position_y":{ "value": 160 }, "machine_start_gcode": { "default_value": ";Geeetech A10T 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": "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_extruder_count": { "default_value": 3 }, - "machine_heated_bed": { "default_value": true } + "machine_extruder_count": { "default_value": 3 } } } diff --git a/resources/definitions/geeetech_A20.def.json b/resources/definitions/geeetech_A20.def.json index e8017ea1a3..0caa866b7b 100644 --- a/resources/definitions/geeetech_A20.def.json +++ b/resources/definitions/geeetech_A20.def.json @@ -19,8 +19,6 @@ "gantry_height": { "value": 35 }, "machine_start_gcode": { "default_value": ";Geeetech A20 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 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_extruder_count": { "default_value": 1}, - "machine_heated_bed": { "default_value": true } + "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_A20M.def.json b/resources/definitions/geeetech_A20M.def.json index ffe728efbf..f7770a87d0 100644 --- a/resources/definitions/geeetech_A20M.def.json +++ b/resources/definitions/geeetech_A20M.def.json @@ -21,12 +21,12 @@ "machine_height": {"default_value": 250 }, "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, "gantry_height": { "value": 35 }, + "brim_width":{ "value": 10 }, "prime_tower_position_x":{ "value": 220 }, "prime_tower_position_y":{ "value": 190 }, "machine_start_gcode": { "default_value": ";Geeetech A20M 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": "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_extruder_count": { "default_value": 2 }, - "machine_heated_bed": { "default_value": true } + "machine_extruder_count": { "default_value": 2 } } } diff --git a/resources/definitions/geeetech_A20T.def.json b/resources/definitions/geeetech_A20T.def.json index bc78b65af2..2771499554 100644 --- a/resources/definitions/geeetech_A20T.def.json +++ b/resources/definitions/geeetech_A20T.def.json @@ -21,12 +21,12 @@ "machine_height": {"default_value": 250 }, "machine_head_with_fans_polygon": { "default_value": [[-31, 31], [34, 31], [34, -40], [-31, -40]] }, "gantry_height": { "value": 35 }, + "brim_width":{ "value": 10 }, "prime_tower_position_x":{ "value": 220 }, "prime_tower_position_y":{ "value": 190 }, "machine_start_gcode": { "default_value": ";Geeetech A20T 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": "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_extruder_count": { "default_value": 3 }, - "machine_heated_bed": { "default_value": true } + "machine_extruder_count": { "default_value": 3 } } } diff --git a/resources/definitions/geeetech_A30M.def.json b/resources/definitions/geeetech_A30M.def.json index 6f60dd2914..225f3f5d59 100644 --- a/resources/definitions/geeetech_A30M.def.json +++ b/resources/definitions/geeetech_A30M.def.json @@ -20,13 +20,13 @@ "machine_depth": { "default_value": 320 }, "machine_height": {"default_value": 420 }, "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, - "gantry_height": { "value": 55 }, + "gantry_height": { "value": 35 }, + "brim_width":{ "value": 10 }, "prime_tower_position_x":{ "value": 290 }, "prime_tower_position_y":{ "value": 260 }, "machine_start_gcode": { "default_value": ";Geeetech A30M 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": "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_extruder_count": { "default_value": 2 }, - "machine_heated_bed": { "default_value": true } + "machine_extruder_count": { "default_value": 2 } } } diff --git a/resources/definitions/geeetech_A30Pro.def.json b/resources/definitions/geeetech_A30Pro.def.json index 43f78fef90..5b428080fc 100644 --- a/resources/definitions/geeetech_A30Pro.def.json +++ b/resources/definitions/geeetech_A30Pro.def.json @@ -16,11 +16,9 @@ "machine_depth": { "default_value": 320 }, "machine_height": {"default_value": 420 }, "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, - "gantry_height": { "value": 55 }, + "gantry_height": { "value": 35 }, "machine_start_gcode": { "default_value": ";Geeetech A30Pro 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 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_extruder_count": { "default_value": 1}, - "machine_heated_bed": { "default_value": true } + "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_A30T.def.json b/resources/definitions/geeetech_A30T.def.json index 11c75a0aab..7c44017a5f 100644 --- a/resources/definitions/geeetech_A30T.def.json +++ b/resources/definitions/geeetech_A30T.def.json @@ -20,13 +20,13 @@ "machine_depth": { "default_value": 320 }, "machine_height": {"default_value": 420 }, "machine_head_with_fans_polygon": { "default_value": [[-75, 35], [18, 35], [18, -18], [-75, -18]] }, - "gantry_height": { "value": 55 }, + "gantry_height": { "value": 35 }, + "brim_width":{ "value": 10 }, "prime_tower_position_x":{ "value": 290 }, "prime_tower_position_y":{ "value": 260 }, "machine_start_gcode": { "default_value": ";Geeetech A30T 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": "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_extruder_count": { "default_value": 3 }, - "machine_heated_bed": { "default_value": true } + "machine_extruder_count": { "default_value": 3 } } } diff --git a/resources/definitions/geeetech_E180.def.json b/resources/definitions/geeetech_E180.def.json index 9259ee715d..28e93ab57b 100644 --- a/resources/definitions/geeetech_E180.def.json +++ b/resources/definitions/geeetech_E180.def.json @@ -20,7 +20,6 @@ "machine_start_gcode": { "default_value": ";Geeetech E180 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\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 Y120.0 Z1.2 F1500 E30 ; Draw the first line\nG92 E0 ; Reset Extruder\nG1 X0.4 Y120.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-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_extruder_count": { "default_value": 1}, "machine_heated_bed": { "default_value": false } } } diff --git a/resources/definitions/geeetech_GiantArmD200.def.json b/resources/definitions/geeetech_GiantArmD200.def.json index ca673b5260..27e7ae24ce 100644 --- a/resources/definitions/geeetech_GiantArmD200.def.json +++ b/resources/definitions/geeetech_GiantArmD200.def.json @@ -15,11 +15,11 @@ "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 }, "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" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true } + "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 9027ac7e19..25b7a6c987 100644 --- a/resources/definitions/geeetech_I3ProB.def.json +++ b/resources/definitions/geeetech_I3ProB.def.json @@ -15,11 +15,11 @@ "machine_width": { "default_value": 200 }, "machine_depth": { "default_value": 200 }, "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 }, "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" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true } + "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 b8a74d3aa9..c7e5d01410 100644 --- a/resources/definitions/geeetech_I3ProC.def.json +++ b/resources/definitions/geeetech_I3ProC.def.json @@ -19,13 +19,15 @@ "machine_width": { "default_value": 200 }, "machine_depth": { "default_value": 200 }, "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 }, + "brim_width":{ "value": 10 }, "prime_tower_position_x":{ "value": 170 }, "prime_tower_position_y":{ "value": 140 }, "machine_start_gcode": { "default_value": ";Geeetech I3ProC 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" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_heated_bed": { "default_value": true } + "machine_extruder_count": { "default_value": 2 } } } diff --git a/resources/definitions/geeetech_I3ProW.def.json b/resources/definitions/geeetech_I3ProW.def.json index e0d98a8927..1db41552db 100644 --- a/resources/definitions/geeetech_I3ProW.def.json +++ b/resources/definitions/geeetech_I3ProW.def.json @@ -15,11 +15,11 @@ "machine_width": { "default_value": 200 }, "machine_depth": { "default_value": 200 }, "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 }, "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" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true } + "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 240ea210c1..a35756f440 100644 --- a/resources/definitions/geeetech_MeCreator.def.json +++ b/resources/definitions/geeetech_MeCreator.def.json @@ -15,11 +15,11 @@ "machine_width": { "default_value": 150 }, "machine_depth": { "default_value": 150 }, "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 }, "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" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true } + "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 81e2a915c4..c9bed615fa 100644 --- a/resources/definitions/geeetech_MeCreator2.def.json +++ b/resources/definitions/geeetech_MeCreator2.def.json @@ -15,11 +15,11 @@ "machine_width": { "default_value": 160 }, "machine_depth": { "default_value": 160 }, "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 }, "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" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true } + "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 2a95658bd5..c4b65bfe3b 100644 --- a/resources/definitions/geeetech_MeDucer.def.json +++ b/resources/definitions/geeetech_MeDucer.def.json @@ -15,11 +15,11 @@ "machine_width": { "default_value": 180 }, "machine_depth": { "default_value": 150 }, "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 }, "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" }, - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true } + "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 cfcd708319..38fcb151e6 100644 --- a/resources/definitions/geeetech_Mizar.def.json +++ b/resources/definitions/geeetech_Mizar.def.json @@ -19,8 +19,6 @@ "gantry_height": { "value": 35 }, "machine_start_gcode": { "default_value": ";Official open-source firmware for Mizar: https://github.com/Geeetech3D/Mizar \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\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_extruder_count": { "default_value": 1}, - "machine_heated_bed": { "default_value": true } + "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_MizarM.def.json b/resources/definitions/geeetech_MizarM.def.json index ba291b028e..28bf7dfe76 100644 --- a/resources/definitions/geeetech_MizarM.def.json +++ b/resources/definitions/geeetech_MizarM.def.json @@ -28,7 +28,6 @@ "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarM: https://github.com/Geeetech3D/Mizar-M \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_extruder_count": { "default_value": 2 }, - "material_standby_temperature": {"value": 200 }, - "machine_heated_bed": { "default_value": true } + "material_standby_temperature": {"value": 200 } } } diff --git a/resources/definitions/geeetech_MizarMax.def.json b/resources/definitions/geeetech_MizarMax.def.json index cc070ab029..4856ac5065 100644 --- a/resources/definitions/geeetech_MizarMax.def.json +++ b/resources/definitions/geeetech_MizarMax.def.json @@ -19,8 +19,6 @@ "gantry_height": { "value": 35 }, "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarMax: https://github.com/Geeetech3D/Mizar-Max \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\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_extruder_count": { "default_value": 1}, - "machine_heated_bed": { "default_value": true } + "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_MizarPro.def.json b/resources/definitions/geeetech_MizarPro.def.json index 81130bd0de..0040fb3dd8 100644 --- a/resources/definitions/geeetech_MizarPro.def.json +++ b/resources/definitions/geeetech_MizarPro.def.json @@ -19,8 +19,6 @@ "gantry_height": { "value": 35 }, "machine_start_gcode": { "default_value": ";Official open-source firmware for MizarPro: https://github.com/Geeetech3D/Mizar-Pro \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\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_extruder_count": { "default_value": 1}, - "machine_heated_bed": { "default_value": true } + "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_MizarS.def.json b/resources/definitions/geeetech_MizarS.def.json index 7c6ef40fef..8f097e2bde 100644 --- a/resources/definitions/geeetech_MizarS.def.json +++ b/resources/definitions/geeetech_MizarS.def.json @@ -19,8 +19,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_extruder_count": { "default_value": 1}, - "machine_heated_bed": { "default_value": true } + "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 a5676d59f2..0261b5396a 100644 --- a/resources/definitions/geeetech_Thunder.def.json +++ b/resources/definitions/geeetech_Thunder.def.json @@ -14,15 +14,13 @@ "machine_name": { "default_value": "Geeetech Thunder" }, "machine_width": { "default_value": 250 }, "machine_depth": { "default_value": 250 }, - "machine_height": {"default_value": 260 }, + "machine_height": {"default_value": 260 }, + "machine_head_with_fans_polygon": { "default_value": [[-20, 25], [20, 25], [20, -25], [-20, -25]] }, + "gantry_height": { "value": 35 }, "machine_start_gcode": { "default_value": ";Official viki homepage for Thunder:https://www.geeetech.com/wiki/index.php/Geeetech_Thunder_3D_printer \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_extruder_count": { "default_value": 1}, - "machine_heated_bed": { "default_value": true }, "machine_max_feedrate_x": { "value": 300 }, - "machine_max_feedrate_y": { "value": 500 }, - "machine_max_feedrate_z": { "value": 10 }, "machine_max_feedrate_e": { "value": 60 }, "machine_max_acceleration_x": { "value": 5000 }, "machine_max_acceleration_y": { "value": 4000 }, @@ -31,37 +29,44 @@ "machine_max_jerk_xy": { "value": 45 }, "machine_max_jerk_z": { "value": 0.8 }, "machine_max_jerk_e": { "value": 8 }, - "acceleration_enabled": { "value": false }, - "acceleration_travel_enabled":{ "value": false }, "acceleration_print": { "value": 3500 }, "acceleration_travel": { "value": 5000 }, - - "line_width": {"default_value":"machine_nozzle_size","value": "1.2*machine_nozzle_size if speed_infill>=200 else machine_nozzle_size"}, + + "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_amount": { "default_value": 6.5 }, - "retraction_enable": { "default_value": true }, "retraction_speed": { "default_value": 35 }, "infill_sparse_density": {"label": "Infill Density","value": "15" }, - "cool_min_layer_time":{"default_value": 5,"value": "1.3 if speed_infill>=200 else 2.5" }, - "small_hole_max_size":{"default_value": 0,"value": "8 if speed_infill>=200 else 0" }, - "cool_fan_full_at_height": {"label": "Regular Fan Speed at Height","value": "layer_height_0 + layer_height" }, - "cool_fan_enabled": { "value": true }, + "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"}, - - "material_print_temperature": {"default_value": 210,"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_final_print_temperature": { "value": "material_print_temperature" }, "material_flow_layer_0": { "default_value": 95 }, - "speed_print": { "default_value":250, "maximum_value_warning": "300" }, - "speed_equalize_flow_width_factor":{"label": "Flow Equalization Ratio", "default_value": 100.0, "minimum_value": "0.0", "maximum_value_warning": "200.0"}, + "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_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_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/extruders/Geeetech_Dual_Extruder_0.def.json b/resources/extruders/Geeetech_Dual_Extruder_0.def.json index 1d39b2c56e..643e764759 100644 --- a/resources/extruders/Geeetech_Dual_Extruder_0.def.json +++ b/resources/extruders/Geeetech_Dual_Extruder_0.def.json @@ -9,8 +9,6 @@ "overrides": { "extruder_nr": { "default_value": 0 ,"maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - + "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/extruders/Geeetech_Dual_Extruder_1.def.json b/resources/extruders/Geeetech_Dual_Extruder_1.def.json index b3e07049a4..e16bba320e 100644 --- a/resources/extruders/Geeetech_Dual_Extruder_1.def.json +++ b/resources/extruders/Geeetech_Dual_Extruder_1.def.json @@ -9,8 +9,6 @@ "overrides": { "extruder_nr": { "default_value": 1 ,"maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - + "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/extruders/Geeetech_Multi_Extruder_0.def.json b/resources/extruders/Geeetech_Multi_Extruder_0.def.json index 07c93062eb..b76d15a243 100644 --- a/resources/extruders/Geeetech_Multi_Extruder_0.def.json +++ b/resources/extruders/Geeetech_Multi_Extruder_0.def.json @@ -9,8 +9,6 @@ "overrides": { "extruder_nr": { "default_value": 0 ,"maximum_value": "2" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - + "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/extruders/Geeetech_Multi_Extruder_1.def.json b/resources/extruders/Geeetech_Multi_Extruder_1.def.json index 2333332f85..bafd632c2d 100644 --- a/resources/extruders/Geeetech_Multi_Extruder_1.def.json +++ b/resources/extruders/Geeetech_Multi_Extruder_1.def.json @@ -9,8 +9,6 @@ "overrides": { "extruder_nr": { "default_value": 1 ,"maximum_value": "2" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - + "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/extruders/Geeetech_Multi_Extruder_2.def.json b/resources/extruders/Geeetech_Multi_Extruder_2.def.json index a50605be7d..de8d8e7cf4 100644 --- a/resources/extruders/Geeetech_Multi_Extruder_2.def.json +++ b/resources/extruders/Geeetech_Multi_Extruder_2.def.json @@ -9,8 +9,6 @@ "overrides": { "extruder_nr": { "default_value": 2 ,"maximum_value": "2" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - + "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/extruders/Geeetech_base_extruder_0.def.json b/resources/extruders/Geeetech_base_extruder_0.def.json index 3ef9af0405..92ce300264 100644 --- a/resources/extruders/Geeetech_base_extruder_0.def.json +++ b/resources/extruders/Geeetech_base_extruder_0.def.json @@ -9,8 +9,6 @@ "overrides": { "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - + "material_diameter": { "default_value": 1.75 } } }