diff --git a/resources/definitions/geeetech_M1.def.json b/resources/definitions/geeetech_M1.def.json new file mode 100644 index 0000000000..2782c7c87c --- /dev/null +++ b/resources/definitions/geeetech_M1.def.json @@ -0,0 +1,59 @@ +{ + "version": 2, + "name": "Geeetech M1", + "inherits": "Geeetech_Base_Single_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "adhesion_type": { "value": "'brim'" }, + "brim_width": { "value": 2 }, + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 105 }, + "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": 95 }, + "machine_name": { "default_value": "Geeetech M1" }, + "machine_start_gcode": { "default_value": ";Official wiki URL for Geeetech M1:https://www.geeetech.com/wiki/index.php/Geeetech_M1_3D_printer \nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM140 S{material_bed_temperature_layer_0} ; Set Bed Temperature\n;M190 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 ;Off Fan\nM300 S2500 P1000 ;Play a short tune\nG1 Z0.28 ;Move Z Axis up little to prevent scratching of Heat Bed\nG92 E0 ;Reset Extruder\nG1 Y3 F2400 ;Move to start position\nG1 X75 E40 F500 ;Draw a filament line\nG92 E0 ;Reset Extruder\n;G1 E-0.2 F3000 ;Retract a little\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X70 Y3 Z0.27 F3000 ;Quickly wipe away from the filament line\nG92 E0 ;Reset Extruder" }, + "machine_width": { "default_value": 105 }, + "material_bed_temperature": { "maximum_value": 60 }, + "material_print_temperature": { "maximum_value": 230 }, + "retraction_amount": { "value": 2 }, + "speed_print": + { + "maximum_value_warning": "200", + "value": 120 + }, + "speed_topbottom": + { + "maximum_value_warning": "200", + "value": 60 + }, + "speed_wall": + { + "maximum_value_warning": "200", + "value": 80 + }, + "speed_wall_0": + { + "maximum_value_warning": "200", + "value": 50 + }, + "speed_wall_x": + { + "maximum_value_warning": "200", + "value": 80 + } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_M1S.def.json b/resources/definitions/geeetech_M1S.def.json new file mode 100644 index 0000000000..79bfec5a89 --- /dev/null +++ b/resources/definitions/geeetech_M1S.def.json @@ -0,0 +1,59 @@ +{ + "version": 2, + "name": "Geeetech M1S", + "inherits": "Geeetech_Base_Single_Extruder", + "metadata": + { + "visible": true, + "machine_extruder_trains": { "0": "Geeetech_Single_Extruder" } + }, + "overrides": + { + "adhesion_type": { "value": "'brim'" }, + "brim_width": { "value": 2 }, + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 105 }, + "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": 95 }, + "machine_name": { "default_value": "Geeetech M1S" }, + "machine_start_gcode": { "default_value": ";Official wiki URL for Geeetech M1S:https://www.geeetech.com/wiki/index.php/Geeetech_M1S_3D_printer \nM104 S{material_print_temperature_layer_0} ; Set Hotend Temperature\nM140 S{material_bed_temperature_layer_0} ; Set Bed Temperature\n;M190 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 ;Off Fan\nM300 S2500 P1000 ;Play a short tune\nG1 Z0.28 ;Move Z Axis up little to prevent scratching of Heat Bed\nG92 E0 ;Reset Extruder\nG1 Y3 F2400 ;Move to start position\nG1 X75 E40 F500 ;Draw a filament line\nG92 E0 ;Reset Extruder\n;G1 E-0.2 F3000 ;Retract a little\nG1 Z2.0 F3000 ;Move Z Axis up little to prevent scratching of Heat Bed\nG1 X70 Y3 Z0.27 F3000 ;Quickly wipe away from the filament line\nG92 E0 ;Reset Extruder" }, + "machine_width": { "default_value": 105 }, + "material_bed_temperature": { "maximum_value": 85 }, + "material_print_temperature": { "maximum_value": 250 }, + "retraction_amount": { "value": 2 }, + "speed_print": + { + "maximum_value_warning": "200", + "value": 120 + }, + "speed_topbottom": + { + "maximum_value_warning": "200", + "value": 60 + }, + "speed_wall": + { + "maximum_value_warning": "200", + "value": 80 + }, + "speed_wall_0": + { + "maximum_value_warning": "200", + "value": 50 + }, + "speed_wall_x": + { + "maximum_value_warning": "200", + "value": 80 + } + } +} \ No newline at end of file diff --git a/resources/definitions/geeetech_Thunder.def.json b/resources/definitions/geeetech_Thunder.def.json index cc3e4044f8..cf0f9dd5e9 100644 --- a/resources/definitions/geeetech_Thunder.def.json +++ b/resources/definitions/geeetech_Thunder.def.json @@ -81,14 +81,10 @@ "machine_max_jerk_xy": { "value": 45 }, "machine_max_jerk_z": { "value": 0.8 }, "machine_name": { "default_value": "Geeetech Thunder" }, - "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_start_gcode": { "default_value": ";Official wiki URL 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_width": { "default_value": 250 }, "material_flow_layer_0": { "value": 95 }, - "material_print_temperature": - { - "maximum_value": "250", - "value": "200 if speed_infill <=150 else 205 if speed_infill <= 200 else 215 if speed_infill <= 260 else 220" - }, + "material_print_temperature": { "maximum_value": "250" }, "material_print_temperature_layer_0": { "maximum_value_warning": 300, diff --git a/resources/variants/geeetech_variants/geeetech_M1S_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1S_0.2.inst.cfg new file mode 100644 index 0000000000..2ed913b2a4 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1S_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1S +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_M1S_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1S_0.3.inst.cfg new file mode 100644 index 0000000000..032e25592d --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1S_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1S +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_M1S_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1S_0.4.inst.cfg new file mode 100644 index 0000000000..12306b7acc --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1S_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1S +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_M1S_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1S_0.5.inst.cfg new file mode 100644 index 0000000000..59db9afec4 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1S_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1S +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_M1S_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1S_0.6.inst.cfg new file mode 100644 index 0000000000..ee92dc8c93 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1S_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1S +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_M1S_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1S_0.8.inst.cfg new file mode 100644 index 0000000000..0029d6101c --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1S_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1S +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_M1S_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1S_1.0.inst.cfg new file mode 100644 index 0000000000..225b0b3c06 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1S_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1S +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.2.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.2.inst.cfg new file mode 100644 index 0000000000..77bf14e06e --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1 +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.3.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.3.inst.cfg new file mode 100644 index 0000000000..f9ecf2eec2 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1 +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.4.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.4.inst.cfg new file mode 100644 index 0000000000..e3c124c614 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1 +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.5.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.5.inst.cfg new file mode 100644 index 0000000000..5adccce2df --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1 +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.6.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.6.inst.cfg new file mode 100644 index 0000000000..f61f2febc0 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1 +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/geeetech_variants/geeetech_M1_0.8.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_0.8.inst.cfg new file mode 100644 index 0000000000..0677557124 --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1 +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/geeetech_variants/geeetech_M1_1.0.inst.cfg b/resources/variants/geeetech_variants/geeetech_M1_1.0.inst.cfg new file mode 100644 index 0000000000..5df54b48df --- /dev/null +++ b/resources/variants/geeetech_variants/geeetech_M1_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = geeetech_M1 +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 25 +type = variant + +[values] +machine_nozzle_size = 1.0 +