Skip to content

Commit

Permalink
Various profile improvments (#4775)
Browse files Browse the repository at this point in the history
* Add Prusa MINI profiles & fix image extension

* Add MINI & MK3S to generic filaments

* Change 0.2 to 0.25

* Change this one

* Fix this

* Fix nozzle diameters

* Forgot this...
  • Loading branch information
cochcoder committed Mar 30, 2024
1 parent 88f94c8 commit a187356
Show file tree
Hide file tree
Showing 21 changed files with 437 additions and 7 deletions.
26 changes: 25 additions & 1 deletion resources/profiles/Prusa.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,22 @@
"name": "process_common_mk3",
"sub_path": "process/process_common_mk3.json"
},
{
"name": "0.20mm Standard @MINI 0.25",
"sub_path": "process/0.20mm Standard @MINI 0.25.json"
},
{
"name": "0.20mm Standard @MINI",
"sub_path": "process/0.20mm Standard @MINI.json"
},
},
{
"name": "0.20mm Standard @MINI 0.6",
"sub_path": "process/0.20mm Standard @MINI 0.6.json"
},
{
"name": "0.20mm Standard @MINI 0.8",
"sub_path": "process/0.20mm Standard @MINI 0.8.json"
},
{
"name": "0.05mm UltraDetail @MK3S 0.25",
"sub_path": "process/0.05mm UltraDetail @MK3S 0.25.json"
Expand Down Expand Up @@ -293,9 +305,21 @@
"name": "Prusa MK4 0.8 nozzle",
"sub_path": "machine/Prusa MK4 0.8 nozzle.json"
},
{
"name": "Prusa MINI 0.25 nozzle",
"sub_path": "machine/Prusa MINI 0.25 nozzle.json"
},
{
"name": "Prusa MINI 0.4 nozzle",
"sub_path": "machine/Prusa MINI 0.4 nozzle.json"
},
{
"name": "Prusa MINI 0.6 nozzle",
"sub_path": "machine/Prusa MINI 0.6 nozzle.json"
},
{
"name": "Prusa MINI 0.8 nozzle",
"sub_path": "machine/Prusa MINI 0.8 nozzle.json"
}
]
}
8 changes: 7 additions & 1 deletion resources/profiles/Prusa/filament/Prusa Generic ABS.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@
"; Filament gcode\nM900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.02{else}0.04{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K12{elsif nozzle_diameter[0]==0.8};{else}M900 K20{endif} ; Filament gcode LA 1.0"
],
"compatible_printers": [
"Prusa MK3S 0.25 nozzle",
"Prusa MK3S 0.4 nozzle",
"Prusa MINI 0.4 nozzle"
"Prusa MK3S 0.6 nozzle",
"Prusa MK3S 0.8 nozzle",
"Prusa MINI 0.25 nozzle",
"Prusa MINI 0.4 nozzle",
"Prusa MINI 0.6 nozzle",
"Prusa MINI 0.8 nozzle"
]
}
8 changes: 7 additions & 1 deletion resources/profiles/Prusa/filament/Prusa Generic ASA.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@
"; Filament gcode\nM900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.02{else}0.04{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K12{elsif nozzle_diameter[0]==0.8};{else}M900 K20{endif} ; Filament gcode LA 1.0"
],
"compatible_printers": [
"Prusa MK3S 0.25 nozzle",
"Prusa MK3S 0.4 nozzle",
"Prusa MINI 0.4 nozzle"
"Prusa MK3S 0.6 nozzle",
"Prusa MK3S 0.8 nozzle",
"Prusa MINI 0.25 nozzle",
"Prusa MINI 0.4 nozzle",
"Prusa MINI 0.6 nozzle",
"Prusa MINI 0.8 nozzle"
]
}
6 changes: 6 additions & 0 deletions resources/profiles/Prusa/filament/Prusa Generic PA-CF.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,14 @@
"8"
],
"compatible_printers": [
"Prusa MK3S 0.25 nozzle",
"Prusa MK3S 0.4 nozzle",
"Prusa MK3S 0.6 nozzle",
"Prusa MK3S 0.8 nozzle",
"Prusa MINI 0.25 nozzle",
"Prusa MINI 0.4 nozzle",
"Prusa MINI 0.6 nozzle",
"Prusa MINI 0.8 nozzle",
"Prusa MK4 0.25 nozzle",
"Prusa MK4 0.4 nozzle",
"Prusa MK4 0.6 nozzle",
Expand Down
6 changes: 6 additions & 0 deletions resources/profiles/Prusa/filament/Prusa Generic PA.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,14 @@
"12"
],
"compatible_printers": [
"Prusa MK3S 0.25 nozzle",
"Prusa MK3S 0.4 nozzle",
"Prusa MK3S 0.6 nozzle",
"Prusa MK3S 0.8 nozzle",
"Prusa MINI 0.25 nozzle",
"Prusa MINI 0.4 nozzle",
"Prusa MINI 0.6 nozzle",
"Prusa MINI 0.8 nozzle",
"Prusa MK4 0.25 nozzle",
"Prusa MK4 0.4 nozzle",
"Prusa MK4 0.6 nozzle",
Expand Down
6 changes: 6 additions & 0 deletions resources/profiles/Prusa/filament/Prusa Generic PC.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@
"0.94"
],
"compatible_printers": [
"Prusa MK3S 0.25 nozzle",
"Prusa MK3S 0.4 nozzle",
"Prusa MK3S 0.6 nozzle",
"Prusa MK3S 0.8 nozzle",
"Prusa MINI 0.25 nozzle",
"Prusa MINI 0.4 nozzle",
"Prusa MINI 0.6 nozzle",
"Prusa MINI 0.8 nozzle",
"Prusa MK4 0.25 nozzle",
"Prusa MK4 0.4 nozzle",
"Prusa MK4 0.6 nozzle",
Expand Down
8 changes: 7 additions & 1 deletion resources/profiles/Prusa/filament/Prusa Generic PETG.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,13 @@
"; filament start gcode\nM900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.02{elsif nozzle_diameter[0]==0.6}0.04{else}0.08{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K24{elsif nozzle_diameter[0]==0.8};{else}M900 K45{endif} ; Filament gcode LA 1.0"
],
"compatible_printers": [
"Prusa MK3S 0.25 nozzle",
"Prusa MK3S 0.4 nozzle",
"Prusa MINI 0.4 nozzle"
"Prusa MK3S 0.6 nozzle",
"Prusa MK3S 0.8 nozzle",
"Prusa MINI 0.25 nozzle",
"Prusa MINI 0.4 nozzle",
"Prusa MINI 0.6 nozzle",
"Prusa MINI 0.8 nozzle"
]
}
6 changes: 6 additions & 0 deletions resources/profiles/Prusa/filament/Prusa Generic PLA-CF.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,14 @@
"7"
],
"compatible_printers": [
"Prusa MK3S 0.25 nozzle",
"Prusa MK3S 0.4 nozzle",
"Prusa MK3S 0.6 nozzle",
"Prusa MK3S 0.8 nozzle",
"Prusa MINI 0.25 nozzle",
"Prusa MINI 0.4 nozzle",
"Prusa MINI 0.6 nozzle",
"Prusa MINI 0.8 nozzle",
"Prusa MK4 0.25 nozzle",
"Prusa MK4 0.4 nozzle",
"Prusa MK4 0.6 nozzle",
Expand Down
8 changes: 7 additions & 1 deletion resources/profiles/Prusa/filament/Prusa Generic PLA.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,13 @@
"; filament start gcode\nM900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.6}0.04{else}0.05{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K18{elsif nozzle_diameter[0]==0.8};{else}M900 K30{endif} ; Filament gcode LA 1.0"
],
"compatible_printers": [
"Prusa MK3S 0.25 nozzle",
"Prusa MK3S 0.4 nozzle",
"Prusa MINI 0.4 nozzle"
"Prusa MK3S 0.6 nozzle",
"Prusa MK3S 0.8 nozzle",
"Prusa MINI 0.25 nozzle",
"Prusa MINI 0.4 nozzle",
"Prusa MINI 0.6 nozzle",
"Prusa MINI 0.8 nozzle"
]
}
6 changes: 6 additions & 0 deletions resources/profiles/Prusa/filament/Prusa Generic PVA.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,14 @@
"10"
],
"compatible_printers": [
"Prusa MK3S 0.25 nozzle",
"Prusa MK3S 0.4 nozzle",
"Prusa MK3S 0.6 nozzle",
"Prusa MK3S 0.8 nozzle",
"Prusa MINI 0.25 nozzle",
"Prusa MINI 0.4 nozzle",
"Prusa MINI 0.6 nozzle",
"Prusa MINI 0.8 nozzle",
"Prusa MK4 0.25 nozzle",
"Prusa MK4 0.4 nozzle",
"Prusa MK4 0.6 nozzle",
Expand Down
8 changes: 7 additions & 1 deletion resources/profiles/Prusa/filament/Prusa Generic TPU.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@
"3.2"
],
"compatible_printers": [
"Prusa MK3S 0.25 nozzle",
"Prusa MK3S 0.4 nozzle",
"Prusa MINI 0.4 nozzle"
"Prusa MK3S 0.6 nozzle",
"Prusa MK3S 0.8 nozzle",
"Prusa MINI 0.25 nozzle",
"Prusa MINI 0.4 nozzle",
"Prusa MINI 0.6 nozzle",
"Prusa MINI 0.8 nozzle"
]
}
89 changes: 89 additions & 0 deletions resources/profiles/Prusa/machine/Prusa MINI 0.25 nozzle.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
{
"type": "machine",
"setting_id": "GM003",
"name": "Prusa MINI 0.25 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_machine_common",
"gcode_flavor": "marlin2",
"printer_model": "MINI",
"printer_variant": "0.25",
"default_filament_profile": [
"Prusa Generic PLA"
],
"default_print_profile": "0.20mm Standard @MINI 0.25",
"nozzle_diameter": [
"0.25"
],
"bed_exclude_area": [
"0x0"
],
"printable_area": [
"0x0",
"180x0",
"180x180",
"0x180"
],
"machine_max_acceleration_extruding": [
"1250",
"2000"
],
"machine_max_acceleration_x": [
"2500",
"2000"
],
"machine_max_acceleration_y": [
"2500",
"2000"
],
"machine_max_acceleration_z": [
"400",
"200"
],
"machine_max_jerk_e": [
"10",
"2.5"
],
"machine_max_jerk_x": [
"8",
"9"
],
"machine_max_jerk_y": [
"8",
"9"
],
"machine_max_speed_e": [
"80",
"25"
],
"machine_max_speed_x": [
"180",
"200"
],
"machine_max_speed_y": [
"180",
"200"
],
"retraction_length": [
"3.2"
],
"retraction_minimum_travel": [
"1.5"
],
"retraction_speed": [
"70"
],
"printable_height": "180",
"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
"machine_end_gcode": "G1 E-1 F2100 ; retract\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720 ; Move print head up{endif}\nG1 X178 Y178 F4200 ; park print head\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+30, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM221 S100 ; reset flow\nM900 K0 ; reset LA\nM84 ; disable motors\n; max_layer_z = [max_layer_z]",
"machine_pause_gcode": "M601",
"machine_start_gcode": "M862.3 P \"[printer_model]\" ; printer model check\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X170 F1000\nG1 Z0.2 F720\nG1 X110 E8 F900\nG1 X40 E10 F700\nG92 E0\n\nM221 S95 ; set flow",
"printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_MINI\n",

"scan_first_layer": "0",
"machine_load_filament_time": "17",
"machine_unload_filament_time": "16",
"nozzle_type": "hardened_steel",
"auxiliary_fan": "0"
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"inherits": "fdm_machine_common",
"gcode_flavor": "marlin2",
"printer_model": "MINI",
"printer_variant": "0.4",
"default_filament_profile": [
"Prusa Generic PLA"
],
Expand Down
89 changes: 89 additions & 0 deletions resources/profiles/Prusa/machine/Prusa MINI 0.6 nozzle.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
{
"type": "machine",
"setting_id": "GM003",
"name": "Prusa MINI 0.6 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_machine_common",
"gcode_flavor": "marlin2",
"printer_model": "MINI",
"printer_variant": "0.6",
"default_filament_profile": [
"Prusa Generic PLA"
],
"default_print_profile": "0.20mm Standard @MINI 0.6",
"nozzle_diameter": [
"0.6"
],
"bed_exclude_area": [
"0x0"
],
"printable_area": [
"0x0",
"180x0",
"180x180",
"0x180"
],
"machine_max_acceleration_extruding": [
"1250",
"2000"
],
"machine_max_acceleration_x": [
"2500",
"2000"
],
"machine_max_acceleration_y": [
"2500",
"2000"
],
"machine_max_acceleration_z": [
"400",
"200"
],
"machine_max_jerk_e": [
"10",
"2.5"
],
"machine_max_jerk_x": [
"8",
"9"
],
"machine_max_jerk_y": [
"8",
"9"
],
"machine_max_speed_e": [
"80",
"25"
],
"machine_max_speed_x": [
"180",
"200"
],
"machine_max_speed_y": [
"180",
"200"
],
"retraction_length": [
"3.2"
],
"retraction_minimum_travel": [
"1.5"
],
"retraction_speed": [
"70"
],
"printable_height": "180",
"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
"machine_end_gcode": "G1 E-1 F2100 ; retract\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720 ; Move print head up{endif}\nG1 X178 Y178 F4200 ; park print head\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+30, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM221 S100 ; reset flow\nM900 K0 ; reset LA\nM84 ; disable motors\n; max_layer_z = [max_layer_z]",
"machine_pause_gcode": "M601",
"machine_start_gcode": "M862.3 P \"[printer_model]\" ; printer model check\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X170 F1000\nG1 Z0.2 F720\nG1 X110 E8 F900\nG1 X40 E10 F700\nG92 E0\n\nM221 S95 ; set flow",
"printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_MINI\n",

"scan_first_layer": "0",
"machine_load_filament_time": "17",
"machine_unload_filament_time": "16",
"nozzle_type": "hardened_steel",
"auxiliary_fan": "0"
}

0 comments on commit a187356

Please sign in to comment.