K1/K1 Max : Added TPU, ASA and fixed filaments missing from previous …

…PR (#2412) * Rename Creality HF Generic Speed PLA.cfg to Creality HF Generic Speed PLA.json * Update Creality K1.json * Create Creality Generic TPU.json * Update Creality Generic ASA.json CS * Update Creality.json * Update Creality K1 Max.json
SoftFever · Oct 14, 2023 · 2077c98 · 2077c98
1 parent 2544787
commit 2077c98
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 31 deletions.
diff --git a/resources/profiles/Creality.json b/resources/profiles/Creality.json
@@ -356,21 +356,45 @@
 			"name": "fdm_filament_pet",
 			"sub_path": "filament/fdm_filament_pet.json"
 		},
+		{
+			"name": "fdm_filament_tpu",
+			"sub_path": "filament/fdm_filament_tpu.json"
+		},
 		{
 			"name": "fdm_filament_abs",
 			"sub_path": "filament/fdm_filament_abs.json"
 		},
+		{
+			"name": "fdm_filament_asa",
+			"sub_path": "filament/fdm_filament_asa.json"
+		},
 		{
 			"name": "Creality Generic PLA",
 			"sub_path": "filament/Creality Generic PLA.json"
 		},
+		{
+			"name": "Creality HF Generic PLA",
+			"sub_path": "filament/Creality HF Generic PLA.json"
+		},
+		{
+			"name": "Creality HF Generic Speed PLA",
+			"sub_path": "filament/Creality HF Generic Speed PLA.json"
+		},
 		{
 			"name": "Creality Generic PETG",
 			"sub_path": "filament/Creality Generic PETG.json"
 		},
+		{
+			"name": "Creality Generic TPU",
+			"sub_path": "filament/Creality Generic TPU.json"
+		},
 		{
 			"name": "Creality Generic ABS",
 			"sub_path": "filament/Creality Generic ABS.json"
+		},
+		{
+			"name": "Creality Generic ASA",
+			"sub_path": "filament/Creality Generic ASA.json"
 		}
 	],
 	"machine_list": [

diff --git a/resources/profiles/Creality/filament/Creality Generic ASA.json b/resources/profiles/Creality/filament/Creality Generic ASA.json
@@ -9,31 +9,31 @@
     "filament_flow_ratio": ["0.926"],
     "filament_max_volumetric_speed": ["12"],
     "compatible_printers": [
-        		"Creality CR-10 V2 0.4 nozzle",
-        		"Creality CR-10 Max 0.4 nozzle",
-        		"Creality CR-6 SE 0.2 nozzle",
-        		"Creality CR-6 SE 0.4 nozzle",
-        		"Creality CR-6 SE 0.6 nozzle",
-        		"Creality CR-6 SE 0.8 nozzle",
-        		"Creality CR-6 Max 0.2 nozzle",
-        		"Creality CR-6 Max 0.4 nozzle",
-        		"Creality CR-6 Max 0.6 nozzle",
-        		"Creality CR-6 Max 0.8 nozzle",
-        		"Creality Ender-3 0.4 nozzle",
-        		"Creality Ender-3 V2 0.4 nozzle",
-        		"Creality Ender-3 S1 0.4 nozzle",
-        		"Creality Ender-3 S1 Pro 0.4 nozzle",
-        		"Creality Ender-5 0.4 nozzle",
-        		"Creality Ender-5 Plus 0.4 nozzle",
-        		"Creality Ender-5 Pro (2019) 0.4 nozzle",
-        		"Creality Ender-5S 0.4 nozzle",
-        		"Creality Ender-5 S1 0.4 nozzle",
-        		"Creality Ender-6 0.4 nozzle",
-        		"Creality K1 (0.4 nozzle)",
-        		"Creality K1 (0.6 nozzle)",
-        		"Creality K1 (0.8 nozzle)",
-        		"Creality K1 Max (0.4 nozzle)",
-        		"Creality K1 Max (0.6 nozzle)",
-        		"Creality K1 Max (0.8 nozzle)"
-	]
+        "Creality CR-10 V2 0.4 nozzle",
+        "Creality CR-10 Max 0.4 nozzle",
+        "Creality CR-6 SE 0.2 nozzle",
+        "Creality CR-6 SE 0.4 nozzle",
+        "Creality CR-6 SE 0.6 nozzle",
+        "Creality CR-6 SE 0.8 nozzle",
+        "Creality CR-6 Max 0.2 nozzle",
+        "Creality CR-6 Max 0.4 nozzle",
+        "Creality CR-6 Max 0.6 nozzle",
+        "Creality CR-6 Max 0.8 nozzle",
+        "Creality Ender-3 0.4 nozzle",
+        "Creality Ender-3 V2 0.4 nozzle",
+        "Creality Ender-3 S1 0.4 nozzle",
+        "Creality Ender-3 S1 Pro 0.4 nozzle",
+        "Creality Ender-5 0.4 nozzle",
+        "Creality Ender-5 Plus 0.4 nozzle",
+        "Creality Ender-5 Pro (2019) 0.4 nozzle",
+        "Creality Ender-5S 0.4 nozzle",
+        "Creality Ender-5 S1 0.4 nozzle",
+        "Creality Ender-6 0.4 nozzle",
+        "Creality K1 (0.4 nozzle)",
+        "Creality K1 (0.6 nozzle)",
+        "Creality K1 (0.8 nozzle)",
+        "Creality K1 Max (0.4 nozzle)",
+        "Creality K1 Max (0.6 nozzle)",
+        "Creality K1 Max (0.8 nozzle)"
+    ]
 }
