diff --git a/resources/profiles/Geeetech.json b/resources/profiles/Geeetech.json index bada1272750..e112fc0b45e 100644 --- a/resources/profiles/Geeetech.json +++ b/resources/profiles/Geeetech.json @@ -63,7 +63,11 @@ { "name": "Geeetech A30 T", "sub_path": "machine/Geeetech A30 T.json" - } + }, + { + "name": "Geeetech M1", + "sub_path": "machine/Geeetech M1.json" + } ], "process_list": [ { @@ -365,7 +369,63 @@ { "name": "0.56mm Extra Draft @Geeetech common 0.8 nozzle", "sub_path": "process/0.56mm Extra Draft @Geeetech common 0.8 nozzle.json" - } + }, + { + "name": "0.08mm Extra Fine @Geeetech M1", + "sub_path": "process/0.08mm Extra Fine @Geeetech M1.json" + }, + { + "name": "0.08mm Optimal @Geeetech M1 0.2 nozzle", + "sub_path": "process/0.08mm Optimal @Geeetech M1 0.2 nozzle.json" + }, + { + "name": "0.10mm Fine @Geeetech M1", + "sub_path": "process/0.10mm Fine @Geeetech M1.json" + }, + { + "name": "0.10mm Standard @Geeetech M1 0.2 nozzle", + "sub_path": "process/0.10mm Standard @Geeetech M1 0.2 nozzle.json" + }, + { + "name": "0.12mm Draft @Geeetech M1 0.2 nozzle", + "sub_path": "process/0.12mm Draft @Geeetech M1 0.2 nozzle.json" + }, + { + "name": "0.14mm Extra Draft @Geeetech M1 0.2 nozzle", + "sub_path": "process/0.14mm Extra Draft @Geeetech M1 0.2 nozzle.json" + }, + { + "name": "0.16mm Optimal @Geeetech M1", + "sub_path": "process/0.16mm Optimal @Geeetech M1.json" + }, + { + "name": "0.24mm Optimal @Geeetech M1 0.6 nozzle", + "sub_path": "process/0.24mm Optimal @Geeetech M1 0.6 nozzle.json" + }, + { + "name": "0.20mm Standard @Geeetech M1", + "sub_path": "process/0.20mm Standard @Geeetech M1.json" + }, + { + "name": "0.25mm Draft @Geeetech M1", + "sub_path": "process/0.25mm Draft @Geeetech M1.json" + }, + { + "name": "0.30mm Standard @Geeetech M1 0.6 nozzle", + "sub_path": "process/0.30mm Standard @Geeetech M1 0.6 nozzle.json" + }, + { + "name": "0.36mm Draft @Geeetech M1 0.6 nozzle", + "sub_path": "process/0.36mm Draft @Geeetech M1 0.6 nozzle.json" + }, + { + "name": "0.36mm Optimal @Geeetech M1 0.8 nozzle", + "sub_path": "process/0.36mm Optimal @Geeetech M1 0.8 nozzle.json" + }, + { + "name": "0.44mm Draft @Geeetech M1 0.8 nozzle", + "sub_path": "process/0.44mm Draft @Geeetech M1 0.8 nozzle.json" + } ], "filament_list": [ { @@ -613,6 +673,22 @@ { "name": "Geeetech A30 T 0.4 nozzle", "sub_path": "machine/Geeetech A30 T 0.4 nozzle.json" - } + }, + { + "name": "Geeetech M1 0.2 nozzle", + "sub_path": "machine/Geeetech M1 0.2 nozzle.json" + }, + { + "name": "Geeetech M1 0.4 nozzle", + "sub_path": "machine/Geeetech M1 0.4 nozzle.json" + }, + { + "name": "Geeetech M1 0.6 nozzle", + "sub_path": "machine/Geeetech M1 0.6 nozzle.json" + }, + { + "name": "Geeetech M1 0.8 nozzle", + "sub_path": "machine/Geeetech M1 0.8 nozzle.json" + } ] } \ No newline at end of file diff --git a/resources/profiles/Geeetech/105x105.stl b/resources/profiles/Geeetech/105x105.stl new file mode 100644 index 00000000000..01941d04f23 Binary files /dev/null and b/resources/profiles/Geeetech/105x105.stl differ diff --git a/resources/profiles/Geeetech/105x105.svg b/resources/profiles/Geeetech/105x105.svg new file mode 100644 index 00000000000..743b5042c17 --- /dev/null +++ b/resources/profiles/Geeetech/105x105.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/profiles/Geeetech/Geeetech M1_cover.png b/resources/profiles/Geeetech/Geeetech M1_cover.png new file mode 100644 index 00000000000..a0080e99fe2 Binary files /dev/null and b/resources/profiles/Geeetech/Geeetech M1_cover.png differ diff --git a/resources/profiles/Geeetech/filament/Generic PETG @Geeetech.json b/resources/profiles/Geeetech/filament/Generic PETG @Geeetech.json index c7aa0898cfe..c5adbe3d500 100644 --- a/resources/profiles/Geeetech/filament/Generic PETG @Geeetech.json +++ b/resources/profiles/Geeetech/filament/Generic PETG @Geeetech.json @@ -81,6 +81,10 @@ "Geeetech Thunder 0.2 nozzle", "Geeetech Thunder 0.4 nozzle", "Geeetech Thunder 0.6 nozzle", - "Geeetech Thunder 0.8 nozzle" + "Geeetech Thunder 0.8 nozzle", + "Geeetech M1 0.2 nozzle", + "Geeetech M1 0.4 nozzle", + "Geeetech M1 0.6 nozzle", + "Geeetech M1 0.8 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Geeetech/filament/Generic PLA @Geeetech.json b/resources/profiles/Geeetech/filament/Generic PLA @Geeetech.json index ffb9eb9c7a5..1c74088c4e0 100644 --- a/resources/profiles/Geeetech/filament/Generic PLA @Geeetech.json +++ b/resources/profiles/Geeetech/filament/Generic PLA @Geeetech.json @@ -46,6 +46,10 @@ "Geeetech Mizar Max 0.4 nozzle", "Geeetech Mizar Max 0.6 nozzle", "Geeetech Mizar Max 0.8 nozzle", - "Geeetech Mizar M 0.4 nozzle" + "Geeetech Mizar M 0.4 nozzle", + "Geeetech M1 0.2 nozzle", + "Geeetech M1 0.4 nozzle", + "Geeetech M1 0.6 nozzle", + "Geeetech M1 0.8 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Geeetech/filament/Generic PLA @Geeetech_FastSpeed.json b/resources/profiles/Geeetech/filament/Generic PLA @Geeetech_FastSpeed.json index 55297dbae29..7d1d2e86e17 100644 --- a/resources/profiles/Geeetech/filament/Generic PLA @Geeetech_FastSpeed.json +++ b/resources/profiles/Geeetech/filament/Generic PLA @Geeetech_FastSpeed.json @@ -22,6 +22,10 @@ "Geeetech Thunder 0.2 nozzle", "Geeetech Thunder 0.4 nozzle", "Geeetech Thunder 0.6 nozzle", - "Geeetech Thunder 0.8 nozzle" + "Geeetech Thunder 0.8 nozzle", + "Geeetech M1 0.2 nozzle", + "Geeetech M1 0.4 nozzle", + "Geeetech M1 0.6 nozzle", + "Geeetech M1 0.8 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Geeetech/filament/Generic PLA-CF @Geeetech.json b/resources/profiles/Geeetech/filament/Generic PLA-CF @Geeetech.json index e85c839b02a..6489909a087 100644 --- a/resources/profiles/Geeetech/filament/Generic PLA-CF @Geeetech.json +++ b/resources/profiles/Geeetech/filament/Generic PLA-CF @Geeetech.json @@ -57,6 +57,10 @@ "Geeetech Thunder 0.2 nozzle", "Geeetech Thunder 0.4 nozzle", "Geeetech Thunder 0.6 nozzle", - "Geeetech Thunder 0.8 nozzle" + "Geeetech Thunder 0.8 nozzle", + "Geeetech M1 0.2 nozzle", + "Geeetech M1 0.4 nozzle", + "Geeetech M1 0.6 nozzle", + "Geeetech M1 0.8 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Geeetech/filament/Generic PVA @Geeetech.json b/resources/profiles/Geeetech/filament/Generic PVA @Geeetech.json index 954bc3a8a32..45342caf6be 100644 --- a/resources/profiles/Geeetech/filament/Generic PVA @Geeetech.json +++ b/resources/profiles/Geeetech/filament/Generic PVA @Geeetech.json @@ -53,6 +53,10 @@ "Geeetech Mizar Max 0.4 nozzle", "Geeetech Mizar Max 0.6 nozzle", "Geeetech Mizar Max 0.8 nozzle", - "Geeetech Mizar M 0.4 nozzle" + "Geeetech Mizar M 0.4 nozzle", + "Geeetech M1 0.2 nozzle", + "Geeetech M1 0.4 nozzle", + "Geeetech M1 0.6 nozzle", + "Geeetech M1 0.8 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Geeetech/filament/Generic TPU @Geeetech.json b/resources/profiles/Geeetech/filament/Generic TPU @Geeetech.json index 58c2c942186..06af7a93393 100644 --- a/resources/profiles/Geeetech/filament/Generic TPU @Geeetech.json +++ b/resources/profiles/Geeetech/filament/Generic TPU @Geeetech.json @@ -48,6 +48,10 @@ "Geeetech Thunder 0.2 nozzle", "Geeetech Thunder 0.4 nozzle", "Geeetech Thunder 0.6 nozzle", - "Geeetech Thunder 0.8 nozzle" + "Geeetech Thunder 0.8 nozzle", + "Geeetech M1 0.2 nozzle", + "Geeetech M1 0.4 nozzle", + "Geeetech M1 0.6 nozzle", + "Geeetech M1 0.8 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Geeetech/machine/Geeetech M1 0.2 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech M1 0.2 nozzle.json new file mode 100644 index 00000000000..d3355efe9af --- /dev/null +++ b/resources/profiles/Geeetech/machine/Geeetech M1 0.2 nozzle.json @@ -0,0 +1,109 @@ +{ + "type": "machine", + "setting_id": "GM_GEEETECH_039", + "name": "Geeetech M1 0.2 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_geeetech_common", + "printer_model": "Geeetech M1", + "default_filament_profile": [ + "Generic PLA @Geeetech" + ], + "printer_variant": "0.2", + "default_print_profile": "0.10mm Standard @Geeetech M1 0.2 nozzle", + "nozzle_diameter": [ + "0.2" + ], + "extruder_type": [ + "Direct" + ], + "machine_max_acceleration_e": [ + "2000", + "2000" + ], + "machine_max_acceleration_extruding": [ + "2000", + "2000" + ], + "machine_max_acceleration_retracting": [ + "2000", + "2000" + ], + "machine_max_acceleration_travel": [ + "3000", + "3000" + ], + "machine_max_acceleration_x": [ + "3000", + "3000" + ], + "machine_max_acceleration_y": [ + "3000", + "3000" + ], + "machine_max_acceleration_z": [ + "500", + "500" + ], + "machine_max_speed_e": [ + "60", + "60" + ], + "machine_max_speed_x": [ + "300", + "300" + ], + "machine_max_speed_y": [ + "300", + "300" + ], + "machine_max_speed_z": [ + "25", + "25" + ], + "machine_max_jerk_e": [ + "10", + "10" + ], + "machine_max_jerk_x": [ + "10", + "10" + ], + "machine_max_jerk_y": [ + "10", + "10" + ], + "machine_max_jerk_z": [ + "3", + "3" + ], + "max_layer_height": [ + "0.14" + ], + "min_layer_height": [ + "0.04" + ], + "retraction_length": [ + "1" + ], + "retraction_speed": [ + "40" + ], + "deretraction_speed": [ + "40" + ], + "printable_area": [ + "0x0", + "105x0", + "105x105", + "0x105" + ], + "printable_height": "95", + "retract_lift_below":[ + "95" + ], + "machine_start_gcode": ";Geeetech M1 official wiki URL for M1：https://www.geeetech.com/wiki/index.php/Geeetech_M1_3D_printer \nM104 S[first_layer_temperature] ; Set Hotend Temperature\nM140 S[first_layer_bed_temperature] ; set Bed Temperature\nM190 S[first_layer_bed_temperature] ; Wait for Bed Temperature\nM109 S[first_layer_temperature] ; wait for Hotend Temperature\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 ;Off Main 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_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", + "nozzle_type": "brass", + "auxiliary_fan": "0" +} \ No newline at end of file diff --git a/resources/profiles/Geeetech/machine/Geeetech M1 0.4 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech M1 0.4 nozzle.json new file mode 100644 index 00000000000..a3925678ba8 --- /dev/null +++ b/resources/profiles/Geeetech/machine/Geeetech M1 0.4 nozzle.json @@ -0,0 +1,115 @@ +{ + "type": "machine", + "setting_id": "GM_GEEETECH_040", + "name": "Geeetech M1 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_geeetech_common", + "printer_model": "Geeetech M1", + "default_filament_profile": [ + "Generic PLA @Geeetech" + ], + "printer_variant": "0.4", + "default_print_profile": "0.20mm Standard @Geeetech M1", + "nozzle_diameter": [ + "0.4" + ], + "extruder_type": [ + "Direct" + ], + "machine_max_acceleration_e": [ + "2000", + "2000" + ], + "machine_max_acceleration_extruding": [ + "2000", + "2000" + ], + "machine_max_acceleration_retracting": [ + "2000", + "2000" + ], + "machine_max_acceleration_travel": [ + "3000", + "3000" + ], + "machine_max_acceleration_x": [ + "3000", + "3000" + ], + "machine_max_acceleration_y": [ + "3000", + "3000" + ], + "machine_max_acceleration_z": [ + "500", + "500" + ], + "machine_max_speed_e": [ + "60", + "60" + ], + "machine_max_speed_x": [ + "300", + "300" + ], + "machine_max_speed_y": [ + "300", + "300" + ], + "machine_max_speed_z": [ + "25", + "25" + ], + "machine_max_jerk_e": [ + "10", + "10" + ], + "machine_max_jerk_x": [ + "10", + "10" + ], + "machine_max_jerk_y": [ + "10", + "10" + ], + "machine_max_jerk_z": [ + "3", + "3" + ], + "max_layer_height": [ + "0.14" + ], + "min_layer_height": [ + "0.04" + ], + "retraction_length": [ + "1" + ], + "retraction_speed": [ + "40" + ], + "deretraction_speed": [ + "40" + ], + "max_layer_height": [ + "0.3" + ], + "min_layer_height": [ + "0.07" + ], + "printable_area": [ + "0x0", + "105x0", + "105x105", + "0x105" + ], + "printable_height": "95", + "retract_lift_below":[ + "95" + ], + "machine_start_gcode": ";Geeetech M1 official wiki URL for M1：https://www.geeetech.com/wiki/index.php/Geeetech_M1_3D_printer \nM104 S[first_layer_temperature] ; Set Hotend Temperature\nM140 S[first_layer_bed_temperature] ; set Bed Temperature\nM190 S[first_layer_bed_temperature] ; Wait for Bed Temperature\nM109 S[first_layer_temperature] ; wait for Hotend Temperature\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 ;Off Main 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_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", + "nozzle_type": "brass", + "auxiliary_fan": "0" +} \ No newline at end of file diff --git a/resources/profiles/Geeetech/machine/Geeetech M1 0.6 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech M1 0.6 nozzle.json new file mode 100644 index 00000000000..de834f01ae0 --- /dev/null +++ b/resources/profiles/Geeetech/machine/Geeetech M1 0.6 nozzle.json @@ -0,0 +1,115 @@ +{ + "type": "machine", + "setting_id": "GM_GEEETECH_041", + "name": "Geeetech M1 0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_geeetech_common", + "printer_model": "Geeetech M1", + "default_filament_profile": [ + "Generic PLA @Geeetech" + ], + "printer_variant": "0.6", + "default_print_profile": "0.30mm Standard @Geeetech M1 0.6 nozzle", + "nozzle_diameter": [ + "0.6" + ], + "extruder_type": [ + "Direct" + ], + "machine_max_acceleration_e": [ + "2000", + "2000" + ], + "machine_max_acceleration_extruding": [ + "2000", + "2000" + ], + "machine_max_acceleration_retracting": [ + "2000", + "2000" + ], + "machine_max_acceleration_travel": [ + "3000", + "3000" + ], + "machine_max_acceleration_x": [ + "3000", + "3000" + ], + "machine_max_acceleration_y": [ + "3000", + "3000" + ], + "machine_max_acceleration_z": [ + "500", + "500" + ], + "machine_max_speed_e": [ + "60", + "60" + ], + "machine_max_speed_x": [ + "300", + "300" + ], + "machine_max_speed_y": [ + "300", + "300" + ], + "machine_max_speed_z": [ + "25", + "25" + ], + "machine_max_jerk_e": [ + "10", + "10" + ], + "machine_max_jerk_x": [ + "10", + "10" + ], + "machine_max_jerk_y": [ + "10", + "10" + ], + "machine_max_jerk_z": [ + "3", + "3" + ], + "max_layer_height": [ + "0.14" + ], + "min_layer_height": [ + "0.04" + ], + "retraction_length": [ + "1" + ], + "retraction_speed": [ + "40" + ], + "deretraction_speed": [ + "40" + ], + "max_layer_height": [ + "0.42" + ], + "min_layer_height": [ + "0.12" + ], + "printable_area": [ + "0x0", + "105x0", + "105x105", + "0x105" + ], + "printable_height": "95", + "retract_lift_below":[ + "95" + ], + "machine_start_gcode": ";Geeetech M1 official wiki URL for M1：https://www.geeetech.com/wiki/index.php/Geeetech_M1_3D_printer \nM104 S[first_layer_temperature] ; Set Hotend Temperature\nM140 S[first_layer_bed_temperature] ; set Bed Temperature\nM190 S[first_layer_bed_temperature] ; Wait for Bed Temperature\nM109 S[first_layer_temperature] ; wait for Hotend Temperature\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 ;Off Main 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_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", + "nozzle_type": "brass", + "auxiliary_fan": "0" +} \ No newline at end of file diff --git a/resources/profiles/Geeetech/machine/Geeetech M1 0.8 nozzle.json b/resources/profiles/Geeetech/machine/Geeetech M1 0.8 nozzle.json new file mode 100644 index 00000000000..0505e1055d6 --- /dev/null +++ b/resources/profiles/Geeetech/machine/Geeetech M1 0.8 nozzle.json @@ -0,0 +1,115 @@ +{ + "type": "machine", + "setting_id": "GM_GEEETECH_042", + "name": "Geeetech M1 0.8 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_geeetech_common", + "printer_model": "Geeetech M1", + "default_filament_profile": [ + "Generic PLA @Geeetech" + ], + "printer_variant": "0.8", + "default_print_profile": "0.44mm Draft @Geeetech M1 0.8 nozzle", + "nozzle_diameter": [ + "0.8" + ], + "extruder_type": [ + "Direct" + ], + "machine_max_acceleration_e": [ + "2000", + "2000" + ], + "machine_max_acceleration_extruding": [ + "2000", + "2000" + ], + "machine_max_acceleration_retracting": [ + "2000", + "2000" + ], + "machine_max_acceleration_travel": [ + "3000", + "3000" + ], + "machine_max_acceleration_x": [ + "3000", + "3000" + ], + "machine_max_acceleration_y": [ + "3000", + "3000" + ], + "machine_max_acceleration_z": [ + "500", + "500" + ], + "machine_max_speed_e": [ + "60", + "60" + ], + "machine_max_speed_x": [ + "300", + "300" + ], + "machine_max_speed_y": [ + "300", + "300" + ], + "machine_max_speed_z": [ + "25", + "25" + ], + "machine_max_jerk_e": [ + "10", + "10" + ], + "machine_max_jerk_x": [ + "10", + "10" + ], + "machine_max_jerk_y": [ + "10", + "10" + ], + "machine_max_jerk_z": [ + "3", + "3" + ], + "max_layer_height": [ + "0.14" + ], + "min_layer_height": [ + "0.04" + ], + "retraction_length": [ + "1" + ], + "retraction_speed": [ + "40" + ], + "deretraction_speed": [ + "40" + ], + "max_layer_height": [ + "0.56" + ], + "min_layer_height": [ + "0.16" + ], + "printable_area": [ + "0x0", + "105x0", + "105x105", + "0x105" + ], + "printable_height": "95", + "retract_lift_below":[ + "95" + ], + "machine_start_gcode": ";Geeetech M1 official wiki URL for M1：https://www.geeetech.com/wiki/index.php/Geeetech_M1_3D_printer \nM104 S[first_layer_temperature] ; Set Hotend Temperature\nM140 S[first_layer_bed_temperature] ; set Bed Temperature\nM190 S[first_layer_bed_temperature] ; Wait for Bed Temperature\nM109 S[first_layer_temperature] ; wait for Hotend Temperature\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM107 ;Off Main 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_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", + "nozzle_type": "brass", + "auxiliary_fan": "0" +} \ No newline at end of file diff --git a/resources/profiles/Geeetech/machine/Geeetech M1.json b/resources/profiles/Geeetech/machine/Geeetech M1.json new file mode 100644 index 00000000000..47e7942e80b --- /dev/null +++ b/resources/profiles/Geeetech/machine/Geeetech M1.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Geeetech M1", + "model_id": "Geeetech_M1", + "nozzle_diameter": "0.4;0.2;0.6;0.8", + "machine_tech": "FFF", + "family": "Geeetech", + "bed_model": "105x105.stl", + "bed_texture": "Geeetech_buildplate_texture.png", + "hotend_model": "", + "default_materials": "Generic PLA @Geeetech;Generic PLA @Geeetech_FastSpeed;Generic PETG @Geeetech;Generic TPU @Geeetech" +} diff --git a/resources/profiles/Geeetech/process/0.08mm Extra Fine @Geeetech M1.json b/resources/profiles/Geeetech/process/0.08mm Extra Fine @Geeetech M1.json new file mode 100644 index 00000000000..ae615d24408 --- /dev/null +++ b/resources/profiles/Geeetech/process/0.08mm Extra Fine @Geeetech M1.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "0.08mm Extra Fine @Geeetech M1", + "inherits": "fdm_process_Geeetech_HS_0.08", + "from": "system", + "setting_id": "GP_Geeetech_038", + "instantiation": "true", + "initial_layer_speed": "30", + "initial_layer_infill_speed": "50", + "outer_wall_speed": "80", + "inner_wall_speed": "100", + "sparse_infill_speed": "120", + "internal_solid_infill_speed":"100", + "top_surface_speed": "50", + "gap_infill_speed": "80", + "travel_speed": "200", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", + "initial_layer_acceleration": "500", + "top_surface_acceleration": "2000", + "travel_acceleration": "3000", + "compatible_printers": [ + "Geeetech M1 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Geeetech/process/0.08mm Optimal @Geeetech M1 0.2 nozzle.json b/resources/profiles/Geeetech/process/0.08mm Optimal @Geeetech M1 0.2 nozzle.json new file mode 100644 index 00000000000..594fc8012dc --- /dev/null +++ b/resources/profiles/Geeetech/process/0.08mm Optimal @Geeetech M1 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "0.08mm Optimal @Geeetech M1 0.2 nozzle", + "inherits": "fdm_process_Geeetech_HS_0.08_nozzle_0.2", + "from": "system", + "setting_id": "GP_Geeetech_039", + "instantiation": "true", + "initial_layer_speed": "30", + "initial_layer_infill_speed": "50", + "outer_wall_speed": "100", + "inner_wall_speed": "150", + "sparse_infill_speed": "120", + "internal_solid_infill_speed":"100", + "top_surface_speed": "50", + "gap_infill_speed": "80", + "travel_speed": "200", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", + "initial_layer_acceleration": "500", + "top_surface_acceleration": "2000", + "travel_acceleration": "3000", + "compatible_printers": [ + "Geeetech M1 0.2 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Geeetech/process/0.10mm Fine @Geeetech M1.json b/resources/profiles/Geeetech/process/0.10mm Fine @Geeetech M1.json new file mode 100644 index 00000000000..1efa2662ebd --- /dev/null +++ b/resources/profiles/Geeetech/process/0.10mm Fine @Geeetech M1.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "0.10mm Fine @Geeetech M1", + "inherits": "fdm_process_Geeetech_HS_0.10", + "from": "system", + "setting_id": "GP_Geeetech_040", + "instantiation": "true", + "initial_layer_speed": "30", + "initial_layer_infill_speed": "50", + "outer_wall_speed": "60", + "inner_wall_speed": "100", + "sparse_infill_speed": "120", + "internal_solid_infill_speed":"100", + "top_surface_speed": "50", + "gap_infill_speed": "80", + "travel_speed": "200", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", + "initial_layer_acceleration": "500", + "top_surface_acceleration": "2000", + "travel_acceleration": "3000", + "compatible_printers": [ + "Geeetech M1 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Geeetech/process/0.10mm Standard @Geeetech M1 0.2 nozzle.json b/resources/profiles/Geeetech/process/0.10mm Standard @Geeetech M1 0.2 nozzle.json new file mode 100644 index 00000000000..c4bad282640 --- /dev/null +++ b/resources/profiles/Geeetech/process/0.10mm Standard @Geeetech M1 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "0.10mm Standard @Geeetech M1 0.2 nozzle", + "inherits": "fdm_process_Geeetech_HS_0.10_nozzle_0.2", + "from": "system", + "setting_id": "GP_Geeetech_041", + "instantiation": "true", + "initial_layer_speed": "30", + "initial_layer_infill_speed": "50", + "outer_wall_speed": "100", + "inner_wall_speed": "120", + "sparse_infill_speed": "150", + "internal_solid_infill_speed":"100", + "top_surface_speed": "50", + "gap_infill_speed": "80", + "travel_speed": "200", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", + "initial_layer_acceleration": "500", + "top_surface_acceleration": "2000", + "travel_acceleration": "3000", + "compatible_printers": [ + "Geeetech M1 0.2 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Geeetech/process/0.12mm Draft @Geeetech M1 0.2 nozzle.json b/resources/profiles/Geeetech/process/0.12mm Draft @Geeetech M1 0.2 nozzle.json new file mode 100644 index 00000000000..4b937acd8b4 --- /dev/null +++ b/resources/profiles/Geeetech/process/0.12mm Draft @Geeetech M1 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "0.12mm Draft @Geeetech M1 0.2 nozzle", + "inherits": "fdm_process_Geeetech_HS_0.12_nozzle_0.2", + "from": "system", + "setting_id": "GP_Geeetech_042", + "instantiation": "true", + "initial_layer_speed": "30", + "initial_layer_infill_speed": "50", + "outer_wall_speed": "80", + "inner_wall_speed": "120", + "sparse_infill_speed": "150", + "internal_solid_infill_speed":"100", + "top_surface_speed": "50", + "gap_infill_speed": "80", + "travel_speed": "200", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", + "initial_layer_acceleration": "500", + "top_surface_acceleration": "2000", + "travel_acceleration": "3000", + "compatible_printers": [ + "Geeetech M1 0.2 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Geeetech/process/0.14mm Extra Draft @Geeetech M1 0.2 nozzle.json b/resources/profiles/Geeetech/process/0.14mm Extra Draft @Geeetech M1 0.2 nozzle.json new file mode 100644 index 00000000000..780a01e420c --- /dev/null +++ b/resources/profiles/Geeetech/process/0.14mm Extra Draft @Geeetech M1 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "0.14mm Extra Draft @Geeetech M1 0.2 nozzle", + "inherits": "fdm_process_Geeetech_HS_0.14_nozzle_0.2", + "from": "system", + "setting_id": "GP_Geeetech_043", + "instantiation": "true", + "initial_layer_speed": "30", + "initial_layer_infill_speed": "50", + "outer_wall_speed": "80", + "inner_wall_speed": "120", + "sparse_infill_speed": "120", + "internal_solid_infill_speed":"100", + "top_surface_speed": "50", + "gap_infill_speed": "80", + "travel_speed": "200", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", + "initial_layer_acceleration": "500", + "top_surface_acceleration": "2000", + "travel_acceleration": "3000", + "compatible_printers": [ + "Geeetech M1 0.2 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Geeetech/process/0.16mm Optimal @Geeetech M1.json b/resources/profiles/Geeetech/process/0.16mm Optimal @Geeetech M1.json new file mode 100644 index 00000000000..492fcd23d97 --- /dev/null +++ b/resources/profiles/Geeetech/process/0.16mm Optimal @Geeetech M1.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "0.16mm Optimal @Geeetech M1", + "inherits": "fdm_process_Geeetech_HS_0.16", + "from": "system", + "setting_id": "GP_Geeetech_044", + "instantiation": "true", + "initial_layer_speed": "30", + "initial_layer_infill_speed": "50", + "outer_wall_speed": "60", + "inner_wall_speed": "100", + "sparse_infill_speed": "120", + "internal_solid_infill_speed":"100", + "top_surface_speed": "50", + "gap_infill_speed": "80", + "travel_speed": "200", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", + "initial_layer_acceleration": "500", + "top_surface_acceleration": "2000", + "travel_acceleration": "3000", + "compatible_printers": [ + "Geeetech M1 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Geeetech/process/0.20mm Standard @Geeetech M1.json b/resources/profiles/Geeetech/process/0.20mm Standard @Geeetech M1.json new file mode 100644 index 00000000000..b89706c6922 --- /dev/null +++ b/resources/profiles/Geeetech/process/0.20mm Standard @Geeetech M1.json @@ -0,0 +1,34 @@ +{ + "type": "process", + "name": "0.20mm Standard @Geeetech M1", + "inherits": "fdm_process_Geeetech_HS_0.20", + "from": "system", + "setting_id": "GP_Geeetech_046", + "instantiation": "true", + "line_width": "0.40", + "outer_wall_line_width": "0.40", + "initial_layer_line_width": "0.40", + "sparse_infill_line_width": "0.40", + "inner_wall_line_width": "0.40", + "internal_solid_infill_line_width": "0.40", + "support_line_width": "0.38", + "top_surface_line_width": "0.40", + "initial_layer_speed": "30", + "initial_layer_infill_speed": "50", + "outer_wall_speed": "50", + "inner_wall_speed": "80", + "sparse_infill_speed": "120", + "internal_solid_infill_speed":"100", + "top_surface_speed": "50", + "gap_infill_speed": "80", + "travel_speed": "200", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", + "initial_layer_acceleration": "500", + "top_surface_acceleration": "2000", + "travel_acceleration": "3000", + "compatible_printers": [ + "Geeetech M1 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Geeetech/process/0.24mm Optimal @Geeetech M1 0.6 nozzle.json b/resources/profiles/Geeetech/process/0.24mm Optimal @Geeetech M1 0.6 nozzle.json new file mode 100644 index 00000000000..8d76f758324 --- /dev/null +++ b/resources/profiles/Geeetech/process/0.24mm Optimal @Geeetech M1 0.6 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "0.24mm Optimal @Geeetech M1 0.6 nozzle", + "inherits": "fdm_process_Geeetech_HS_0.24_nozzle_0.6", + "from": "system", + "setting_id": "GP_Geeetech_045", + "instantiation": "true", + "initial_layer_speed": "30", + "initial_layer_infill_speed": "50", + "outer_wall_speed": "50", + "inner_wall_speed": "80", + "sparse_infill_speed": "100", + "internal_solid_infill_speed":"100", + "top_surface_speed": "50", + "gap_infill_speed": "80", + "travel_speed": "200", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", + "initial_layer_acceleration": "500", + "top_surface_acceleration": "2000", + "travel_acceleration": "3000", + "compatible_printers": [ + "Geeetech M1 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Geeetech/process/0.25mm Draft @Geeetech M1.json b/resources/profiles/Geeetech/process/0.25mm Draft @Geeetech M1.json new file mode 100644 index 00000000000..46dd14e7ecf --- /dev/null +++ b/resources/profiles/Geeetech/process/0.25mm Draft @Geeetech M1.json @@ -0,0 +1,34 @@ +{ + "type": "process", + "name": "0.25mm Draft @Geeetech M1", + "inherits": "fdm_process_Geeetech_HS_0.25", + "from": "system", + "setting_id": "GP_Geeetech_047", + "instantiation": "true", + "line_width": "0.40", + "outer_wall_line_width": "0.40", + "initial_layer_line_width": "0.40", + "sparse_infill_line_width": "0.40", + "inner_wall_line_width": "0.40", + "internal_solid_infill_line_width": "0.40", + "support_line_width": "0.38", + "top_surface_line_width": "0.40", + "initial_layer_speed": "30", + "initial_layer_infill_speed": "50", + "outer_wall_speed": "50", + "inner_wall_speed": "80", + "sparse_infill_speed": "100", + "internal_solid_infill_speed":"100", + "top_surface_speed": "50", + "gap_infill_speed": "80", + "travel_speed": "200", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", + "initial_layer_acceleration": "500", + "top_surface_acceleration": "2000", + "travel_acceleration": "3000", + "compatible_printers": [ + "Geeetech M1 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Geeetech/process/0.30mm Standard @Geeetech M1 0.6 nozzle.json b/resources/profiles/Geeetech/process/0.30mm Standard @Geeetech M1 0.6 nozzle.json new file mode 100644 index 00000000000..4ca4de9516a --- /dev/null +++ b/resources/profiles/Geeetech/process/0.30mm Standard @Geeetech M1 0.6 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "0.30mm Standard @Geeetech M1 0.6 nozzle", + "inherits": "fdm_process_Geeetech_HS_0.30_nozzle_0.6", + "from": "system", + "setting_id": "GP_Geeetech_048", + "instantiation": "true", + "initial_layer_speed": "30", + "initial_layer_infill_speed": "50", + "outer_wall_speed": "100", + "inner_wall_speed": "150", + "sparse_infill_speed": "120", + "internal_solid_infill_speed":"100", + "top_surface_speed": "50", + "gap_infill_speed": "80", + "travel_speed": "200", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", + "initial_layer_acceleration": "500", + "top_surface_acceleration": "2000", + "travel_acceleration": "3000", + "compatible_printers": [ + "Geeetech M1 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Geeetech/process/0.36mm Draft @Geeetech M1 0.6 nozzle.json b/resources/profiles/Geeetech/process/0.36mm Draft @Geeetech M1 0.6 nozzle.json new file mode 100644 index 00000000000..efe67bed36a --- /dev/null +++ b/resources/profiles/Geeetech/process/0.36mm Draft @Geeetech M1 0.6 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "0.36mm Draft @Geeetech M1 0.6 nozzle", + "inherits": "fdm_process_Geeetech_HS_0.36_nozzle_0.6", + "from": "system", + "setting_id": "GP_Geeetech_049", + "instantiation": "true", + "initial_layer_speed": "30", + "initial_layer_infill_speed": "50", + "outer_wall_speed": "100", + "inner_wall_speed": "150", + "sparse_infill_speed": "120", + "internal_solid_infill_speed":"100", + "top_surface_speed": "50", + "gap_infill_speed": "80", + "travel_speed": "200", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", + "initial_layer_acceleration": "500", + "top_surface_acceleration": "2000", + "travel_acceleration": "3000", + "compatible_printers": [ + "Geeetech M1 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Geeetech/process/0.36mm Optimal @Geeetech M1 0.8 nozzle.json b/resources/profiles/Geeetech/process/0.36mm Optimal @Geeetech M1 0.8 nozzle.json new file mode 100644 index 00000000000..fed334ec70a --- /dev/null +++ b/resources/profiles/Geeetech/process/0.36mm Optimal @Geeetech M1 0.8 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "0.36mm Optimal @Geeetech M1 0.8 nozzle", + "inherits": "fdm_process_Geeetech_HS_0.36_nozzle_0.8", + "from": "system", + "setting_id": "GP_Geeetech_050", + "instantiation": "true", + "initial_layer_speed": "30", + "initial_layer_infill_speed": "50", + "outer_wall_speed": "100", + "inner_wall_speed": "150", + "sparse_infill_speed": "120", + "internal_solid_infill_speed":"100", + "top_surface_speed": "50", + "gap_infill_speed": "80", + "travel_speed": "200", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", + "initial_layer_acceleration": "500", + "top_surface_acceleration": "2000", + "travel_acceleration": "3000", + "compatible_printers": [ + "Geeetech M1 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Geeetech/process/0.44mm Draft @Geeetech M1 0.8 nozzle.json b/resources/profiles/Geeetech/process/0.44mm Draft @Geeetech M1 0.8 nozzle.json new file mode 100644 index 00000000000..9221f9f41f9 --- /dev/null +++ b/resources/profiles/Geeetech/process/0.44mm Draft @Geeetech M1 0.8 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "0.44mm Draft @Geeetech M1 0.8 nozzle", + "inherits": "fdm_process_Geeetech_HS_0.44_nozzle_0.8", + "from": "system", + "setting_id": "GP_Geeetech_051", + "instantiation": "true", + "initial_layer_speed": "30", + "initial_layer_infill_speed": "50", + "outer_wall_speed": "100", + "inner_wall_speed": "150", + "sparse_infill_speed": "120", + "internal_solid_infill_speed":"100", + "top_surface_speed": "50", + "gap_infill_speed": "80", + "travel_speed": "200", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", + "initial_layer_acceleration": "500", + "top_surface_acceleration": "2000", + "travel_acceleration": "3000", + "compatible_printers": [ + "Geeetech M1 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Geeetech/process/fdm_process_Geeetech_HS_0.20.json b/resources/profiles/Geeetech/process/fdm_process_Geeetech_HS_0.20.json index f05fb023405..eac0c76c8e3 100644 --- a/resources/profiles/Geeetech/process/fdm_process_Geeetech_HS_0.20.json +++ b/resources/profiles/Geeetech/process/fdm_process_Geeetech_HS_0.20.json @@ -5,6 +5,7 @@ "from": "system", "instantiation": "false", "layer_height": "0.20", + "wall_loops": "2", "bottom_shell_layers": "5", "elefant_foot_compensation": "0.15", "top_shell_layers": "5", diff --git a/resources/profiles/Geeetech/process/fdm_process_Geeetech_HS_0.25.json b/resources/profiles/Geeetech/process/fdm_process_Geeetech_HS_0.25.json index 9a7e999dd5f..36f90fca544 100644 --- a/resources/profiles/Geeetech/process/fdm_process_Geeetech_HS_0.25.json +++ b/resources/profiles/Geeetech/process/fdm_process_Geeetech_HS_0.25.json @@ -5,6 +5,8 @@ "from": "system", "instantiation": "false", "layer_height": "0.25", + "wall_loops": "2", + "initial_layer_print_height": "0.3", "elefant_foot_compensation": "0.15", "top_surface_line_width": "0.45", "top_shell_thickness": "1.0",