ENH: rename filament in machine default materials

Change-Id: Ib5df8be29e0a4d69f3e1acb3a2f8b04134ec7bde
This commit is contained in:
xun.zhang 2023-06-16 19:47:51 +08:00 committed by Lane.Wei
parent d79ee0bafe
commit 8a34f6b606
83 changed files with 85 additions and 82 deletions

View file

@ -7,7 +7,7 @@
"inherits": "fdm_creality_common",
"printer_model": "Creality CR-10 Max",
"default_filament_profile": [
"Creality Generic PLA"
"Generic PLA @Creality"
],
"default_print_profile": "0.20mm Standard @Creality CR10Max",
"nozzle_diameter": [

View file

@ -8,5 +8,5 @@
"bed_model": "creality_cr10max_buildplate_model.stl",
"bed_texture": "creality_cr10max_buildplate_texture.png",
"hotend_model": "",
"default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS"
"default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality"
}

View file

@ -101,7 +101,7 @@
"change_filament_gcode": "M600",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Creality Generic PLA"
"Generic PLA @Creality"
],
"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[nozzle_temperature_initial_layer] ; set extruder temp\nM140 S[bed_temperature_initial_layer_single] ; set bed temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp\nM109 S[nozzle_temperature_initial_layer] ; wait for extruder temp\nG28 ; home all\nG1 Z2 F240\nG1 X2 Y10 F3000\nG1 Z0.28 F240\nG92 E0\nG1 Y190 E15 F1500 ; intro line\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E15 F1200 ; intro line\nG92 E0",
"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600{endif} ; Move print head up\nG1 X5 Y170 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{endif} ; Move print head further up\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",

View file

@ -8,5 +8,5 @@
"bed_model": "creality_cr10v2_buildplate_model.stl",
"bed_texture": "creality_cr10v2_buildplate_texture.png",
"hotend_model": "",
"default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS"
"default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality"
}

View file

@ -101,7 +101,7 @@
"change_filament_gcode": "M600",
"machine_pause_gcode": "M25",
"default_filament_profile": [
"Creality Generic PLA"
"Generic PLA @Creality"
],
"machine_start_gcode": "G90 ; 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\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\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 < 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",

View file

@ -104,7 +104,7 @@
"change_filament_gcode": "M600",
"machine_pause_gcode": "M25",
"default_filament_profile": [
"Creality Generic PLA"
"Generic PLA @Creality"
],
"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis and restore leveling\nG1 Z50 F240\nG1 X2.0 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 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 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 < 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",

View file

@ -8,5 +8,5 @@
"bed_model": "creality_ender3s1pro_buildplate_model.stl",
"bed_texture": "creality_ender3s1pro_buildplate_texture.png",
"hotend_model": "",
"default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS"
"default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality"
}

View file

@ -8,5 +8,5 @@
"bed_model": "creality_ender3s1_buildplate_model.stl",
"bed_texture": "creality_ender3s1_buildplate_texture.png",
"hotend_model": "",
"default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS"
"default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality"
}

View file

@ -7,7 +7,7 @@
"inherits": "fdm_creality_common",
"printer_model": "Creality Ender-3 V2",
"default_filament_profile": [
"Creality Generic PLA"
"Generic PLA @Creality"
],
"default_print_profile": "0.20mm Standard @Creality Ender3V2",
"nozzle_diameter": [

View file

@ -8,5 +8,5 @@
"bed_model": "creality_ender3v2_buildplate_model.stl",
"bed_texture": "creality_ender3v2_buildplate_texture.png",
"hotend_model": "",
"default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS"
"default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality"
}

View file

@ -101,7 +101,7 @@
"change_filament_gcode": "M600",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Creality Generic PLA"
"Generic PLA @Creality"
],
"machine_start_gcode": "G90 ; 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\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\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 < 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",

View file

@ -104,7 +104,7 @@
"change_filament_gcode": "M600",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Creality Generic PLA"
"Generic PLA @Creality"
],
"machine_start_gcode": "G90 ; 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\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\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{endif} ; Move print bed down\nG1 X50 Y50 F{travel_speed*60} ; move print head out of the way\n{if max_layer_z < printable_height-10}G1 Z{z_offset+ printable_height-10} F600{endif} ; Move print bed close to the bottom\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",

View file

@ -8,5 +8,5 @@
"bed_model": "creality_ender5plus_buildplate_model.stl",
"bed_texture": "creality_ender5plus_buildplate_texture.png",
"hotend_model": "",
"default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS"
"default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality"
}

View file

@ -101,7 +101,7 @@
"change_filament_gcode": "M600",
"machine_pause_gcode": "M25",
"default_filament_profile": [
"Creality Generic PLA"
"Generic PLA @Creality"
],
"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis and restore leveling\nG1 Z50 F240\nG1 X2.0 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 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 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 < 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",

View file

@ -8,5 +8,5 @@
"bed_model": "creality_ender5s1_buildplate_model.stl",
"bed_texture": "creality_ender5s1_buildplate_texture.png",
"hotend_model": "",
"default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS"
"default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality"
}

View file

@ -8,5 +8,5 @@
"bed_model": "creality_ender5_buildplate_model.stl",
"bed_texture": "creality_ender5_buildplate_texture.png",
"hotend_model": "",
"default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS"
"default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality"
}

View file

@ -101,7 +101,7 @@
"change_filament_gcode": "M600",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Creality Generic PLA"
"Generic PLA @Creality"
],
"machine_start_gcode": "G90 ; 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\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\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 < 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",

View file

@ -8,5 +8,5 @@
"bed_model": "creality_ender5s_buildplate_model.stl",
"bed_texture": "creality_ender5s_buildplate_texture.png",
"hotend_model": "",
"default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS"
"default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality"
}

View file

@ -101,7 +101,7 @@
"change_filament_gcode": "M600",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Creality Generic PLA"
"Generic PLA @Creality"
],
"machine_start_gcode": "G90 ; 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\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\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{endif} ; Move print bed down\nG1 X50 Y50 F{travel_speed*60} ; move print head out of the way\n{if max_layer_z < printable_height-10}G1 Z{z_offset+ printable_height-10} F600{endif} ; Move print bed close to the bottom\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",

View file

@ -8,5 +8,5 @@
"bed_model": "creality_ender6_buildplate_model.stl",
"bed_texture": "creality_ender6_buildplate_texture.png",
"hotend_model": "",
"default_materials": "Creality Generic PLA;Creality Generic PETG;Creality Generic ABS"
"default_materials": "Generic PLA @Creality;Generic PETG @Creality;Generic ABS @Creality"
}