Skip to content

Commit

Permalink
Merge branch 'main' into initial_layer_travel_accel_jerk
Browse files Browse the repository at this point in the history
  • Loading branch information
@shyblower
shyblower authored Oct 14, 2024
2 parents 7b80793 + fb032cd commit ed8c16d
Show file tree
Hide file tree
Showing 202 changed files with 12,295 additions and 16,366 deletions.
172 changes: 172 additions & 0 deletions resources/profiles/Creality.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
"name": "Creality CR-6 Max",
"sub_path": "machine/Creality CR-6 Max.json"
},
{
"name": "Creality CR-M4",
"sub_path": "machine/Creality CR-M4.json"
},
{
"name": "Creality Ender-3 V2",
"sub_path": "machine/Creality Ender-3 V2.json"
Expand Down Expand Up @@ -107,6 +111,14 @@
{
"name": "Creality K1 Max",
"sub_path": "machine/Creality K1 Max.json"
},
{
"name": "Creality K1 SE",
"sub_path": "machine/Creality K1 SE.json"
},
{
"name": "Creality K2 Plus",
"sub_path": "machine/Creality K2 Plus.json"
}
],
"process_list": [
Expand Down Expand Up @@ -246,6 +258,14 @@
"name": "0.08mm SuperDetail @Creality Ender5Pro (2019) 0.3",
"sub_path": "process/0.08mm SuperDetail @Creality Ender5Pro (2019) 0.3.json"
},
{
"name": "0.08mm SuperDetail @Creality K2 Plus 0.2 nozzle",
"sub_path": "process/0.08mm SuperDetail @Creality K2 Plus 0.2 nozzle.json"
},
{
"name": "0.08mm SuperDetail @Creality K2 Plus 0.4 nozzle",
"sub_path": "process/0.08mm SuperDetail @Creality K2 Plus 0.4 nozzle.json"
},
{
"name": "0.10mm HighDetail @Creality CR-6 0.4.json",
"sub_path": "process/0.10mm HighDetail @Creality CR-6 0.4.json"
Expand All @@ -262,6 +282,14 @@
"name": "0.10mm HighDetail @Creality Ender5Pro (2019) 0.3",
"sub_path": "process/0.10mm HighDetail @Creality Ender5Pro (2019) 0.3.json"
},
{
"name": "0.10mm HighDetail @Creality CR-M4",
"sub_path": "process/0.10mm HighDetail @Creality CR-M4.json"
},
{
"name": "0.10mm HighDetail @Creality K2 Plus 0.2 nozzle",
"sub_path": "process/0.10mm HighDetail @Creality K2 Plus 0.2 nozzle.json"
},
{
"name": "0.12mm Detail @Creality Ender3 0.2",
"sub_path": "process/0.12mm Fine @Creality Ender3 0.2.json"
Expand Down Expand Up @@ -374,6 +402,26 @@
"name": "0.12mm Detail @Creality Ender5Pro (2019) 0.5",
"sub_path": "process/0.12mm Detail @Creality Ender5Pro (2019) 0.5.json"
},
{
"name": "0.15mm Detail @Creality CR-M4",
"sub_path": "process/0.15mm Detail @Creality CR-M4.json"
},
{
"name": "0.12mm Detail @Creality K2 Plus 0.2 nozzle",
"sub_path": "process/0.12mm Detail @Creality K2 Plus 0.2 nozzle.json"
},
{
"name": "0.12mm Detail @Creality K2 Plus 0.4 nozzle",
"sub_path": "process/0.12mm Detail @Creality K2 Plus 0.4 nozzle.json"
},
{
"name": "0.18mm Detail @Creality K2 Plus 0.6 nozzle",
"sub_path": "process/0.18mm Detail @Creality K2 Plus 0.6 nozzle.json"
},
{
"name": "0.24mm Detail @Creality K2 Plus 0.8 nozzle",
"sub_path": "process/0.24mm Detail @Creality K2 Plus 0.8 nozzle.json"
},
{
"name": "0.16mm Optimal @Creality CR10V2",
"sub_path": "process/0.16mm Optimal @Creality CR10V2.json"
Expand Down Expand Up @@ -530,6 +578,22 @@
"name": "0.16mm Optimal @Creality K1Max (0.4 nozzle)",
"sub_path": "process/0.16mm Optimal @Creality K1Max (0.4 nozzle).json"
},
{
"name": "0.14mm Optimal @Creality K2 Plus 0.2 nozzle",
"sub_path": "process/0.14mm Optimal @Creality K2 Plus 0.2 nozzle.json"
},
{
"name": "0.16mm Optimal @Creality K2 Plus 0.4 nozzle",
"sub_path": "process/0.16mm Optimal @Creality K2 Plus 0.4 nozzle.json"
},
{
"name": "0.24mm Optimal @Creality K2 Plus 0.6 nozzle",
"sub_path": "process/0.24mm Optimal @Creality K2 Plus 0.6 nozzle.json"
},
{
"name": "0.32mm Optimal @Creality K2 Plus 0.8 nozzle",
"sub_path": "process/0.32mm Optimal @Creality K2 Plus 0.8 nozzle.json"
},
{
"name": "0.20mm Standard @Creality CR10V2",
"sub_path": "process/0.20mm Standard @Creality CR10V2.json"
Expand Down Expand Up @@ -686,6 +750,10 @@
"name": "0.20mm Standard @Creality Ender6",
"sub_path": "process/0.20mm Standard @Creality Ender6.json"
},
{
"name": "0.20mm Standard @Creality CR-M4",
"sub_path": "process/0.20mm Standard @Creality CR-M4.json"
},
{
"name": "0.20mm Standard @Creality K1 (0.4 nozzle)",
"sub_path": "process/0.20mm Standard @Creality K1 (0.4 nozzle).json"
Expand All @@ -698,6 +766,22 @@
"name": "0.20mm Standard @Creality K1Max (0.4 nozzle)",
"sub_path": "process/0.20mm Standard @Creality K1Max (0.4 nozzle).json"
},
{
"name": "0.20mm Standard @Creality K2 Plus 0.4 nozzle",
"sub_path": "process/0.20mm Standard @Creality K2 Plus 0.4 nozzle.json"
},
{
"name": "0.30mm Standard @Creality K2 Plus 0.6 nozzle",
"sub_path": "process/0.30mm Standard @Creality K2 Plus 0.6 nozzle.json"
},
{
"name": "0.40mm Standard @Creality K2 Plus 0.8 nozzle",
"sub_path": "process/0.40mm Standard @Creality K2 Plus 0.8 nozzle.json"
},
{
"name": "0.20mm Fast @Creality K1 SE 0.4",
"sub_path": "process/0.20mm Fast @Creality K1 SE 0.4.json"
},
{
"name": "0.24mm Draft @Creality Ender3 0.2",
"sub_path": "process/0.24mm Draft @Creality Ender3 0.2.json"
Expand Down Expand Up @@ -826,6 +910,18 @@
"name": "0.24mm Draft @Creality Ender5Pro (2019) 0.8",
"sub_path": "process/0.24mm Draft @Creality Ender5Pro (2019) 0.8.json"
},
{
"name": "0.24mm Draft @Creality K2 Plus 0.4 nozzle",
"sub_path": "process/0.24mm Draft @Creality K2 Plus 0.4 nozzle.json"
},
{
"name": "0.36mm Draft @Creality K2 Plus 0.6 nozzle",
"sub_path": "process/0.36mm Draft @Creality K2 Plus 0.6 nozzle.json"
},
{
"name": "0.48mm Draft @Creality K2 Plus 0.8 nozzle",
"sub_path": "process/0.48mm Draft @Creality K2 Plus 0.8 nozzle.json"
},
{
"name": "0.28mm SuperDraft @Creality Ender3 0.2",
"sub_path": "process/0.28mm SuperDraft @Creality Ender3 0.2.json"
Expand Down Expand Up @@ -882,6 +978,18 @@
"name": "0.28mm SuperDraft @Creality Ender5Pro (2019) 1.0",
"sub_path": "process/0.28mm SuperDraft @Creality Ender5Pro (2019) 1.0.json"
},
{
"name": "0.28mm SuperDraft @Creality K2 Plus 0.4 nozzle",
"sub_path": "process/0.28mm SuperDraft @Creality K2 Plus 0.4 nozzle.json"
},
{
"name": "0.42mm SuperDraft @Creality K2 Plus 0.6 nozzle",
"sub_path": "process/0.42mm SuperDraft @Creality K2 Plus 0.6 nozzle.json"
},
{
"name": "0.56mm SuperDraft @Creality K2 Plus 0.8 nozzle",
"sub_path": "process/0.56mm SuperDraft @Creality K2 Plus 0.8 nozzle.json"
},
{
"name": "0.32mm Chunky @Creality CR-6 0.6",
"sub_path": "process/0.32mm Chunky @Creality CR-6 0.6.json"
Expand Down Expand Up @@ -1179,6 +1287,46 @@
{
"name": "Creality Generic TPU @K1-all",
"sub_path": "filament/Creality Generic TPU @K1-all.json"
},
{
"name": "Creality Generic ABS @K2-all",
"sub_path": "filament/Creality Generic ABS @K2-all.json"
},
{
"name": "Creality Generic ASA @K2-all",
"sub_path": "filament/Creality Generic ASA @K2-all.json"
},
{
"name": "Creality Generic PETG @K2-all",
"sub_path": "filament/Creality Generic PETG @K2-all.json"
},
{
"name": "Creality Generic PLA @K2-all",
"sub_path": "filament/Creality Generic PLA @K2-all.json"
},
{
"name": "Creality Generic PLA High Speed @K2-all",
"sub_path": "filament/Creality Generic PLA High Speed @K2-all.json"
},
{
"name": "Creality Generic PLA Matte @K2-all",
"sub_path": "filament/Creality Generic PLA Matte @K2-all.json"
},
{
"name": "Creality Generic PLA Silk @K2-all",
"sub_path": "filament/Creality Generic PLA Silk @K2-all.json"
},
{
"name": "Creality Generic TPU @K2-all",
"sub_path": "filament/Creality Generic TPU @K2-all.json"
},
{
"name": "Creality Generic PLA-CF @K2-all",
"sub_path": "filament/Creality Generic PLA-CF @K2-all.json"
},
{
"name": "Creality Generic PA-CF @K2-all",
"sub_path": "filament/Creality Generic PA-CF @K2-all.json"
}
],
"machine_list": [
Expand Down Expand Up @@ -1250,6 +1398,10 @@
"name": "Creality CR-6 Max 0.8 nozzle",
"sub_path": "machine/Creality CR-6 Max 0.8 nozzle.json"
},
{
"name": "Creality CR-M4 0.4 nozzle",
"sub_path": "machine/Creality CR-M4 0.4 nozzle.json"
},
{
"name": "Creality Ender-3 V2 0.4 nozzle",
"sub_path": "machine/Creality Ender-3 V2 0.4 nozzle.json"
Expand Down Expand Up @@ -1426,6 +1578,10 @@
"name": "Creality K1C 0.8 nozzle",
"sub_path": "machine/Creality K1C 0.8 nozzle.json"
},
{
"name": "Creality K1 SE 0.4 nozzle",
"sub_path": "machine/Creality K1 SE 0.4 nozzle.json"
},
{
"name": "Creality K1 Max (0.4 nozzle)",
"sub_path": "machine/Creality K1 Max (0.4 nozzle).json"
Expand All @@ -1437,6 +1593,22 @@
{
"name": "Creality K1 Max (0.8 nozzle)",
"sub_path": "machine/Creality K1 Max (0.8 nozzle).json"
},
{
"name": "Creality K2 Plus 0.2 nozzle",
"sub_path": "machine/Creality K2 Plus 0.2 nozzle.json"
},
{
"name": "Creality K2 Plus 0.4 nozzle",
"sub_path": "machine/Creality K2 Plus 0.4 nozzle.json"
},
{
"name": "Creality K2 Plus 0.6 nozzle",
"sub_path": "machine/Creality K2 Plus 0.6 nozzle.json"
},
{
"name": "Creality K2 Plus 0.8 nozzle",
"sub_path": "machine/Creality K2 Plus 0.8 nozzle.json"
}
]
}
Binary file added resources/profiles/Creality/Creality CR-M4_cover.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/profiles/Creality/Creality K1 SE_cover.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/profiles/Creality/Creality K2 Plus_cover.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/profiles/Creality/creality_crm4_buildplate_model.stl
View file
Binary file not shown.
Binary file added resources/profiles/Creality/creality_crm4_buildplate_texture.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/profiles/Creality/creality_k1se_buildplate_model.stl
View file
Binary file not shown.
Binary file added resources/profiles/Creality/creality_k1se_buildplate_texture.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/profiles/Creality/creality_k2plus_buildplate_model.stl
View file
Binary file not shown.
Binary file added resources/profiles/Creality/creality_k2plus_buildplate_texture.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion resources/profiles/Creality/filament/Creality Generic ABS @K1-all.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"compatible_printers": [
"Creality K1C 0.4 nozzle",
"Creality K1C 0.6 nozzle",
"Creality K1C 0.8 nozzle"
"Creality K1C 0.8 nozzle",
"Creality K1 SE 0.4 nozzle"
]
}
26 changes: 26 additions & 0 deletions resources/profiles/Creality/filament/Creality Generic ABS @K2-all.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"type": "filament",
"setting_id": "GFSA04_CREALITY_00",
"name": "Creality Generic ABS @K2-all",
"from": "system",
"instantiation": "true",
"inherits": "Creality Generic ABS",
"filament_flow_ratio": [
"0.95"
],
"filament_max_volumetric_speed": [
"18"
],
"slow_down_layer_time": [
"12"
],
"slow_down_min_speed": [
"20"
],
"compatible_printers": [
"Creality K2 Plus 0.2 nozzle",
"Creality K2 Plus 0.4 nozzle",
"Creality K2 Plus 0.6 nozzle",
"Creality K2 Plus 0.8 nozzle"
]
}
3 changes: 2 additions & 1 deletion resources/profiles/Creality/filament/Creality Generic ABS.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
"Creality CR-10 SE 0.2 nozzle",
"Creality CR-10 SE 0.4 nozzle",
"Creality CR-10 SE 0.6 nozzle",
"Creality CR-10 SE 0.8 nozzle"
"Creality CR-10 SE 0.8 nozzle",
"Creality CR-M4 0.4 nozzle"
]
}
3 changes: 2 additions & 1 deletion resources/profiles/Creality/filament/Creality Generic ASA @K1-all.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"compatible_printers": [
"Creality K1C 0.4 nozzle",
"Creality K1C 0.6 nozzle",
"Creality K1C 0.8 nozzle"
"Creality K1C 0.8 nozzle",
"Creality K1 SE 0.4 nozzle"
]
}
26 changes: 26 additions & 0 deletions resources/profiles/Creality/filament/Creality Generic ASA @K2-all.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"type": "filament",
"setting_id": "GFSA04_00",
"name": "Creality Generic ASA @K2-all",
"from": "system",
"instantiation": "true",
"inherits": "Creality Generic ASA",
"filament_flow_ratio": [
"0.95"
],
"filament_max_volumetric_speed": [
"14"
],
"slow_down_layer_time": [
"10"
],
"slow_down_min_speed": [
"20"
],
"compatible_printers": [
"Creality K2 Plus 0.2 nozzle",
"Creality K2 Plus 0.4 nozzle",
"Creality K2 Plus 0.6 nozzle",
"Creality K2 Plus 0.8 nozzle"
]
}
1 change: 1 addition & 0 deletions resources/profiles/Creality/filament/Creality Generic PA-CF @K1-all.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"Creality K1C 0.4 nozzle",
"Creality K1C 0.6 nozzle",
"Creality K1C 0.8 nozzle",
"Creality K1 SE 0.4 nozzle",
"Creality K1 Max (0.4 nozzle)",
"Creality K1 Max (0.6 nozzle)",
"Creality K1 Max (0.8 nozzle)"
Expand Down
23 changes: 23 additions & 0 deletions resources/profiles/Creality/filament/Creality Generic PA-CF @K2-all.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"type": "filament",
"name": "Creality Generic PA-CF @K2-all",
"inherits": "Creality Generic PA-CF",
"from": "system",
"setting_id": "GFSN99_01",
"instantiation": "true",
"nozzle_temperature_initial_layer": [
"280"
],
"nozzle_temperature": [
"280"
],
"fan_min_speed": [
"30"
],
"compatible_printers": [
"Creality K2 Plus 0.2 nozzle",
"Creality K2 Plus 0.4 nozzle",
"Creality K2 Plus 0.6 nozzle",
"Creality K2 Plus 0.8 nozzle"
]
}
1 change: 1 addition & 0 deletions resources/profiles/Creality/filament/Creality Generic PC @K1-all.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"Creality K1C 0.4 nozzle",
"Creality K1C 0.6 nozzle",
"Creality K1C 0.8 nozzle",
"Creality K1 SE 0.4 nozzle",
"Creality K1 Max (0.4 nozzle)",
"Creality K1 Max (0.6 nozzle)",
"Creality K1 Max (0.8 nozzle)"
Expand Down
Loading

0 comments on commit ed8c16d

Please sign in to comment.