diff --git a/resources/profiles/Creality/filament/Creality Generic TPU.json b/resources/profiles/Creality/filament/Creality Generic TPU.json
@@ -0,0 +1,20 @@
+{
+    "type": "filament",
+    "filament_id": "GFU99",
+    "setting_id": "GFSA04",
+    "name": "Creality Generic TPU",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_tpu",
+    "filament_max_volumetric_speed": [
+        "3.2"
+    ],
+    "compatible_printers": [
+        "Creality K1 (0.4 nozzle)",
+        "Creality K1 (0.6 nozzle)",
+        "Creality K1 (0.8 nozzle)",
+        "Creality K1 Max (0.4 nozzle)",
+        "Creality K1 Max (0.6 nozzle)",
+        "Creality K1 Max (0.8 nozzle)"
+    ]
+}
diff --git a/...ilament/Creality HF Generic Speed PLA.cfg → ...lament/Creality HF Generic Speed PLA.json b/...ilament/Creality HF Generic Speed PLA.cfg → ...lament/Creality HF Generic Speed PLA.json
diff --git a/resources/profiles/Creality/machine/Creality K1 Max.json b/resources/profiles/Creality/machine/Creality K1 Max.json
@@ -8,5 +8,5 @@
     "bed_model": "creality_k1max_buildplate_model.stl",
     "bed_texture": "creality_k1max_buildplate_texture.png",
     "hotend_model": "",
-    "default_materials": "Creality Generic PLA @0.4 nozzle;Creality Generic PETG @0.4 nozzle;Creality Generic ABS @0.4 nozzle;Creality Generic PLA @0.6 nozzle;Creality Generic PETG @0.6 nozzle;Creality Generic ABS @0.6 nozzle;Creality Generic PLA @0.8 nozzle;Creality Generic PETG @0.8 nozzle;Creality Generic ABS @0.8 nozzle"
-}
+    "default_materials": "Creality Generic PLA @0.4 nozzle;Creality HF Generic PLA @0.4 nozzle;Creality HF Generic Speed PLA @0.4 nozzle;Creality Generic PETG @0.4 nozzle;Creality Generic TPU @0.4 nozzle;Creality Generic ABS @0.4 nozzle;Creality Generic PLA @0.6 nozzle;Creality HF Generic PLA @0.6 nozzle;Creality HF Generic Speed PLA @0.6 nozzle;Creality Generic PETG @0.6 nozzle;Creality Generic TPU @0.6 nozzle;Creality Generic ABS @0.6 nozzle;Creality Generic PLA @0.8 nozzle;Creality HF Generic PLA @0.8 nozzle;Creality HF Generic Speed PLA @0.8 nozzle;Creality Generic PETG @0.8 nozzle;Creality Generic TPU @0.8 nozzle;Creality Generic ABS @0.8 nozzle"
+}
diff --git a/resources/profiles/Creality/machine/Creality K1.json b/resources/profiles/Creality/machine/Creality K1.json
@@ -8,5 +8,5 @@
     "bed_model": "creality_k1_buildplate_model.stl",
     "bed_texture": "creality_k1_buildplate_texture.png",
     "hotend_model": "",
-    "default_materials": "Creality Generic PLA @0.4 nozzle;Creality Generic PETG @0.4 nozzle;Creality Generic ABS @0.4 nozzle;Creality Generic PLA @0.6 nozzle;Creality Generic PETG @0.6 nozzle;Creality Generic ABS @0.6 nozzle;Creality Generic PLA @0.8 nozzle;Creality Generic PETG @0.8 nozzle;Creality Generic ABS @0.8 nozzle"
-}
+    "default_materials": "Creality Generic PLA @0.4 nozzle;Creality HF Generic PLA @0.4 nozzle;Creality HF Generic Speed PLA @0.4 nozzle;Creality Generic PETG @0.4 nozzle;Creality Generic TPU @0.4 nozzle;Creality Generic ABS @0.4 nozzle;Creality Generic PLA @0.6 nozzle;Creality HF Generic PLA @0.6 nozzle;Creality HF Generic Speed PLA @0.6 nozzle;Creality Generic PETG @0.6 nozzle;Creality Generic TPU @0.6 nozzle;Creality Generic ABS @0.6 nozzle;Creality Generic PLA @0.8 nozzle;Creality HF Generic PLA @0.8 nozzle;Creality HF Generic Speed PLA @0.8 nozzle;Creality Generic PETG @0.8 nozzle;Creality Generic TPU @0.8 nozzle;Creality Generic ABS @0.8 nozzle"
+}