From 325614907bc1a16e64cfb0e084759657f8c9846e Mon Sep 17 00:00:00 2001 From: jspijker Date: Tue, 7 Mar 2023 11:11:52 +0100 Subject: [PATCH] Partially revert Geeetech PR The following printers are back to their old behaviour: - Geeetech A10 - Geeetech A10M - Geeetech A10T - Geeetech A20 - Geeetech A20M - Geeetech A20T - Geeetech A30 added: - Geeetech Mizar S (legacy) Contribute to CURA-10370 --- resources/definitions/geeetech_A10.def.json | 59 +++++++++ resources/definitions/geeetech_A10M.def.json | 77 +++++++----- resources/definitions/geeetech_A10T.def.json | 80 ++++++++----- resources/definitions/geeetech_A20.def.json | 72 +++++++---- resources/definitions/geeetech_A20M.def.json | 77 +++++++----- resources/definitions/geeetech_A20T.def.json | 79 +++++++----- .../definitions/geeetech_Mizar_S.def.json | 59 +++++++++ resources/definitions/geeetech_a30.def.json | 113 ++++++++++++++++++ resources/extruders/geeetech_A10M_1.def.json | 19 +++ resources/extruders/geeetech_A10M_2.def.json | 19 +++ resources/extruders/geeetech_A10T_1.def.json | 19 +++ resources/extruders/geeetech_A10T_2.def.json | 19 +++ resources/extruders/geeetech_A10T_3.def.json | 19 +++ resources/extruders/geeetech_A10_1.def.json | 17 +++ resources/extruders/geeetech_A20M_1.def.json | 19 +++ resources/extruders/geeetech_A20M_2.def.json | 19 +++ resources/extruders/geeetech_A20T_1.def.json | 19 +++ resources/extruders/geeetech_A20T_2.def.json | 19 +++ resources/extruders/geeetech_A20T_3.def.json | 19 +++ .../extruders/geeetech_Mizar_S_1.def.json | 17 +++ .../geeetech_a30_extruder_0.def.json | 15 +++ 21 files changed, 719 insertions(+), 136 deletions(-) create mode 100644 resources/definitions/geeetech_A10.def.json create mode 100644 resources/definitions/geeetech_Mizar_S.def.json create mode 100644 resources/definitions/geeetech_a30.def.json create mode 100644 resources/extruders/geeetech_A10M_1.def.json create mode 100644 resources/extruders/geeetech_A10M_2.def.json create mode 100644 resources/extruders/geeetech_A10T_1.def.json create mode 100644 resources/extruders/geeetech_A10T_2.def.json create mode 100644 resources/extruders/geeetech_A10T_3.def.json create mode 100644 resources/extruders/geeetech_A10_1.def.json create mode 100644 resources/extruders/geeetech_A20M_1.def.json create mode 100644 resources/extruders/geeetech_A20M_2.def.json create mode 100644 resources/extruders/geeetech_A20T_1.def.json create mode 100644 resources/extruders/geeetech_A20T_2.def.json create mode 100644 resources/extruders/geeetech_A20T_3.def.json create mode 100644 resources/extruders/geeetech_Mizar_S_1.def.json create mode 100644 resources/extruders/geeetech_a30_extruder_0.def.json diff --git a/resources/definitions/geeetech_A10.def.json b/resources/definitions/geeetech_A10.def.json new file mode 100644 index 0000000000..6b17223d7b --- /dev/null +++ b/resources/definitions/geeetech_A10.def.json @@ -0,0 +1,59 @@ +{ + "version": 2, + "name": "Geeetech A10", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Amit L", + "manufacturer": "Geeetech", + "file_formats": "text/x-gcode", + "has_materials": true, + "machine_extruder_trains": + { + "0": "geeetech_A10_1" + } + + }, + + "overrides": { + "machine_name": { "default_value": "Geeetech A10" }, + "machine_width": { + "default_value": 220 + }, + "machine_height": { + "default_value": 260 + }, + "machine_depth": { + "default_value": 220 + }, + "machine_center_is_zero": { + "default_value": false + }, + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.15 }, + "retraction_amount": { "default_value": 0.8 }, + "retraction_speed": { "default_value": 35 }, + "adhesion_type": { "default_value": "skirt" }, + "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] }, + "gantry_height": { "value": "28" }, + "machine_max_feedrate_z": { "default_value": 12 }, + "machine_max_feedrate_e": { "default_value": 120 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_acceleration": { "default_value": 1000 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.2 }, + "machine_max_jerk_e": { "default_value": 2.5 }, + "machine_heated_bed": { "default_value": true }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { + "default_value": "G28 ; Auto home\nG1 Z15 F300 ;Move up slightly\nM107 ;Off fans\nG90 ;Switch to absolute positioning\nM82 ;Extruder absolute mode\nG92 E0 ;Set position of extruder to 0\nG0 X10 Y20 F1500 ;Move to X10 Y20 at 1500mms\nG1 Z0.8 ;Move Z to 0.8\nG1 F300 X180 E40 ;Extrude a line of filament\nG1 F1200 Z2 ;Raise Z\nG92 E0 ;Set extruder position to zero\nG28 ;Auto home" + }, + "machine_end_gcode": { + "default_value": "G91 ;Switch to relative positioning\nG1 E-1 ;Retract filament to lower pressure\nG0 X0 Y200 ;Move hotend to left and bed forward\nM104 S0 ;Cooldown hotend\nG90 ;Switch to absolute mode\nG92 E0 ;Set extruder to zero\nM140 S0 ;Cooldown bed\nM84 ; Disable steppers" + }, + "machine_extruder_count": { + "default_value": 1 + } + + } +} diff --git a/resources/definitions/geeetech_A10M.def.json b/resources/definitions/geeetech_A10M.def.json index d47756011e..353adfb586 100644 --- a/resources/definitions/geeetech_A10M.def.json +++ b/resources/definitions/geeetech_A10M.def.json @@ -1,37 +1,58 @@ { "version": 2, "name": "Geeetech A10M", - "inherits": "Geeetech_Base_Dual_Extruder", - "metadata": - { + "inherits": "fdmprinter", + "metadata": { "visible": true, + "author": "Amit L", + "manufacturer": "Geeetech", + "file_formats": "text/x-gcode", + "has_materials": true, "machine_extruder_trains": { - "0": "Geeetech_Dual_Extruder_0", - "1": "Geeetech_Dual_Extruder_1" - }, - "preferred_material": "Geeetech_PLA_Cyan" + "0": "geeetech_A10M_1", + "1": "geeetech_A10M_2" + } + }, - "overrides": - { - "brim_width": { "value": 10 }, - "gantry_height": { "value": 28 }, - "machine_depth": { "default_value": 220 }, - "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_head_with_fans_polygon": - { - "default_value": [ - [-31, 31], - [34, 31], - [34, -40], - [-31, -40] - ] - }, - "machine_height": { "default_value": 260 }, + + "overrides": { "machine_name": { "default_value": "Geeetech A10M" }, - "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_width": { "default_value": 220 }, - "prime_tower_position_x": { "value": 190 }, - "prime_tower_position_y": { "value": 160 } + "machine_width": { + "default_value": 220 + }, + "machine_height": { + "default_value": 260 + }, + "machine_depth": { + "default_value": 220 + }, "machine_center_is_zero": { + "default_value": false + }, + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.15 }, + "retraction_amount": { "default_value": 0.8 }, + "retraction_speed": { "default_value": 35 }, + "adhesion_type": { "default_value": "skirt" }, + "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] }, + "gantry_height": { "value": "28" }, + "machine_max_feedrate_z": { "default_value": 12 }, + "machine_max_feedrate_e": { "default_value": 120 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_acceleration": { "default_value": 1000 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.2 }, + "machine_max_jerk_e": { "default_value": 2.5 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { + "default_value": ";GeeeTech A10M start script\nG28 ;home\nG90 ;absolute positioning\nG1 X0 Y0 Z15 E0 F300 ;go to wait position\nM140 S{material_bed_temperature_layer_0} ;set bed temp\nM109 S{material_print_temperature_layer_0} ;set extruder temp and wait\nG1 Z0.8 F200 ;set extruder height\nG1 X220 Y0 E80 F1000 ;purge line\n;end of start script" + }, + "machine_end_gcode": { + "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84" + }, + "machine_extruder_count": { + "default_value": 2 + } + } -} \ No newline at end of file +} diff --git a/resources/definitions/geeetech_A10T.def.json b/resources/definitions/geeetech_A10T.def.json index df2444fe50..cf5a7f6a36 100644 --- a/resources/definitions/geeetech_A10T.def.json +++ b/resources/definitions/geeetech_A10T.def.json @@ -1,38 +1,60 @@ { "version": 2, "name": "Geeetech A10T", - "inherits": "Geeetech_Base_Multi_Extruder", - "metadata": - { + "inherits": "fdmprinter", + "metadata": { "visible": true, + "author": "Amit L", + "manufacturer": "Geeetech", + "file_formats": "text/x-gcode", + "has_materials": true, "machine_extruder_trains": { - "0": "Geeetech_Multi_Extruder_0", - "1": "Geeetech_Multi_Extruder_1", - "2": "Geeetech_Multi_Extruder_2" - }, - "preferred_material": "Geeetech_PLA_Magenta" + "0": "geeetech_A10T_1", + "1": "geeetech_A10T_2", + "2": "geeetech_A10T_3" + } + }, - "overrides": - { - "brim_width": { "value": 10 }, - "gantry_height": { "value": 28 }, - "machine_depth": { "default_value": 220 }, - "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_head_with_fans_polygon": - { - "default_value": [ - [-31, 31], - [34, 31], - [34, -40], - [-31, -40] - ] - }, - "machine_height": { "default_value": 260 }, + + "overrides": { "machine_name": { "default_value": "Geeetech A10T" }, - "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_width": { "default_value": 220 }, - "prime_tower_position_x": { "value": 190 }, - "prime_tower_position_y": { "value": 160 } + "machine_width": { + "default_value": 220 + }, + "machine_height": { + "default_value": 220 + }, + "machine_depth": { + "default_value": 260 + }, + "machine_center_is_zero": { + "default_value": false + }, + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.15 }, + "retraction_amount": { "default_value": 0.8 }, + "retraction_speed": { "default_value": 35 }, + "adhesion_type": { "default_value": "skirt" }, + "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] }, + "gantry_height": { "value": "28" }, + "machine_max_feedrate_z": { "default_value": 12 }, + "machine_max_feedrate_e": { "default_value": 120 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_acceleration": { "default_value": 1000 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.2 }, + "machine_max_jerk_e": { "default_value": 2.5 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { + "default_value": "G28 \nG1 Z15 F300\nM107\nG90\nM82\nM104 S215\nM140 S55\nG92 E0\nM109 S215\nM107\nM163 S0 P0.33\nM163 S1 P0.33\nM163 S2 P0.33\nM164 S4\nG0 X10 Y20 F6000\nG1 Z0.8\nG1 F300 X180 E40\nG1 F1200 Z2\nG92 E0\nG28" + }, + "machine_end_gcode": { + "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84" + }, + "machine_extruder_count": { + "default_value": 3 + } + } -} \ No newline at end of file +} diff --git a/resources/definitions/geeetech_A20.def.json b/resources/definitions/geeetech_A20.def.json index 68a41ad8b8..4ab891f9f7 100644 --- a/resources/definitions/geeetech_A20.def.json +++ b/resources/definitions/geeetech_A20.def.json @@ -1,29 +1,57 @@ { "version": 2, "name": "Geeetech A20", - "inherits": "Geeetech_Base_Single_Extruder", - "metadata": - { + "inherits": "fdmprinter", + "metadata": { "visible": true, - "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } - }, - "overrides": - { - "gantry_height": { "value": 35 }, - "machine_depth": { "default_value": 250 }, - "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_head_with_fans_polygon": + "author": "Amit L", + "manufacturer": "Geeetech", + "file_formats": "text/x-gcode", + "has_materials": true, + "machine_extruder_trains": { - "default_value": [ - [-31, 31], - [34, 31], - [34, -40], - [-31, -40] - ] - }, - "machine_height": { "default_value": 250 }, + "0": "geeetech_A20_1" + } + + }, + + "overrides": { "machine_name": { "default_value": "Geeetech A20" }, - "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_width": { "default_value": 250 } + "machine_width": { + "default_value": 250 + }, + "machine_height": { + "default_value": 250 + }, + "machine_depth": { + "default_value": 250 + }, "machine_center_is_zero": { + "default_value": false + }, + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.15 }, + "retraction_amount": { "default_value": 0.8 }, + "retraction_speed": { "default_value": 35 }, + "adhesion_type": { "default_value": "skirt" }, + "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] }, + "gantry_height": { "value": "28" }, + "machine_max_feedrate_z": { "default_value": 12 }, + "machine_max_feedrate_e": { "default_value": 120 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_acceleration": { "default_value": 1000 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.2 }, + "machine_max_jerk_e": { "default_value": 2.5 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { + "default_value": "G28 \nG1 Z15 F300\nM107\nG90\nM82\nM104 S215\nM140 S55\nG92 E0\nM109 S215\nM107\nG0 X10 Y20 F6000\nG1 Z0.8\nG1 F300 X200 E40\nG1 F1200 Z2\nG92 E0\nG28" + }, + "machine_end_gcode": { + "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84" + }, + "machine_extruder_count": { + "default_value": 1 + } + } -} \ No newline at end of file +} diff --git a/resources/definitions/geeetech_A20M.def.json b/resources/definitions/geeetech_A20M.def.json index 5b7cf30dfe..6127627ab8 100644 --- a/resources/definitions/geeetech_A20M.def.json +++ b/resources/definitions/geeetech_A20M.def.json @@ -1,37 +1,58 @@ { "version": 2, "name": "Geeetech A20M", - "inherits": "Geeetech_Base_Dual_Extruder", - "metadata": - { + "inherits": "fdmprinter", + "metadata": { "visible": true, + "author": "Amit L", + "manufacturer": "Geeetech", + "file_formats": "text/x-gcode", + "has_materials": true, "machine_extruder_trains": { - "0": "Geeetech_Dual_Extruder_0", - "1": "Geeetech_Dual_Extruder_1" - }, - "preferred_material": "Geeetech_PLA_Yellow" + "0": "geeetech_A20M_1", + "1": "geeetech_A20M_2" + } + }, - "overrides": - { - "brim_width": { "value": 10 }, - "gantry_height": { "value": 35 }, - "machine_depth": { "default_value": 250 }, - "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_head_with_fans_polygon": - { - "default_value": [ - [-31, 31], - [34, 31], - [34, -40], - [-31, -40] - ] - }, - "machine_height": { "default_value": 250 }, + + "overrides": { "machine_name": { "default_value": "Geeetech A20M" }, - "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_width": { "default_value": 250 }, - "prime_tower_position_x": { "value": 220 }, - "prime_tower_position_y": { "value": 190 } + "machine_width": { + "default_value": 250 + }, + "machine_height": { + "default_value": 250 + }, + "machine_depth": { + "default_value": 250 + }, "machine_center_is_zero": { + "default_value": false + }, + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.15 }, + "retraction_amount": { "default_value": 0.8 }, + "retraction_speed": { "default_value": 35 }, + "adhesion_type": { "default_value": "skirt" }, + "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] }, + "gantry_height": { "value": "28" }, + "machine_max_feedrate_z": { "default_value": 12 }, + "machine_max_feedrate_e": { "default_value": 120 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_acceleration": { "default_value": 1000 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.2 }, + "machine_max_jerk_e": { "default_value": 2.5 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { + "default_value": ";GeeeTech A20M start script\nG28 ;home\nG90 ;absolute positioning\nG1 X0 Y0 Z15 E0 F300 ;go to wait position\nM140 S{material_bed_temperature_layer_0} ;set bed temp\nM109 S{material_print_temperature_layer_0} ;set extruder temp and wait\nG1 Z0.8 F200 ;set extruder height\nG1 X220 Y0 E80 F1000 ;purge line\n;end of start script" + }, + "machine_end_gcode": { + "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84" + }, + "machine_extruder_count": { + "default_value": 2 + } + } -} \ No newline at end of file +} diff --git a/resources/definitions/geeetech_A20T.def.json b/resources/definitions/geeetech_A20T.def.json index 5191bac751..9a8044e05c 100644 --- a/resources/definitions/geeetech_A20T.def.json +++ b/resources/definitions/geeetech_A20T.def.json @@ -1,38 +1,59 @@ { "version": 2, "name": "Geeetech A20T", - "inherits": "Geeetech_Base_Multi_Extruder", - "metadata": - { + "inherits": "fdmprinter", + "metadata": { "visible": true, + "author": "Amit L", + "manufacturer": "Geeetech", + "file_formats": "text/x-gcode", + "has_materials": true, "machine_extruder_trains": { - "0": "Geeetech_Multi_Extruder_0", - "1": "Geeetech_Multi_Extruder_1", - "2": "Geeetech_Multi_Extruder_2" - }, - "preferred_material": "Geeetech_PLA_Red" + "0": "geeetech_A20T_1", + "1": "geeetech_A20T_2", + "2": "geeetech_A20T_3" + } + }, - "overrides": - { - "brim_width": { "value": 10 }, - "gantry_height": { "value": 35 }, - "machine_depth": { "default_value": 250 }, - "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_head_with_fans_polygon": - { - "default_value": [ - [-31, 31], - [34, 31], - [34, -40], - [-31, -40] - ] - }, - "machine_height": { "default_value": 250 }, + + "overrides": { "machine_name": { "default_value": "Geeetech A20T" }, - "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_width": { "default_value": 250 }, - "prime_tower_position_x": { "value": 220 }, - "prime_tower_position_y": { "value": 190 } + "machine_width": { + "default_value": 250 + }, + "machine_height": { + "default_value": 250 + }, + "machine_depth": { + "default_value": 250 + }, "machine_center_is_zero": { + "default_value": false + }, + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.15 }, + "retraction_amount": { "default_value": 0.8 }, + "retraction_speed": { "default_value": 35 }, + "adhesion_type": { "default_value": "skirt" }, + "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] }, + "gantry_height": { "value": "28" }, + "machine_max_feedrate_z": { "default_value": 12 }, + "machine_max_feedrate_e": { "default_value": 120 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_acceleration": { "default_value": 1000 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.2 }, + "machine_max_jerk_e": { "default_value": 2.5 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { + "default_value": "G28 \nG1 Z15 F300\nM107\nG90\nM82\nM104 S215\nM140 S55\nG92 E0\nM109 S215\nM107\nM163 S0 P0.33\nM163 S1 P0.33\nM163 S2 P0.33\nM164 S4\nG0 X10 Y20 F6000\nG1 Z0.8\nG1 F300 X200 E40\nG1 F1200 Z2\nG92 E0\nG28" + }, + "machine_end_gcode": { + "default_value": "G91\nG1 E-1\nG0 X0 Y200\nM104 S0\nG90\nG92 E0\nM140 S0\nM84\nM104 S0\nM140 S0\nM84" + }, + "machine_extruder_count": { + "default_value": 3 + } + } -} \ No newline at end of file +} diff --git a/resources/definitions/geeetech_Mizar_S.def.json b/resources/definitions/geeetech_Mizar_S.def.json new file mode 100644 index 0000000000..164a183c88 --- /dev/null +++ b/resources/definitions/geeetech_Mizar_S.def.json @@ -0,0 +1,59 @@ +{ + "version": 2, + "name": "Geeetech Mizar_S (legacy)", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Amit L", + "manufacturer": "Geeetech", + "file_formats": "text/x-gcode", + "has_materials": true, + "machine_extruder_trains": + { + "0": "geeetech_Mizar_S_1" + } + + }, + + "overrides": { + "machine_name": { "default_value": "Geeetech Mizar_S (legacy)" }, + "machine_width": { + "default_value": 255 + }, + "machine_height": { + "default_value": 260 + }, + "machine_depth": { + "default_value": 255 + }, + "machine_center_is_zero": { + "default_value": false + }, + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.15 }, + "retraction_amount": { "default_value": 0.8 }, + "retraction_speed": { "default_value": 35 }, + "adhesion_type": { "default_value": "skirt" }, + "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] }, + "gantry_height": { "value": "28" }, + "machine_max_feedrate_z": { "default_value": 12 }, + "machine_max_feedrate_e": { "default_value": 120 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_acceleration": { "default_value": 1000 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.2 }, + "machine_max_jerk_e": { "default_value": 2.5 }, + "machine_heated_bed": { "default_value": true }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { + "default_value": "G28 ; Auto home\nG1 Z15 F300 ;Move up slightly\nM107 ;Off fans\nG90 ;Switch to absolute positioning\nM82 ;Extruder absolute mode\nG92 E0 ;Set position of extruder to 0\nG0 X10 Y20 F1500 ;Move to X10 Y20 at 1500mms\nG1 Z0.8 ;Move Z to 0.8\nG1 F300 X180 E40 ;Extrude a line of filament\nG1 F1200 Z2 ;Raise Z\nG92 E0 ;Set extruder position to zero\nG28 ;Auto home" + }, + "machine_end_gcode": { + "default_value": "G91 ;Switch to relative positioning\nG1 E-1 ;Retract filament to lower pressure\nG0 X0 Y200 ;Move hotend to left and bed forward\nM104 S0 ;Cooldown hotend\nG90 ;Switch to absolute mode\nG92 E0 ;Set extruder to zero\nM140 S0 ;Cooldown bed\nM84 ; Disable steppers" + }, + "machine_extruder_count": { + "default_value": 1 + } + + } +} diff --git a/resources/definitions/geeetech_a30.def.json b/resources/definitions/geeetech_a30.def.json new file mode 100644 index 0000000000..d4f7df139f --- /dev/null +++ b/resources/definitions/geeetech_a30.def.json @@ -0,0 +1,113 @@ +{ + "version": 2, + "name": "Geeetech A30", + "inherits": "fdmprinter", + "metadata": { + "author": "William & Cataldo URSO", + "manufacturer": "Geeetech", + "file_formats": "text/x-gcode", + "visible": true, + "has_materials": true, + "preferred_quality_type": "draft", + "machine_extruder_trains": { + "0": "geeetech_a30_extruder_0" + } + }, + "overrides": { + "machine_name": { + "default_value": "Geeetech A30" + }, + "machine_start_gcode": { + "default_value": "G28 ;Home\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG1 Z15.0 F6000 ;Move the platform down 15mm\nG92 E0\nG1 F200 E3\nG92 E0" + }, + "machine_end_gcode": { + "default_value": "M104 S0;Cooling the heat end\nM140 S0;Cooling the heat bed\nG92 E1\nG1 E-1 F300\nG28 X0 Y0;Home X axis and Y axis\nM84" + }, + "machine_width": { + "default_value": 320 + }, + "machine_height": { + "default_value": 420 + }, + "machine_depth": { + "default_value": 320 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_center_is_zero": { + "default_value": false + }, + "material_diameter": { + "default_value": 1.75 + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "layer_height": { + "default_value": 0.1 + }, + "layer_height_0": { + "default_value": 0.3 + }, + "retraction_amount": { + "default_value": 2 + }, + "retraction_speed": { + "default_value": 25 + }, + "adhesion_type": { + "default_value": "skirt" + }, + "machine_head_with_fans_polygon": { + "default_value": [ + [-75, 35], + [18, 35], + [18, -18], + [-75, -18] + ] + }, + "gantry_height": { + "value": "55" + }, + "machine_max_feedrate_x": { + "default_value": 300 + }, + "machine_max_feedrate_y": { + "default_value": 300 + }, + "machine_max_feedrate_z": { + "default_value": 7 + }, + "machine_max_feedrate_e": { + "default_value": 50 + }, + "machine_max_acceleration_x": { + "default_value": 2000 + }, + "machine_max_acceleration_y": { + "default_value": 2000 + }, + "machine_max_acceleration_z": { + "default_value": 100 + }, + "machine_max_acceleration_e": { + "default_value": 10000 + }, + "machine_acceleration": { + "default_value": 2000 + }, + "machine_max_jerk_xy": { + "default_value": 10 + }, + "machine_max_jerk_z": { + "default_value": 1 + }, + "machine_max_jerk_e": { + "default_value": 5 + }, + "machine_gcode_flavor": { + "default_value": "Repetier" + } + } +} diff --git a/resources/extruders/geeetech_A10M_1.def.json b/resources/extruders/geeetech_A10M_1.def.json new file mode 100644 index 0000000000..56b97e2e08 --- /dev/null +++ b/resources/extruders/geeetech_A10M_1.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "geeetech_A10M", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/geeetech_A10M_2.def.json b/resources/extruders/geeetech_A10M_2.def.json new file mode 100644 index 0000000000..6847eb7894 --- /dev/null +++ b/resources/extruders/geeetech_A10M_2.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "geeetech_A10M", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/geeetech_A10T_1.def.json b/resources/extruders/geeetech_A10T_1.def.json new file mode 100644 index 0000000000..177f2c2ef1 --- /dev/null +++ b/resources/extruders/geeetech_A10T_1.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "geeetech_A10T", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "2" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/geeetech_A10T_2.def.json b/resources/extruders/geeetech_A10T_2.def.json new file mode 100644 index 0000000000..878f2a4736 --- /dev/null +++ b/resources/extruders/geeetech_A10T_2.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "geeetech_A10T", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "2" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/geeetech_A10T_3.def.json b/resources/extruders/geeetech_A10T_3.def.json new file mode 100644 index 0000000000..f8db491116 --- /dev/null +++ b/resources/extruders/geeetech_A10T_3.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 3", + "inherits": "fdmextruder", + "metadata": { + "machine": "geeetech_A10T", + "position": "2" + }, + + "overrides": { + "extruder_nr": { + "default_value": 2, + "maximum_value": "2" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/geeetech_A10_1.def.json b/resources/extruders/geeetech_A10_1.def.json new file mode 100644 index 0000000000..1ed78b8445 --- /dev/null +++ b/resources/extruders/geeetech_A10_1.def.json @@ -0,0 +1,17 @@ +{ + + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "geeetech_A10", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/geeetech_A20M_1.def.json b/resources/extruders/geeetech_A20M_1.def.json new file mode 100644 index 0000000000..0607df1a5f --- /dev/null +++ b/resources/extruders/geeetech_A20M_1.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "geeetech_A20M", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/geeetech_A20M_2.def.json b/resources/extruders/geeetech_A20M_2.def.json new file mode 100644 index 0000000000..1eb594e33b --- /dev/null +++ b/resources/extruders/geeetech_A20M_2.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "geeetech_A20M", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/geeetech_A20T_1.def.json b/resources/extruders/geeetech_A20T_1.def.json new file mode 100644 index 0000000000..8e480b5ee3 --- /dev/null +++ b/resources/extruders/geeetech_A20T_1.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "geeetech_A20T", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "2" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/geeetech_A20T_2.def.json b/resources/extruders/geeetech_A20T_2.def.json new file mode 100644 index 0000000000..7cafd4c065 --- /dev/null +++ b/resources/extruders/geeetech_A20T_2.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "geeetech_A20T", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "2" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/geeetech_A20T_3.def.json b/resources/extruders/geeetech_A20T_3.def.json new file mode 100644 index 0000000000..1ab86e091a --- /dev/null +++ b/resources/extruders/geeetech_A20T_3.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 3", + "inherits": "fdmextruder", + "metadata": { + "machine": "geeetech_A20T", + "position": "2" + }, + + "overrides": { + "extruder_nr": { + "default_value": 2, + "maximum_value": "2" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/geeetech_Mizar_S_1.def.json b/resources/extruders/geeetech_Mizar_S_1.def.json new file mode 100644 index 0000000000..25a70a0223 --- /dev/null +++ b/resources/extruders/geeetech_Mizar_S_1.def.json @@ -0,0 +1,17 @@ +{ + + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "geeetech_Mizar_S", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/geeetech_a30_extruder_0.def.json b/resources/extruders/geeetech_a30_extruder_0.def.json new file mode 100644 index 0000000000..90cb496877 --- /dev/null +++ b/resources/extruders/geeetech_a30_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "geeetech_a30", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +}