diff --git a/resources/profiles/Elegoo.json b/resources/profiles/Elegoo.json index 7c25a64923a..973f700be87 100644 --- a/resources/profiles/Elegoo.json +++ b/resources/profiles/Elegoo.json @@ -1173,28 +1173,28 @@ "sub_path": "filament/fdm_filament_asa.json" }, { - "name": "Elegoo Generic ABS", - "sub_path": "filament/Elegoo Generic ABS.json" + "name": "Generic ABS @Elegoo", + "sub_path": "filament/Generic ABS @Elegoo.json" }, { - "name": "Elegoo Generic PETG", - "sub_path": "filament/Elegoo Generic PETG.json" + "name": "Generic PETG @Elegoo", + "sub_path": "filament/Generic PETG @Elegoo.json" }, { - "name": "Elegoo Generic PLA", - "sub_path": "filament/Elegoo Generic PLA.json" + "name": "Generic PLA @Elegoo", + "sub_path": "filament/Generic PLA @Elegoo.json" }, { - "name": "Elegoo Generic PLA Matte", - "sub_path": "filament/Elegoo Generic PLA Matte.json" + "name": "Generic PLA Matte @Elegoo", + "sub_path": "filament/Generic PLA Matte @Elegoo.json" }, { - "name": "Elegoo Generic ASA", - "sub_path": "filament/Elegoo Generic ASA.json" + "name": "Generic ASA @Elegoo", + "sub_path": "filament/Generic ASA @Elegoo.json" }, { - "name": "Elegoo Generic PETG PRO", - "sub_path": "filament/Elegoo Generic PETG PRO.json" + "name": "Generic PETG PRO @Elegoo", + "sub_path": "filament/Generic PETG PRO @Elegoo.json" }, { "name": "Elegoo ASA @Elegoo Giga", diff --git a/resources/profiles/Elegoo/filament/Elegoo ASA @Elegoo Giga.json b/resources/profiles/Elegoo/filament/Elegoo ASA @Elegoo Giga.json index 165c1770490..97f9e0f7295 100644 --- a/resources/profiles/Elegoo/filament/Elegoo ASA @Elegoo Giga.json +++ b/resources/profiles/Elegoo/filament/Elegoo ASA @Elegoo Giga.json @@ -3,7 +3,7 @@ "filament_id": "GFB98", "setting_id": "GFSA04", "name": "Elegoo ASA @Elegoo Giga", - "inherits": "Elegoo Generic ASA", + "inherits": "Generic ASA @Elegoo", "from": "system", "instantiation": "true", "filament_max_volumetric_speed": [ diff --git a/resources/profiles/Elegoo/filament/Elegoo PETG PRO @Elegoo Giga.json b/resources/profiles/Elegoo/filament/Elegoo PETG PRO @Elegoo Giga.json index 55a85981cdb..69d301317d4 100644 --- a/resources/profiles/Elegoo/filament/Elegoo PETG PRO @Elegoo Giga.json +++ b/resources/profiles/Elegoo/filament/Elegoo PETG PRO @Elegoo Giga.json @@ -3,7 +3,7 @@ "filament_id": "GFG99", "setting_id": "GFSG99", "name": "Elegoo PETG PRO @Elegoo Giga", - "inherits": "Elegoo Generic PETG PRO", + "inherits": "Generic PETG PRO @Elegoo", "from": "system", "instantiation": "true", "filament_max_volumetric_speed": [ diff --git a/resources/profiles/Elegoo/filament/Elegoo PLA @Elegoo Giga.json b/resources/profiles/Elegoo/filament/Elegoo PLA @Elegoo Giga.json index abb545591a2..0f67624d3a9 100644 --- a/resources/profiles/Elegoo/filament/Elegoo PLA @Elegoo Giga.json +++ b/resources/profiles/Elegoo/filament/Elegoo PLA @Elegoo Giga.json @@ -3,7 +3,7 @@ "filament_id": "GFL99", "setting_id": "GFSL99", "name": "Elegoo PLA @Elegoo Giga", - "inherits": "Elegoo Generic PLA", + "inherits": "Generic PLA @Elegoo", "from": "system", "instantiation": "true", "filament_max_volumetric_speed": [ diff --git a/resources/profiles/Elegoo/filament/Elegoo PLA Matte @Elegoo Giga.json b/resources/profiles/Elegoo/filament/Elegoo PLA Matte @Elegoo Giga.json index c5d0f84f417..2cc63eaf6f5 100644 --- a/resources/profiles/Elegoo/filament/Elegoo PLA Matte @Elegoo Giga.json +++ b/resources/profiles/Elegoo/filament/Elegoo PLA Matte @Elegoo Giga.json @@ -3,7 +3,7 @@ "filament_id": "GFL99", "setting_id": "GFSL99", "name": "Elegoo PLA Matte @Elegoo Giga", - "inherits": "Elegoo Generic PLA Matte", + "inherits": "Generic PLA Matte @Elegoo", "from": "system", "instantiation": "true", "fan_cooling_layer_time": [ diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic ABS.json b/resources/profiles/Elegoo/filament/Generic ABS @Elegoo.json similarity index 97% rename from resources/profiles/Elegoo/filament/Elegoo Generic ABS.json rename to resources/profiles/Elegoo/filament/Generic ABS @Elegoo.json index 96cbcdaabb0..f729fd3a913 100644 --- a/resources/profiles/Elegoo/filament/Elegoo Generic ABS.json +++ b/resources/profiles/Elegoo/filament/Generic ABS @Elegoo.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFB99", "setting_id": "GFSA04", - "name": "Elegoo Generic ABS", + "name": "Generic ABS @Elegoo", "from": "system", "instantiation": "true", "inherits": "fdm_filament_abs", diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic ASA.json b/resources/profiles/Elegoo/filament/Generic ASA @Elegoo.json similarity index 94% rename from resources/profiles/Elegoo/filament/Elegoo Generic ASA.json rename to resources/profiles/Elegoo/filament/Generic ASA @Elegoo.json index 8f2fce2250c..7cc797ad3ca 100644 --- a/resources/profiles/Elegoo/filament/Elegoo Generic ASA.json +++ b/resources/profiles/Elegoo/filament/Generic ASA @Elegoo.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFB98", "setting_id": "GFSA04", - "name": "Elegoo Generic ASA", + "name": "Generic ASA @Elegoo", "inherits": "fdm_filament_asa", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic PETG.json b/resources/profiles/Elegoo/filament/Generic PETG @Elegoo.json similarity index 97% rename from resources/profiles/Elegoo/filament/Elegoo Generic PETG.json rename to resources/profiles/Elegoo/filament/Generic PETG @Elegoo.json index 10cf1ae1b63..a69c6db551c 100644 --- a/resources/profiles/Elegoo/filament/Elegoo Generic PETG.json +++ b/resources/profiles/Elegoo/filament/Generic PETG @Elegoo.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFG99", "setting_id": "GFSG99", - "name": "Elegoo Generic PETG", + "name": "Generic PETG @Elegoo", "from": "system", "instantiation": "true", "inherits": "fdm_filament_pet", diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic PETG PRO.json b/resources/profiles/Elegoo/filament/Generic PETG PRO @Elegoo.json similarity index 94% rename from resources/profiles/Elegoo/filament/Elegoo Generic PETG PRO.json rename to resources/profiles/Elegoo/filament/Generic PETG PRO @Elegoo.json index 24cacc05066..4bc344d8ae5 100644 --- a/resources/profiles/Elegoo/filament/Elegoo Generic PETG PRO.json +++ b/resources/profiles/Elegoo/filament/Generic PETG PRO @Elegoo.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFG99", "setting_id": "GFSG99", - "name": "Elegoo Generic PETG PRO", + "name": "Generic PETG PRO @Elegoo", "inherits": "fdm_filament_pet", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic PLA.json b/resources/profiles/Elegoo/filament/Generic PLA @Elegoo.json similarity index 97% rename from resources/profiles/Elegoo/filament/Elegoo Generic PLA.json rename to resources/profiles/Elegoo/filament/Generic PLA @Elegoo.json index 1a2c92df3aa..9ba289bce2e 100644 --- a/resources/profiles/Elegoo/filament/Elegoo Generic PLA.json +++ b/resources/profiles/Elegoo/filament/Generic PLA @Elegoo.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFL99", "setting_id": "GFSL99", - "name": "Elegoo Generic PLA", + "name": "Generic PLA @Elegoo", "from": "system", "instantiation": "true", "inherits": "fdm_filament_pla", diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic PLA Matte.json b/resources/profiles/Elegoo/filament/Generic PLA Matte @Elegoo.json similarity index 93% rename from resources/profiles/Elegoo/filament/Elegoo Generic PLA Matte.json rename to resources/profiles/Elegoo/filament/Generic PLA Matte @Elegoo.json index 688a0304d96..a52461c2b1b 100644 --- a/resources/profiles/Elegoo/filament/Elegoo Generic PLA Matte.json +++ b/resources/profiles/Elegoo/filament/Generic PLA Matte @Elegoo.json @@ -2,7 +2,7 @@ "type": "filament", "filament_id": "GFL99", "setting_id": "GFSL99", - "name": "Elegoo Generic PLA Matte", + "name": "Generic PLA Matte @Elegoo", "inherits": "fdm_filament_pla", "from": "system", "instantiation": "true", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 0.4 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 0.4 nozzle.json index 6a143def8d2..23f56f10cfd 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 0.4 nozzle.json @@ -104,7 +104,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\n;G29 ; run abl mesh\nM420 S1 ; load mesh\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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 < printable_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", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 2 0.4 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 2 0.4 nozzle.json index 12232ca4c6d..ae774a2ab37 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 2 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 2 0.4 nozzle.json @@ -104,7 +104,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\n;G29 ; run abl mesh\nM420 S1 ; load mesh\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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 < printable_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", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 2.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 2.json index 643e719f3c5..c70bc1540a5 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 2.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 2.json @@ -8,5 +8,5 @@ "bed_model": "elegoo_neptune2_buildplate_model.stl", "bed_texture": "elegoo_neptune2_buildplate_texture.png", "hotend_model": "", - "default_materials": "Elegoo Generic ABS;Elegoo Generic PETG;Elegoo Generic PLA" + "default_materials": "Generic ABS @Elegoo;Generic PETG @Elegoo;Generic PLA @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 2D 0.4 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 2D 0.4 nozzle.json index bba756bc35e..7a4066fc7df 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 2D 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 2D 0.4 nozzle.json @@ -121,7 +121,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": "T[initial_tool] ; set active extruder\nM413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\n;G29 ; auto bed levelling - remove ; at beginning of line to enable\n;M420 S1 ; enable mesh - remove ; at beginning of line to enable\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240 ; move down to prime nozzle\nG92 E0 ; reset extruder\nG1 E90 ; load filament\nG92 E0 ; reset extruder\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000 ; move over for second prime line\nG92 E0 ; reset extruder\nG1 Y10 E10 F1200 ; prime the nozzle\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\nG1 E-80 F2000 ; unload filament\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 < printable_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", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 2D.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 2D.json index 2527c7d33ac..e59fcfd4d26 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 2D.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 2D.json @@ -8,5 +8,5 @@ "bed_model": "elegoo_neptune2d_buildplate_model.stl", "bed_texture": "elegoo_neptune2d_buildplate_texture.png", "hotend_model": "", - "default_materials": "Elegoo Generic ABS;Elegoo Generic PETG;Elegoo Generic PLA" + "default_materials": "Generic ABS @Elegoo;Generic PETG @Elegoo;Generic PLA @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 2S 0.4 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 2S 0.4 nozzle.json index 8a8a25be54e..1c8f05ee221 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 2S 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 2S 0.4 nozzle.json @@ -104,7 +104,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\n;G29 ; run abl mesh\nM420 S1 ; load mesh\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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 < printable_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", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 2S.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 2S.json index dd733b4abd8..2b1867390dd 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 2S.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 2S.json @@ -8,5 +8,5 @@ "bed_model": "elegoo_neptune2s_buildplate_model.stl", "bed_texture": "elegoo_neptune2s_buildplate_texture.png", "hotend_model": "", - "default_materials": "Elegoo Generic ABS;Elegoo Generic PETG;Elegoo Generic PLA" + "default_materials": "Generic ABS @Elegoo;Generic PETG @Elegoo;Generic PLA @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 0.4 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 0.4 nozzle.json index 71d7c10c97a..e7c1472f893 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 0.4 nozzle.json @@ -101,7 +101,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\n;G29 ; run abl mesh\nM420 S1 ; load mesh\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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 < printable_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", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max 0.4 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max 0.4 nozzle.json index 16968b30c96..8ceeb0e77d1 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max 0.4 nozzle.json @@ -104,7 +104,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\n;G29 ; run abl mesh\nM420 S1 ; load mesh\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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 < printable_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", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max.json index 1a4e152f310..ecd5cca88e4 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max.json @@ -8,5 +8,5 @@ "bed_model": "elegoo_neptune3max_buildplate_model.stl", "bed_texture": "elegoo_neptune_max_buildplate_texture.png", "hotend_model": "", - "default_materials": "Elegoo Generic ABS;Elegoo Generic PETG;Elegoo Generic PLA" + "default_materials": "Generic ABS @Elegoo;Generic PETG @Elegoo;Generic PLA @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Plus 0.4 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Plus 0.4 nozzle.json index 68294176f04..1971b93c483 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Plus 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Plus 0.4 nozzle.json @@ -104,7 +104,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\n;G29 ; run abl mesh\nM420 S1 ; load mesh\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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 < printable_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", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Plus.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Plus.json index 54ef2d76634..1825d277a90 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Plus.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Plus.json @@ -8,5 +8,5 @@ "bed_model": "elegoo_neptune3plus_buildplate_model.stl", "bed_texture": "elegoo_neptune3plus_buildplate_texture.png", "hotend_model": "", - "default_materials": "Elegoo Generic ABS;Elegoo Generic PETG;Elegoo Generic PLA" + "default_materials": "Generic ABS @Elegoo;Generic PETG @Elegoo;Generic PLA @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Pro 0.4 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Pro 0.4 nozzle.json index d9dd624190f..81c3b1c2d6d 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Pro 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Pro 0.4 nozzle.json @@ -104,7 +104,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\n;G29 ; run abl mesh\nM420 S1 ; load mesh\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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 < printable_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", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Pro.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Pro.json index 8b6613f704a..5fa334996a8 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Pro.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 3 Pro.json @@ -8,5 +8,5 @@ "bed_model": "elegoo_neptune3pro_buildplate_model.stl", "bed_texture": "elegoo_neptune3pro_buildplate_texture.png", "hotend_model": "", - "default_materials": "Elegoo Generic ABS;Elegoo Generic PETG;Elegoo Generic PLA" + "default_materials": "Generic ABS @Elegoo;Generic PETG @Elegoo;Generic PLA @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 3.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 3.json index 1257d6f8aeb..8e297afbac9 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 3.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 3.json @@ -8,5 +8,5 @@ "bed_model": "elegoo_neptune3_buildplate_model.stl", "bed_texture": "elegoo_neptune3_buildplate_texture.png", "hotend_model": "", - "default_materials": "Elegoo Generic ABS;Elegoo Generic PETG;Elegoo Generic PLA" + "default_materials": "Generic ABS @Elegoo;Generic PETG @Elegoo;Generic PLA @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.2 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.2 nozzle).json index 912d1e2c3be..1dcb4e130b0 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.2 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.2 nozzle).json @@ -51,7 +51,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder\n", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.4 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.4 nozzle).json index b12cf693170..f1519673007 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.4 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.4 nozzle).json @@ -51,7 +51,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder\n", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.6 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.6 nozzle).json index 51206a91f53..e66cf622616 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.6 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.6 nozzle).json @@ -51,7 +51,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder\n", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.8 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.8 nozzle).json index 3b1cce7f5ae..e399d9ad07e 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.8 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.8 nozzle).json @@ -51,7 +51,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder\n", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.2 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.2 nozzle).json index c2a4055d98b..46aad46b93d 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.2 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.2 nozzle).json @@ -78,7 +78,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 MAX\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X165 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X165 Y0.5 Z0.4 F300 ;Move to start position\nG1 X265 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X260 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y400 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.4 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.4 nozzle).json index 68d3921aada..727909537f9 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.4 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.4 nozzle).json @@ -78,7 +78,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 MAX\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X165 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X165 Y0.5 Z0.4 F300 ;Move to start position\nG1 X265 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X260 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y400 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.6 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.6 nozzle).json index 113a4058ad9..5367b7cd74d 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.6 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.6 nozzle).json @@ -78,7 +78,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 MAX\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X165 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X165 Y0.5 Z0.4 F300 ;Move to start position\nG1 X265 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X260 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y400 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.8 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.8 nozzle).json index a98e56f4c12..8c40bbec147 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.8 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max (0.8 nozzle).json @@ -78,7 +78,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 MAX\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X165 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X165 Y0.5 Z0.4 F300 ;Move to start position\nG1 X265 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X260 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y400 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max.json index 4b8be6430b4..4b77c83b127 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Max.json @@ -9,5 +9,5 @@ "bed_texture": "elegoo_neptune_max_buildplate_texture.png", "bed_exclude_area": ["0x0"], "hotend_model": "", - "default_materials": "Elegoo Generic PLA;Elegoo Generic PETG;Elegoo Generic ABS" + "default_materials": "Generic PLA @Elegoo;Generic PETG @Elegoo;Generic ABS @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.2 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.2 nozzle).json index 59a277b126d..a3805e8e4ca 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.2 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.2 nozzle).json @@ -84,7 +84,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 PLUS\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X115 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X115 Y0.5 Z0.4 F300 ;Move to start position\nG1 X215.0 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X210 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y300 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.4 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.4 nozzle).json index 80886659202..d26fdd1c054 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.4 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.4 nozzle).json @@ -84,7 +84,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 PLUS\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X115 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X115 Y0.5 Z0.4 F300 ;Move to start position\nG1 X215.0 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X210 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y300 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.6 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.6 nozzle).json index aff5bc52a51..015a9ac67da 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.6 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.6 nozzle).json @@ -84,7 +84,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 PLUS\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X115 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X115 Y0.5 Z0.4 F300 ;Move to start position\nG1 X215.0 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X210 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y300 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.8 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.8 nozzle).json index b29c959c031..41826c6a8c7 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.8 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus (0.8 nozzle).json @@ -84,7 +84,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 PLUS\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X115 Y0.5 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X115 Y0.5 Z0.4 F300 ;Move to start position\nG1 X215.0 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X210 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT_END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y300 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus.json index 68ef6ef2b7b..d3ba37d426c 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Plus.json @@ -9,6 +9,6 @@ "bed_texture": "elegoo_neptune4plus_buildplate_texture.png", "bed_exclude_area": ["0x0"], "hotend_model": "", - "default_materials": "Elegoo Generic PLA;Elegoo Generic PETG;Elegoo Generic ABS" + "default_materials": "Generic PLA @Elegoo;Generic PETG @Elegoo;Generic ABS @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json index 320f43565e8..c705edfbc2c 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json @@ -50,7 +50,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 PRO\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json index 86d9c7eff7f..11c6790b9a4 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json @@ -50,7 +50,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 PRO\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json index b5271d46843..6f7e5b3e615 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json @@ -50,7 +50,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 PRO\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json index a6797b1b35e..5c54dd073bc 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json @@ -110,7 +110,7 @@ "change_filament_gcode": "M600", "machine_pause_gcode": "PAUSE", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": ";ELEGOO NEPTUNE 4 PRO\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM190 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nG1 Z10 F300\nG1 X67.5 Y0 F6000\nG1 Z0 F300\nM109 S[nozzle_temperature_initial_layer]\nG92 E0 ;Reset Extruder\nG1 X67.5 Y0 Z0.4 F300 ;Move to start position\nG1 X167.5 E30 F400 ;Draw the first line\nG1 Z0.6 F120.0 ;Move to side a little\nG1 X162.5 F3000\nG92 E0 ;Reset Extruder", "machine_end_gcode": ";PRINT END\nG91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X10 Y220 F6000;Finish print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro.json index 6fb800ca791..d7e05772385 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro.json @@ -8,6 +8,6 @@ "bed_model": "elegoo_neptune4pro_buildplate_model.stl", "bed_texture": "elegoo_neptune4pro_buildplate_texture.png", "hotend_model": "", - "default_materials": "Elegoo Generic PLA;Elegoo Generic PETG;Elegoo Generic ABS" + "default_materials": "Generic PLA @Elegoo;Generic PETG @Elegoo;Generic ABS @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune 4.json b/resources/profiles/Elegoo/machine/Elegoo Neptune 4.json index e9f34396472..a50ddb5778c 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune 4.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune 4.json @@ -8,6 +8,6 @@ "bed_model": "elegoo_neptune4_buildplate_model.stl", "bed_texture": "elegoo_neptune4_buildplate_texture.png", "hotend_model": "", - "default_materials": "Elegoo Generic PLA;Elegoo Generic PETG;Elegoo Generic ABS" + "default_materials": "Generic PLA @Elegoo;Generic PETG @Elegoo;Generic ABS @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune X 0.4 nozzle.json b/resources/profiles/Elegoo/machine/Elegoo Neptune X 0.4 nozzle.json index 8f108f68651..98de8995c6a 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune X 0.4 nozzle.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune X 0.4 nozzle.json @@ -104,7 +104,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M0", "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "machine_start_gcode": "M413 S0 ; disable Power Loss Recovery\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S120 ; set temporary nozzle temp to prevent oozing during homing and auto bed leveling\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\n;G29 ; run abl mesh\nM420 S1 ; load mesh\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "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 < printable_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", diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune X.json b/resources/profiles/Elegoo/machine/Elegoo Neptune X.json index 1157ca832af..bda955f7500 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune X.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune X.json @@ -8,5 +8,5 @@ "bed_model": "elegoo_neptunex_buildplate_model.stl", "bed_texture": "elegoo_neptunex_buildplate_texture.png", "hotend_model": "", - "default_materials": "Elegoo Generic ABS;Elegoo Generic PETG;Elegoo Generic PLA" + "default_materials": "Generic ABS @Elegoo;Generic PETG @Elegoo;Generic PLA @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/Elegoo Neptune.json b/resources/profiles/Elegoo/machine/Elegoo Neptune.json index 48c02f1371b..b27545a5586 100644 --- a/resources/profiles/Elegoo/machine/Elegoo Neptune.json +++ b/resources/profiles/Elegoo/machine/Elegoo Neptune.json @@ -8,5 +8,5 @@ "bed_model": "elegoo_neptune_buildplate_model.stl", "bed_texture": "elegoo_neptune_buildplate_texture.png", "hotend_model": "", - "default_materials": "Elegoo Generic ABS;Elegoo Generic PETG;Elegoo Generic PLA" + "default_materials": "Generic ABS @Elegoo;Generic PETG @Elegoo;Generic PLA @Elegoo" } diff --git a/resources/profiles/Elegoo/machine/fdm_elegoo_3dp_001_common.json b/resources/profiles/Elegoo/machine/fdm_elegoo_3dp_001_common.json index f8627a674a0..4d0de191d76 100644 --- a/resources/profiles/Elegoo/machine/fdm_elegoo_3dp_001_common.json +++ b/resources/profiles/Elegoo/machine/fdm_elegoo_3dp_001_common.json @@ -19,7 +19,7 @@ "0x0" ], "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "extruder_colour": [ "#018001" diff --git a/resources/profiles/Elegoo/machine/fdm_elegoo_common.json b/resources/profiles/Elegoo/machine/fdm_elegoo_common.json index a392c821dad..e5efcb2ab13 100644 --- a/resources/profiles/Elegoo/machine/fdm_elegoo_common.json +++ b/resources/profiles/Elegoo/machine/fdm_elegoo_common.json @@ -124,7 +124,7 @@ "1" ], "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "default_print_profile": "", "bed_exclude_area": [ diff --git a/resources/profiles/Elegoo/machine/fdm_neptune_4_common.json b/resources/profiles/Elegoo/machine/fdm_neptune_4_common.json index 337d90dd492..a0e66086575 100644 --- a/resources/profiles/Elegoo/machine/fdm_neptune_4_common.json +++ b/resources/profiles/Elegoo/machine/fdm_neptune_4_common.json @@ -124,7 +124,7 @@ "1" ], "default_filament_profile": [ - "Elegoo Generic PLA" + "Generic PLA @Elegoo" ], "default_print_profile": "", "bed_exclude_area": [