diff --git a/resources/profiles/Geeetech/filament/Generic PETG @Geeetech.json b/resources/profiles/Geeetech/filament/Generic PETG @Geeetech.json index c5adbe3d500..b003156d2c4 100644 --- a/resources/profiles/Geeetech/filament/Generic PETG @Geeetech.json +++ b/resources/profiles/Geeetech/filament/Generic PETG @Geeetech.json @@ -48,9 +48,9 @@ "Geeetech A10 Pro 0.6 nozzle", "Geeetech A10 Pro 0.8 nozzle", "Geeetech A20 0.2 nozzle", - "Geeetech A20 0.4 nozzle", - "Geeetech A20 0.6 nozzle", - "Geeetech A20 0.8 nozzle", + "Geeetech A20 0.4 nozzle", + "Geeetech A20 0.6 nozzle", + "Geeetech A20 0.8 nozzle", "Geeetech A30 Pro 0.2 nozzle", "Geeetech A30 Pro 0.4 nozzle", "Geeetech A30 Pro 0.6 nozzle", @@ -58,33 +58,33 @@ "Geeetech A10 M 0.4 nozzle", "Geeetech A20 M 0.4 nozzle", "Geeetech A30 M 0.4 nozzle", - "Geeetech A10 T 0.4 nozzle", - "Geeetech A20 T 0.4 nozzle", - "Geeetech A30 T 0.4 nozzle", - "Geeetech Mizar 0.2 nozzle", - "Geeetech Mizar 0.4 nozzle", - "Geeetech Mizar 0.6 nozzle", - "Geeetech Mizar 0.8 nozzle", - "Geeetech Mizar S 0.2 nozzle", - "Geeetech Mizar S 0.4 nozzle", - "Geeetech Mizar S 0.6 nozzle", - "Geeetech Mizar S 0.8 nozzle", - "Geeetech Mizar Pro 0.2 nozzle", - "Geeetech Mizar Pro 0.4 nozzle", - "Geeetech Mizar Pro 0.6 nozzle", - "Geeetech Mizar Pro 0.8 nozzle", - "Geeetech Mizar Max 0.2 nozzle", - "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 Thunder 0.2 nozzle", - "Geeetech Thunder 0.4 nozzle", - "Geeetech Thunder 0.6 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" + "Geeetech A10 T 0.4 nozzle", + "Geeetech A20 T 0.4 nozzle", + "Geeetech A30 T 0.4 nozzle", + "Geeetech Mizar 0.2 nozzle", + "Geeetech Mizar 0.4 nozzle", + "Geeetech Mizar 0.6 nozzle", + "Geeetech Mizar 0.8 nozzle", + "Geeetech Mizar S 0.2 nozzle", + "Geeetech Mizar S 0.4 nozzle", + "Geeetech Mizar S 0.6 nozzle", + "Geeetech Mizar S 0.8 nozzle", + "Geeetech Mizar Pro 0.2 nozzle", + "Geeetech Mizar Pro 0.4 nozzle", + "Geeetech Mizar Pro 0.6 nozzle", + "Geeetech Mizar Pro 0.8 nozzle", + "Geeetech Mizar Max 0.2 nozzle", + "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 Thunder 0.2 nozzle", + "Geeetech Thunder 0.4 nozzle", + "Geeetech Thunder 0.6 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 1c74088c4e0..3606f07d2a3 100644 --- a/resources/profiles/Geeetech/filament/Generic PLA @Geeetech.json +++ b/resources/profiles/Geeetech/filament/Generic PLA @Geeetech.json @@ -17,9 +17,9 @@ "Geeetech A10 Pro 0.6 nozzle", "Geeetech A10 Pro 0.8 nozzle", "Geeetech A20 0.2 nozzle", - "Geeetech A20 0.4 nozzle", - "Geeetech A20 0.6 nozzle", - "Geeetech A20 0.8 nozzle", + "Geeetech A20 0.4 nozzle", + "Geeetech A20 0.6 nozzle", + "Geeetech A20 0.8 nozzle", "Geeetech A30 Pro 0.2 nozzle", "Geeetech A30 Pro 0.4 nozzle", "Geeetech A30 Pro 0.6 nozzle", @@ -27,29 +27,29 @@ "Geeetech A10 M 0.4 nozzle", "Geeetech A20 M 0.4 nozzle", "Geeetech A30 M 0.4 nozzle", - "Geeetech A10 T 0.4 nozzle", - "Geeetech A20 T 0.4 nozzle", - "Geeetech A30 T 0.4 nozzle", - "Geeetech Mizar 0.2 nozzle", - "Geeetech Mizar 0.4 nozzle", - "Geeetech Mizar 0.6 nozzle", - "Geeetech Mizar 0.8 nozzle", - "Geeetech Mizar S 0.2 nozzle", - "Geeetech Mizar S 0.4 nozzle", - "Geeetech Mizar S 0.6 nozzle", - "Geeetech Mizar S 0.8 nozzle", - "Geeetech Mizar Pro 0.2 nozzle", - "Geeetech Mizar Pro 0.4 nozzle", - "Geeetech Mizar Pro 0.6 nozzle", - "Geeetech Mizar Pro 0.8 nozzle", - "Geeetech Mizar Max 0.2 nozzle", - "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 M1 0.2 nozzle", - "Geeetech M1 0.4 nozzle", - "Geeetech M1 0.6 nozzle", - "Geeetech M1 0.8 nozzle" + "Geeetech A10 T 0.4 nozzle", + "Geeetech A20 T 0.4 nozzle", + "Geeetech A30 T 0.4 nozzle", + "Geeetech Mizar 0.2 nozzle", + "Geeetech Mizar 0.4 nozzle", + "Geeetech Mizar 0.6 nozzle", + "Geeetech Mizar 0.8 nozzle", + "Geeetech Mizar S 0.2 nozzle", + "Geeetech Mizar S 0.4 nozzle", + "Geeetech Mizar S 0.6 nozzle", + "Geeetech Mizar S 0.8 nozzle", + "Geeetech Mizar Pro 0.2 nozzle", + "Geeetech Mizar Pro 0.4 nozzle", + "Geeetech Mizar Pro 0.6 nozzle", + "Geeetech Mizar Pro 0.8 nozzle", + "Geeetech Mizar Max 0.2 nozzle", + "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 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 7d1d2e86e17..c1d3566c4eb 100644 --- a/resources/profiles/Geeetech/filament/Generic PLA @Geeetech_FastSpeed.json +++ b/resources/profiles/Geeetech/filament/Generic PLA @Geeetech_FastSpeed.json @@ -19,13 +19,13 @@ "hot_plate_temp_initial_layer": ["65"], "textured_plate_temp_initial_layer": ["65"], "compatible_printers": [ - "Geeetech Thunder 0.2 nozzle", - "Geeetech Thunder 0.4 nozzle", - "Geeetech Thunder 0.6 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" + "Geeetech Thunder 0.2 nozzle", + "Geeetech Thunder 0.4 nozzle", + "Geeetech Thunder 0.6 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 6489909a087..3c077478005 100644 --- a/resources/profiles/Geeetech/filament/Generic PLA-CF @Geeetech.json +++ b/resources/profiles/Geeetech/filament/Generic PLA-CF @Geeetech.json @@ -24,9 +24,9 @@ "Geeetech A10 Pro 0.6 nozzle", "Geeetech A10 Pro 0.8 nozzle", "Geeetech A20 0.2 nozzle", - "Geeetech A20 0.4 nozzle", - "Geeetech A20 0.6 nozzle", - "Geeetech A20 0.8 nozzle", + "Geeetech A20 0.4 nozzle", + "Geeetech A20 0.6 nozzle", + "Geeetech A20 0.8 nozzle", "Geeetech A30 Pro 0.2 nozzle", "Geeetech A30 Pro 0.4 nozzle", "Geeetech A30 Pro 0.6 nozzle", @@ -34,33 +34,33 @@ "Geeetech A10 M 0.4 nozzle", "Geeetech A20 M 0.4 nozzle", "Geeetech A30 M 0.4 nozzle", - "Geeetech A10 T 0.4 nozzle", - "Geeetech A20 T 0.4 nozzle", - "Geeetech A30 T 0.4 nozzle", - "Geeetech Mizar 0.2 nozzle", - "Geeetech Mizar 0.4 nozzle", - "Geeetech Mizar 0.6 nozzle", - "Geeetech Mizar 0.8 nozzle", - "Geeetech Mizar S 0.2 nozzle", - "Geeetech Mizar S 0.4 nozzle", - "Geeetech Mizar S 0.6 nozzle", - "Geeetech Mizar S 0.8 nozzle", - "Geeetech Mizar Pro 0.2 nozzle", - "Geeetech Mizar Pro 0.4 nozzle", - "Geeetech Mizar Pro 0.6 nozzle", - "Geeetech Mizar Pro 0.8 nozzle", - "Geeetech Mizar Max 0.2 nozzle", - "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 Thunder 0.2 nozzle", - "Geeetech Thunder 0.4 nozzle", - "Geeetech Thunder 0.6 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" + "Geeetech A10 T 0.4 nozzle", + "Geeetech A20 T 0.4 nozzle", + "Geeetech A30 T 0.4 nozzle", + "Geeetech Mizar 0.2 nozzle", + "Geeetech Mizar 0.4 nozzle", + "Geeetech Mizar 0.6 nozzle", + "Geeetech Mizar 0.8 nozzle", + "Geeetech Mizar S 0.2 nozzle", + "Geeetech Mizar S 0.4 nozzle", + "Geeetech Mizar S 0.6 nozzle", + "Geeetech Mizar S 0.8 nozzle", + "Geeetech Mizar Pro 0.2 nozzle", + "Geeetech Mizar Pro 0.4 nozzle", + "Geeetech Mizar Pro 0.6 nozzle", + "Geeetech Mizar Pro 0.8 nozzle", + "Geeetech Mizar Max 0.2 nozzle", + "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 Thunder 0.2 nozzle", + "Geeetech Thunder 0.4 nozzle", + "Geeetech Thunder 0.6 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 45342caf6be..165abbe22d9 100644 --- a/resources/profiles/Geeetech/filament/Generic PVA @Geeetech.json +++ b/resources/profiles/Geeetech/filament/Generic PVA @Geeetech.json @@ -24,9 +24,9 @@ "Geeetech A10 Pro 0.6 nozzle", "Geeetech A10 Pro 0.8 nozzle", "Geeetech A20 0.2 nozzle", - "Geeetech A20 0.4 nozzle", - "Geeetech A20 0.6 nozzle", - "Geeetech A20 0.8 nozzle", + "Geeetech A20 0.4 nozzle", + "Geeetech A20 0.6 nozzle", + "Geeetech A20 0.8 nozzle", "Geeetech A30 Pro 0.2 nozzle", "Geeetech A30 Pro 0.4 nozzle", "Geeetech A30 Pro 0.6 nozzle", @@ -34,29 +34,29 @@ "Geeetech A10 M 0.4 nozzle", "Geeetech A20 M 0.4 nozzle", "Geeetech A30 M 0.4 nozzle", - "Geeetech A10 T 0.4 nozzle", - "Geeetech A20 T 0.4 nozzle", - "Geeetech A30 T 0.4 nozzle", - "Geeetech Mizar 0.2 nozzle", - "Geeetech Mizar 0.4 nozzle", - "Geeetech Mizar 0.6 nozzle", - "Geeetech Mizar 0.8 nozzle", - "Geeetech Mizar S 0.2 nozzle", - "Geeetech Mizar S 0.4 nozzle", - "Geeetech Mizar S 0.6 nozzle", - "Geeetech Mizar S 0.8 nozzle", - "Geeetech Mizar Pro 0.2 nozzle", - "Geeetech Mizar Pro 0.4 nozzle", - "Geeetech Mizar Pro 0.6 nozzle", - "Geeetech Mizar Pro 0.8 nozzle", - "Geeetech Mizar Max 0.2 nozzle", - "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 M1 0.2 nozzle", - "Geeetech M1 0.4 nozzle", - "Geeetech M1 0.6 nozzle", - "Geeetech M1 0.8 nozzle" + "Geeetech A10 T 0.4 nozzle", + "Geeetech A20 T 0.4 nozzle", + "Geeetech A30 T 0.4 nozzle", + "Geeetech Mizar 0.2 nozzle", + "Geeetech Mizar 0.4 nozzle", + "Geeetech Mizar 0.6 nozzle", + "Geeetech Mizar 0.8 nozzle", + "Geeetech Mizar S 0.2 nozzle", + "Geeetech Mizar S 0.4 nozzle", + "Geeetech Mizar S 0.6 nozzle", + "Geeetech Mizar S 0.8 nozzle", + "Geeetech Mizar Pro 0.2 nozzle", + "Geeetech Mizar Pro 0.4 nozzle", + "Geeetech Mizar Pro 0.6 nozzle", + "Geeetech Mizar Pro 0.8 nozzle", + "Geeetech Mizar Max 0.2 nozzle", + "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 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 06af7a93393..31f225a4df7 100644 --- a/resources/profiles/Geeetech/filament/Generic TPU @Geeetech.json +++ b/resources/profiles/Geeetech/filament/Generic TPU @Geeetech.json @@ -15,9 +15,9 @@ "Geeetech A10 Pro 0.6 nozzle", "Geeetech A10 Pro 0.8 nozzle", "Geeetech A20 0.2 nozzle", - "Geeetech A20 0.4 nozzle", - "Geeetech A20 0.6 nozzle", - "Geeetech A20 0.8 nozzle", + "Geeetech A20 0.4 nozzle", + "Geeetech A20 0.6 nozzle", + "Geeetech A20 0.8 nozzle", "Geeetech A30 Pro 0.2 nozzle", "Geeetech A30 Pro 0.4 nozzle", "Geeetech A30 Pro 0.6 nozzle", @@ -25,33 +25,33 @@ "Geeetech A10 M 0.4 nozzle", "Geeetech A20 M 0.4 nozzle", "Geeetech A30 M 0.4 nozzle", - "Geeetech A10 T 0.4 nozzle", - "Geeetech A20 T 0.4 nozzle", - "Geeetech A30 T 0.4 nozzle", - "Geeetech Mizar 0.2 nozzle", - "Geeetech Mizar 0.4 nozzle", - "Geeetech Mizar 0.6 nozzle", - "Geeetech Mizar 0.8 nozzle", - "Geeetech Mizar S 0.2 nozzle", - "Geeetech Mizar S 0.4 nozzle", - "Geeetech Mizar S 0.6 nozzle", - "Geeetech Mizar S 0.8 nozzle", - "Geeetech Mizar Pro 0.2 nozzle", - "Geeetech Mizar Pro 0.4 nozzle", - "Geeetech Mizar Pro 0.6 nozzle", - "Geeetech Mizar Pro 0.8 nozzle", - "Geeetech Mizar Max 0.2 nozzle", - "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 Thunder 0.2 nozzle", - "Geeetech Thunder 0.4 nozzle", - "Geeetech Thunder 0.6 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" + "Geeetech A10 T 0.4 nozzle", + "Geeetech A20 T 0.4 nozzle", + "Geeetech A30 T 0.4 nozzle", + "Geeetech Mizar 0.2 nozzle", + "Geeetech Mizar 0.4 nozzle", + "Geeetech Mizar 0.6 nozzle", + "Geeetech Mizar 0.8 nozzle", + "Geeetech Mizar S 0.2 nozzle", + "Geeetech Mizar S 0.4 nozzle", + "Geeetech Mizar S 0.6 nozzle", + "Geeetech Mizar S 0.8 nozzle", + "Geeetech Mizar Pro 0.2 nozzle", + "Geeetech Mizar Pro 0.4 nozzle", + "Geeetech Mizar Pro 0.6 nozzle", + "Geeetech Mizar Pro 0.8 nozzle", + "Geeetech Mizar Max 0.2 nozzle", + "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 Thunder 0.2 nozzle", + "Geeetech Thunder 0.4 nozzle", + "Geeetech Thunder 0.6 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 index d3355efe9af..3e5bb81c6e8 100644 --- a/resources/profiles/Geeetech/machine/Geeetech M1 0.2 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech M1 0.2 nozzle.json @@ -15,19 +15,19 @@ "0.2" ], "extruder_type": [ - "Direct" - ], + "Direct Drive" + ], "machine_max_acceleration_e": [ - "2000", - "2000" + "3000", + "3000" ], "machine_max_acceleration_extruding": [ - "2000", - "2000" + "3000", + "3000" ], "machine_max_acceleration_retracting": [ - "2000", - "2000" + "3000", + "3000" ], "machine_max_acceleration_travel": [ "3000", @@ -76,7 +76,7 @@ "machine_max_jerk_z": [ "3", "3" - ], + ], "max_layer_height": [ "0.14" ], @@ -91,7 +91,7 @@ ], "deretraction_speed": [ "40" - ], + ], "printable_area": [ "0x0", "105x0", @@ -102,8 +102,8 @@ "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", + "machine_start_gcode": ";Geeetech M1 official wiki URL：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\nM221 S100;Slicer Flow recovery 100%\nM220 S100 ;Set Feedrate recovery 100%\nM204 P3000.00 R3000.00 T3000.00", "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 index a3925678ba8..04d69908c7e 100644 --- a/resources/profiles/Geeetech/machine/Geeetech M1 0.4 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech M1 0.4 nozzle.json @@ -15,19 +15,19 @@ "0.4" ], "extruder_type": [ - "Direct" - ], + "Direct Drive" + ], "machine_max_acceleration_e": [ - "2000", - "2000" + "3000", + "3000" ], "machine_max_acceleration_extruding": [ - "2000", - "2000" + "3000", + "3000" ], "machine_max_acceleration_retracting": [ - "2000", - "2000" + "3000", + "3000" ], "machine_max_acceleration_travel": [ "3000", @@ -76,7 +76,7 @@ "machine_max_jerk_z": [ "3", "3" - ], + ], "max_layer_height": [ "0.14" ], @@ -91,7 +91,7 @@ ], "deretraction_speed": [ "40" - ], + ], "max_layer_height": [ "0.3" ], @@ -108,8 +108,8 @@ "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", + "machine_start_gcode": ";Geeetech M1 official wiki URL：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\nM221 S100;Slicer Flow recovery 100%\nM220 S100 ;Set Feedrate recovery 100%\nM204 P3000.00 R3000.00 T3000.00", "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 index de834f01ae0..b87332df041 100644 --- a/resources/profiles/Geeetech/machine/Geeetech M1 0.6 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech M1 0.6 nozzle.json @@ -15,19 +15,19 @@ "0.6" ], "extruder_type": [ - "Direct" - ], + "Direct Drive" + ], "machine_max_acceleration_e": [ - "2000", - "2000" + "3000", + "3000" ], "machine_max_acceleration_extruding": [ - "2000", - "2000" + "3000", + "3000" ], "machine_max_acceleration_retracting": [ - "2000", - "2000" + "3000", + "3000" ], "machine_max_acceleration_travel": [ "3000", @@ -76,7 +76,7 @@ "machine_max_jerk_z": [ "3", "3" - ], + ], "max_layer_height": [ "0.14" ], @@ -91,7 +91,7 @@ ], "deretraction_speed": [ "40" - ], + ], "max_layer_height": [ "0.42" ], @@ -108,8 +108,8 @@ "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", + "machine_start_gcode": ";Geeetech M1 official wiki URL：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\nM221 S100;Slicer Flow recovery 100%\nM220 S100 ;Set Feedrate recovery 100%\nM204 P3000.00 R3000.00 T3000.00", "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 index 0505e1055d6..8b4b0c9490d 100644 --- a/resources/profiles/Geeetech/machine/Geeetech M1 0.8 nozzle.json +++ b/resources/profiles/Geeetech/machine/Geeetech M1 0.8 nozzle.json @@ -15,19 +15,19 @@ "0.8" ], "extruder_type": [ - "Direct" - ], + "Direct Drive" + ], "machine_max_acceleration_e": [ - "2000", - "2000" + "3000", + "3000" ], "machine_max_acceleration_extruding": [ - "2000", - "2000" + "3000", + "3000" ], "machine_max_acceleration_retracting": [ - "2000", - "2000" + "3000", + "3000" ], "machine_max_acceleration_travel": [ "3000", @@ -76,7 +76,7 @@ "machine_max_jerk_z": [ "3", "3" - ], + ], "max_layer_height": [ "0.14" ], @@ -91,7 +91,7 @@ ], "deretraction_speed": [ "40" - ], + ], "max_layer_height": [ "0.56" ], @@ -108,8 +108,8 @@ "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", + "machine_start_gcode": ";Geeetech M1 official wiki URL：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\nM221 S100;Slicer Flow recovery 100%\nM220 S100 ;Set Feedrate recovery 100%\nM204 P3000.00 R3000.00 T3000.00", "nozzle_type": "brass", "auxiliary_fan": "0" } \ No newline at end of file diff --git a/resources/profiles/Geeetech/machine/fdm_geeetech_common.json b/resources/profiles/Geeetech/machine/fdm_geeetech_common.json index 840813efb54..7f21963b543 100644 --- a/resources/profiles/Geeetech/machine/fdm_geeetech_common.json +++ b/resources/profiles/Geeetech/machine/fdm_geeetech_common.json @@ -80,7 +80,8 @@ "0.08" ], "printable_height": "250", - "extruder_clearance_radius": "47", + "extruder_clearance_max_radius": "47", + "extruder_clearance_dist_to_rod": "24", "extruder_clearance_height_to_rod": "34", "extruder_clearance_height_to_lid": "34", "printer_settings_id": "", @@ -137,5 +138,4 @@ "support_multi_bed_types": "1", "auxiliary_fan": "0", "z_hop_types": "Normal Lift" - } diff --git a/resources/profiles/Geeetech/machine/fdm_machine_common.json b/resources/profiles/Geeetech/machine/fdm_machine_common.json index 85543a55006..fb4fff3f145 100644 --- a/resources/profiles/Geeetech/machine/fdm_machine_common.json +++ b/resources/profiles/Geeetech/machine/fdm_machine_common.json @@ -70,7 +70,8 @@ "0.08" ], "printable_height": "250", - "extruder_clearance_radius": "65", + "extruder_clearance_max_radius": "65", + "extruder_clearance_dist_to_rod": "33", "extruder_clearance_height_to_rod": "36", "extruder_clearance_height_to_lid": "140", "nozzle_diameter": [ 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 index ae615d24408..dec4d5444f2 100644 --- a/resources/profiles/Geeetech/process/0.08mm Extra Fine @Geeetech M1.json +++ b/resources/profiles/Geeetech/process/0.08mm Extra Fine @Geeetech M1.json @@ -5,21 +5,28 @@ "from": "system", "setting_id": "GP_Geeetech_038", "instantiation": "true", - "initial_layer_speed": "30", + "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", + "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", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", "initial_layer_acceleration": "500", - "top_surface_acceleration": "2000", + "top_surface_acceleration": "2000", "travel_acceleration": "3000", + "default_jerk": "10", + "initial_layer_jerk": "10", + "outer_wall_jerk": "10", + "infill_jerk": "10", + "travel_jerk": "10", + "inner_wall_jerk": "10", + "top_surface_jerk": "10", "compatible_printers": [ "Geeetech M1 0.4 nozzle" ] 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 index 594fc8012dc..a4c54327672 100644 --- 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 @@ -5,21 +5,28 @@ "from": "system", "setting_id": "GP_Geeetech_039", "instantiation": "true", - "initial_layer_speed": "30", + "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", + "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", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", "initial_layer_acceleration": "500", - "top_surface_acceleration": "2000", + "top_surface_acceleration": "2000", "travel_acceleration": "3000", + "default_jerk": "10", + "initial_layer_jerk": "10", + "outer_wall_jerk": "10", + "infill_jerk": "10", + "travel_jerk": "10", + "inner_wall_jerk": "10", + "top_surface_jerk": "10", "compatible_printers": [ "Geeetech M1 0.2 nozzle" ] diff --git a/resources/profiles/Geeetech/process/0.10mm Fine @Geeetech M1.json b/resources/profiles/Geeetech/process/0.10mm Fine @Geeetech M1.json index 1efa2662ebd..a2936435f64 100644 --- a/resources/profiles/Geeetech/process/0.10mm Fine @Geeetech M1.json +++ b/resources/profiles/Geeetech/process/0.10mm Fine @Geeetech M1.json @@ -5,21 +5,28 @@ "from": "system", "setting_id": "GP_Geeetech_040", "instantiation": "true", - "initial_layer_speed": "30", + "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", + "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", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", "initial_layer_acceleration": "500", - "top_surface_acceleration": "2000", + "top_surface_acceleration": "2000", "travel_acceleration": "3000", + "default_jerk": "10", + "initial_layer_jerk": "10", + "outer_wall_jerk": "10", + "infill_jerk": "10", + "travel_jerk": "10", + "inner_wall_jerk": "10", + "top_surface_jerk": "10", "compatible_printers": [ "Geeetech M1 0.4 nozzle" ] 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 index c4bad282640..1f4f85d03df 100644 --- 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 @@ -5,21 +5,28 @@ "from": "system", "setting_id": "GP_Geeetech_041", "instantiation": "true", - "initial_layer_speed": "30", + "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", + "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", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", "initial_layer_acceleration": "500", - "top_surface_acceleration": "2000", + "top_surface_acceleration": "2000", "travel_acceleration": "3000", + "default_jerk": "10", + "initial_layer_jerk": "10", + "outer_wall_jerk": "10", + "infill_jerk": "10", + "travel_jerk": "10", + "inner_wall_jerk": "10", + "top_surface_jerk": "10", "compatible_printers": [ "Geeetech M1 0.2 nozzle" ] 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 index 4b937acd8b4..3429a023bf0 100644 --- 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 @@ -5,21 +5,28 @@ "from": "system", "setting_id": "GP_Geeetech_042", "instantiation": "true", - "initial_layer_speed": "30", + "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", + "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", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", "initial_layer_acceleration": "500", - "top_surface_acceleration": "2000", + "top_surface_acceleration": "2000", "travel_acceleration": "3000", + "default_jerk": "10", + "initial_layer_jerk": "10", + "outer_wall_jerk": "10", + "infill_jerk": "10", + "travel_jerk": "10", + "inner_wall_jerk": "10", + "top_surface_jerk": "10", "compatible_printers": [ "Geeetech M1 0.2 nozzle" ] 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 index 780a01e420c..90b467804bd 100644 --- 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 @@ -5,21 +5,28 @@ "from": "system", "setting_id": "GP_Geeetech_043", "instantiation": "true", - "initial_layer_speed": "30", + "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", + "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", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", "initial_layer_acceleration": "500", - "top_surface_acceleration": "2000", + "top_surface_acceleration": "2000", "travel_acceleration": "3000", + "default_jerk": "10", + "initial_layer_jerk": "10", + "outer_wall_jerk": "10", + "infill_jerk": "10", + "travel_jerk": "10", + "inner_wall_jerk": "10", + "top_surface_jerk": "10", "compatible_printers": [ "Geeetech M1 0.2 nozzle" ] diff --git a/resources/profiles/Geeetech/process/0.16mm Optimal @Geeetech M1.json b/resources/profiles/Geeetech/process/0.16mm Optimal @Geeetech M1.json index 492fcd23d97..b8309486028 100644 --- a/resources/profiles/Geeetech/process/0.16mm Optimal @Geeetech M1.json +++ b/resources/profiles/Geeetech/process/0.16mm Optimal @Geeetech M1.json @@ -5,21 +5,28 @@ "from": "system", "setting_id": "GP_Geeetech_044", "instantiation": "true", - "initial_layer_speed": "30", + "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", + "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", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", "initial_layer_acceleration": "500", - "top_surface_acceleration": "2000", + "top_surface_acceleration": "2000", "travel_acceleration": "3000", + "default_jerk": "10", + "initial_layer_jerk": "10", + "outer_wall_jerk": "10", + "infill_jerk": "10", + "travel_jerk": "10", + "inner_wall_jerk": "10", + "top_surface_jerk": "10", "compatible_printers": [ "Geeetech M1 0.4 nozzle" ] diff --git a/resources/profiles/Geeetech/process/0.20mm Standard @Geeetech M1.json b/resources/profiles/Geeetech/process/0.20mm Standard @Geeetech M1.json index b89706c6922..c2527b022aa 100644 --- a/resources/profiles/Geeetech/process/0.20mm Standard @Geeetech M1.json +++ b/resources/profiles/Geeetech/process/0.20mm Standard @Geeetech M1.json @@ -12,22 +12,29 @@ "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", + "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", + "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", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", "initial_layer_acceleration": "500", - "top_surface_acceleration": "2000", + "top_surface_acceleration": "2000", "travel_acceleration": "3000", + "default_jerk": "10", + "initial_layer_jerk": "10", + "outer_wall_jerk": "10", + "infill_jerk": "10", + "travel_jerk": "10", + "inner_wall_jerk": "10", + "top_surface_jerk": "10", "compatible_printers": [ "Geeetech M1 0.4 nozzle" ] 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 index 8d76f758324..59e1e6f9db6 100644 --- 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 @@ -5,21 +5,28 @@ "from": "system", "setting_id": "GP_Geeetech_045", "instantiation": "true", - "initial_layer_speed": "30", + "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", + "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", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", "initial_layer_acceleration": "500", - "top_surface_acceleration": "2000", + "top_surface_acceleration": "2000", "travel_acceleration": "3000", + "default_jerk": "10", + "initial_layer_jerk": "10", + "outer_wall_jerk": "10", + "infill_jerk": "10", + "travel_jerk": "10", + "inner_wall_jerk": "10", + "top_surface_jerk": "10", "compatible_printers": [ "Geeetech M1 0.6 nozzle" ] diff --git a/resources/profiles/Geeetech/process/0.25mm Draft @Geeetech M1.json b/resources/profiles/Geeetech/process/0.25mm Draft @Geeetech M1.json index 46dd14e7ecf..1abfa86a35f 100644 --- a/resources/profiles/Geeetech/process/0.25mm Draft @Geeetech M1.json +++ b/resources/profiles/Geeetech/process/0.25mm Draft @Geeetech M1.json @@ -12,22 +12,29 @@ "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", + "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", + "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", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", "initial_layer_acceleration": "500", - "top_surface_acceleration": "2000", + "top_surface_acceleration": "2000", "travel_acceleration": "3000", + "default_jerk": "10", + "initial_layer_jerk": "10", + "outer_wall_jerk": "10", + "infill_jerk": "10", + "travel_jerk": "10", + "inner_wall_jerk": "10", + "top_surface_jerk": "10", "compatible_printers": [ "Geeetech M1 0.4 nozzle" ] 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 index 4ca4de9516a..4c0b0cf9e59 100644 --- 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 @@ -5,21 +5,28 @@ "from": "system", "setting_id": "GP_Geeetech_048", "instantiation": "true", - "initial_layer_speed": "30", + "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", + "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", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", "initial_layer_acceleration": "500", - "top_surface_acceleration": "2000", + "top_surface_acceleration": "2000", "travel_acceleration": "3000", + "default_jerk": "10", + "initial_layer_jerk": "10", + "outer_wall_jerk": "10", + "infill_jerk": "10", + "travel_jerk": "10", + "inner_wall_jerk": "10", + "top_surface_jerk": "10", "compatible_printers": [ "Geeetech M1 0.6 nozzle" ] 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 index efe67bed36a..2ec0a1f6eba 100644 --- 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 @@ -5,21 +5,28 @@ "from": "system", "setting_id": "GP_Geeetech_049", "instantiation": "true", - "initial_layer_speed": "30", + "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", + "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", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", "initial_layer_acceleration": "500", - "top_surface_acceleration": "2000", + "top_surface_acceleration": "2000", "travel_acceleration": "3000", + "default_jerk": "10", + "initial_layer_jerk": "10", + "outer_wall_jerk": "10", + "infill_jerk": "10", + "travel_jerk": "10", + "inner_wall_jerk": "10", + "top_surface_jerk": "10", "compatible_printers": [ "Geeetech M1 0.6 nozzle" ] 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 index fed334ec70a..d56a499e0dc 100644 --- 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 @@ -5,21 +5,28 @@ "from": "system", "setting_id": "GP_Geeetech_050", "instantiation": "true", - "initial_layer_speed": "30", + "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", + "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", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", "initial_layer_acceleration": "500", - "top_surface_acceleration": "2000", + "top_surface_acceleration": "2000", "travel_acceleration": "3000", + "default_jerk": "10", + "initial_layer_jerk": "10", + "outer_wall_jerk": "10", + "infill_jerk": "10", + "travel_jerk": "10", + "inner_wall_jerk": "10", + "top_surface_jerk": "10", "compatible_printers": [ "Geeetech M1 0.8 nozzle" ] 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 index 9221f9f41f9..90f03d0c2a3 100644 --- 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 @@ -5,21 +5,28 @@ "from": "system", "setting_id": "GP_Geeetech_051", "instantiation": "true", - "initial_layer_speed": "30", + "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", + "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", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "3000", "initial_layer_acceleration": "500", - "top_surface_acceleration": "2000", + "top_surface_acceleration": "2000", "travel_acceleration": "3000", + "default_jerk": "10", + "initial_layer_jerk": "10", + "outer_wall_jerk": "10", + "infill_jerk": "10", + "travel_jerk": "10", + "inner_wall_jerk": "10", + "top_surface_jerk": "10", "compatible_printers": [ "Geeetech M1 0.8 nozzle" ] 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 eac0c76c8e3..a5d79fd99c8 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,7 +5,7 @@ "from": "system", "instantiation": "false", "layer_height": "0.20", - "wall_loops": "2", + "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 36f90fca544..a576c234afb 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,8 +5,8 @@ "from": "system", "instantiation": "false", "layer_height": "0.25", - "wall_loops": "2", - "initial_layer_print_height": "0.3", + "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",