Refactor anker (#3845)

* Bring over bed and cover files * Initial refactored configuration file with placeholders for adding more nozzles * Uniqueify filament profiles * Initial refactored machine profiles * Remove placeholders * Correct machine selection flow * Correct Typo * Add placeholders to bring CE profile settings current with new format * Fixes #3326 * Port 0.4 Normal Mode Profiles * Port fast mode profiles * Remove superfluous settings * Migrate existing filament profiles * Update available nozzles and default materials * Remove 'with' from file names * Remove 'with' from file names * Correct support object distance default * Correct transcription errors * Correct transcription error * Bring max_travel_detour_distance into convention with other profiles * Replace old profiles with the refactored profiles * Correct name used from Extra Draft to Superdraft * Re-use original names so printer profiles don't break --------- Co-authored-by: Geofrey Ward <[email protected]>
SoftFever · Jan 28, 2024 · d70fcc1 · d70fcc1
1 parent 3ae8cca
commit d70fcc1
Show file tree

Hide file tree

Showing 58 changed files with 1,087 additions and 999 deletions.
diff --git a/resources/profiles/Anker.json b/resources/profiles/Anker.json
@@ -8,6 +8,10 @@
             "name": "Anker M5",
             "sub_path": "machine/Anker M5.json"
         },
+        {
+            "name": "Anker M5 All-Metal Hot End",
+            "sub_path": "machine/Anker M5 All-Metal Hot End.json"
+        },
         {
             "name": "Anker M5C",
             "sub_path": "machine/Anker M5C.json"
@@ -18,6 +22,14 @@
             "name": "fdm_process_common",
             "sub_path": "process/fdm_process_common.json"
         },
+        {
+            "name": "fdm_process_anker_common",
+            "sub_path": "process/fdm_process_anker_common.json"
+        },
+        {
+            "name": "fdm_process_anker_fast_common",
+            "sub_path": "process/fdm_process_anker_fast_common.json"
+        },
         {
             "name": "0.05mm Ultradetail @Anker",
             "sub_path": "process/0.05mm Ultradetail @Anker.json"
@@ -30,29 +42,29 @@
             "name": "0.15mm Optimal @Anker",
             "sub_path": "process/0.15mm Optimal @Anker.json"
         },
-        {
-            "name": "0.20mm Standard @Anker",
-            "sub_path": "process/0.20mm Standard @Anker.json"
-        },
-        {
-            "name": "0.25mm Draft @Anker",
-            "sub_path": "process/0.25mm Draft @Anker.json"
-        },
-        {
-            "name": "0.30mm Superdraft @Anker",
-            "sub_path": "process/0.30mm Superdraft @Anker.json"
-        },
         {
             "name": "0.15mm Fast @Anker",
             "sub_path": "process/0.15mm Fast @Anker.json"
         },
+        {
+            "name": "0.20mm Standard @Anker",
+            "sub_path": "process/0.20mm Standard @Anker.json"
+        },
         {
             "name": "0.20mm Fast @Anker",
             "sub_path": "process/0.20mm Fast @Anker.json"
         },
+        {
+            "name": "0.25mm Draft @Anker",
+            "sub_path": "process/0.25mm Draft @Anker.json"
+        },
         {
             "name": "0.25mm Fast @Anker",
             "sub_path": "process/0.25mm Fast @Anker.json"
+        },
+        {
+            "name": "0.30mm Superdraft @Anker",
+            "sub_path": "process/0.30mm Superdraft @Anker.json"
         }
     ],
     "filament_list": [
@@ -89,28 +101,92 @@
             "sub_path": "filament/fdm_filament_pva.json"
         },
         {
-            "name": "fdm_filament_pa",
+            "name": "fdm_filament_pa ",
             "sub_path": "filament/fdm_filament_pa.json"
         },
+        {
+            "name": "Anker Generic PLA @base",
+            "sub_path": "filament/Anker Generic PLA @base.json"
+        },
+        {
+            "name": "Anker Generic PLA+ @base",
+            "sub_path": "filament/Anker Generic PLA+ @base.json"
+        },
+        {
+            "name": "Anker Generic PLA Silk @base",
+            "sub_path": "filament/Anker Generic PLA Silk @base.json"
+        },
+        {
+            "name": "Anker Generic PLA-CF @base",
+            "sub_path": "filament/Anker Generic PLA-CF @base.json"
+        },
+        {
+            "name": "Anker Generic TPU @base",
+            "sub_path": "filament/Anker Generic TPU @base.json"
+        },
+        {
+            "name": "Anker Generic PETG @base",
+            "sub_path": "filament/Anker Generic PETG @base.json"
+        },
+        {
+            "name": "Anker Generic PETG-CF @base",
+            "sub_path": "filament/Anker Generic PETG-CF @base.json"
+        },
+        {
+            "name": "Anker Generic ABS @base",
+            "sub_path": "filament/Anker Generic ABS @base.json"
+        },
+        {
+            "name": "Anker Generic ASA @base",
+            "sub_path": "filament/Anker Generic ASA @base.json"
+        },
+        {
+            "name": "Anker Generic PC @base",
+            "sub_path": "filament/Anker Generic PC @base.json"
+        },
+        {
+            "name": "Anker Generic PVA @base",
+            "sub_path": "filament/Anker Generic PVA @base.json"
+        },
+        {
+            "name": "Anker Generic PA @base",
+            "sub_path": "filament/Anker Generic PA @base.json"
+        },
+        {
+            "name": "Anker Generic PA-CF @base",
+            "sub_path": "filament/Anker Generic PA-CF @base.json"
+        },
         {
             "name": "Anker Generic PLA",
             "sub_path": "filament/Anker Generic PLA.json"
         },
+        {
+            "name": "Anker Generic PLA+",
+            "sub_path": "filament/Anker Generic PLA+.json"
+        },
+        {
+            "name": "Anker Generic PLA Silk",
+            "sub_path": "filament/Anker Generic PLA Silk.json"
+        },
         {
             "name": "Anker Generic PLA-CF",
             "sub_path": "filament/Anker Generic PLA-CF.json"
         },
+        {
+            "name": "Anker Generic TPU",
+            "sub_path": "filament/Anker Generic TPU.json"
+        },
         {
             "name": "Anker Generic PETG",
             "sub_path": "filament/Anker Generic PETG.json"
         },
         {
-            "name": "Anker Generic ABS",
-            "sub_path": "filament/Anker Generic ABS.json"
+            "name": "Anker Generic PETG-CF",
+            "sub_path": "filament/Anker Generic PETG-CF.json"
         },
         {
-            "name": "Anker Generic TPU",
-            "sub_path": "filament/Anker Generic TPU.json"
+            "name": "Anker Generic ABS",
+            "sub_path": "filament/Anker Generic ABS.json"
         },
         {
             "name": "Anker Generic ASA",
@@ -138,10 +214,18 @@
             "name": "fdm_machine_common",
             "sub_path": "machine/fdm_machine_common.json"
         },
+        {
+            "name": "fdm_marlin_common",
+            "sub_path": "machine/fdm_marlin_common.json"
+        },
         {
             "name": "Anker M5 0.4 nozzle",
             "sub_path": "machine/Anker M5 0.4 nozzle.json"
         },
+        {
+            "name": "Anker M5 All-Metal 0.4 nozzle",
+            "sub_path": "machine/Anker M5 All-Metal 0.4 nozzle.json"
+        },
         {
             "name": "Anker M5C 0.4 nozzle",
             "sub_path": "machine/Anker M5C 0.4 nozzle.json"

diff --git a/resources/profiles/Anker/Anker M5 All-Metal Hot End_cover.png b/resources/profiles/Anker/Anker M5 All-Metal Hot End_cover.png
diff --git a/resources/profiles/Anker/Anker M5_cover.png b/resources/profiles/Anker/Anker M5_cover.png
diff --git a/resources/profiles/Anker/filament/Anker Generic ABS @base.json b/resources/profiles/Anker/filament/Anker Generic ABS @base.json
@@ -0,0 +1,8 @@
+{
+    "type": "filament",
+    "name": "Anker Generic ABS @base",
+    "inherits": "fdm_filament_abs",
+    "from": "system",
+    "filament_id": "GFB99",
+    "instantiation": "false"
+}
diff --git a/resources/profiles/Anker/filament/Anker Generic ABS.json b/resources/profiles/Anker/filament/Anker Generic ABS.json
@@ -1,19 +1,13 @@
 {
     "type": "filament",
-    "filament_id": "GFB99",
-    "setting_id": "GFSA04",
     "name": "Anker Generic ABS",
+    "inherits": "Anker Generic ABS @base",
     "from": "system",
+    "setting_id": "GFSB99",
     "instantiation": "true",
-    "inherits": "fdm_filament_abs",
-    "filament_flow_ratio": [
-        "0.926"
-    ],
-    "filament_max_volumetric_speed": [
-        "12"
-    ],
     "compatible_printers": [
         "Anker M5 0.4 nozzle",
-        "Anker M5C 0.4 nozzle"
+        "Anker M5 All-Metal 0.4 nozzle",
+        "Anker M5c 0.4 nozzle"
     ]
 }
diff --git a/resources/profiles/Anker/filament/Anker Generic ASA @base.json b/resources/profiles/Anker/filament/Anker Generic ASA @base.json
@@ -0,0 +1,9 @@
+
+{
+    "type": "filament",
+    "name": "Anker Generic ASA @base",
+    "inherits": "fdm_filament_asa",
+    "from": "system",
+    "filament_id": "GFB98",
+    "instantiation": "false"
+}
diff --git a/resources/profiles/Anker/filament/Anker Generic ASA.json b/resources/profiles/Anker/filament/Anker Generic ASA.json
@@ -1,19 +1,13 @@
 {
     "type": "filament",
-    "filament_id": "GFB98",
-    "setting_id": "GFSA04",
     "name": "Anker Generic ASA",
+    "inherits": "Anker Generic ASA @base",
     "from": "system",
+    "setting_id": "GFSB98",
     "instantiation": "true",
-    "inherits": "fdm_filament_asa",
-    "filament_flow_ratio": [
-        "0.93"
-    ],
-    "filament_max_volumetric_speed": [
-        "12"
-    ],
     "compatible_printers": [
         "Anker M5 0.4 nozzle",
-        "Anker M5C 0.4 nozzle"
+        "Anker M5 All-Metal 0.4 nozzle",
+        "Anker M5c 0.4 nozzle"
     ]
 }
diff --git a/resources/profiles/Anker/filament/Anker Generic PA @base.json b/resources/profiles/Anker/filament/Anker Generic PA @base.json
@@ -0,0 +1,8 @@
+{
+    "type": "filament",
+    "name": "Anker Generic PA @base",
+    "inherits": "fdm_filament_pa",
+    "from": "system",
+    "filament_id": "GFN99",
+    "instantiation": "false"
+}
diff --git a/resources/profiles/Anker/filament/Anker Generic PA-CF @base.json b/resources/profiles/Anker/filament/Anker Generic PA-CF @base.json
@@ -0,0 +1,17 @@
+{
+    "type": "filament",
+    "name": "Anker Generic PA-CF @base",
+    "inherits": "fdm_filament_pa",
+    "from": "system",
+    "filament_id": "GFN98",
+    "instantiation": "false",
+    "required_nozzle_HRC": [
+        "40"
+    ],
+    "filament_cost": [
+        "55"
+    ],
+    "filament_max_volumetric_speed": [
+        "6"
+    ]
+}
diff --git a/resources/profiles/Anker/filament/Anker Generic PA-CF.json b/resources/profiles/Anker/filament/Anker Generic PA-CF.json
@@ -1,24 +1,12 @@
 {
     "type": "filament",
-    "filament_id": "GFN98",
-    "setting_id": "GFSA04",
     "name": "Anker Generic PA-CF",
+    "inherits": "Anker Generic PA-CF @base",
     "from": "system",
+    "setting_id": "GFSN98",
     "instantiation": "true",
-    "inherits": "fdm_filament_pa",
-    "filament_type": [
-        "PA-CF"
-    ],
-    "nozzle_temperature_initial_layer": [
-        "280"
-    ],
-    "nozzle_temperature": [
-        "280"
-    ],
-    "filament_max_volumetric_speed": [
-        "8"
-    ],
     "compatible_printers": [
-        "Anker M5C 0.4 nozzle"
+        "Anker M5 All-Metal 0.4 nozzle",
+        "Anker M5c 0.4 nozzle"
     ]
 }
diff --git a/resources/profiles/Anker/filament/Anker Generic PA.json b/resources/profiles/Anker/filament/Anker Generic PA.json
@@ -1,21 +1,12 @@
 {
     "type": "filament",
-    "filament_id": "GFN99",
-    "setting_id": "GFSA04",
     "name": "Anker Generic PA",
+    "inherits": "Anker Generic PA @base",
     "from": "system",
+    "setting_id": "GFSN99",
     "instantiation": "true",
-    "inherits": "fdm_filament_pa",
-    "nozzle_temperature_initial_layer": [
-        "280"
-    ],
-    "nozzle_temperature": [
-        "280"
-    ],
-    "filament_max_volumetric_speed": [
-        "12"
-    ],
     "compatible_printers": [
-        "Anker M5C 0.4 nozzle"
+        "Anker M5 All-Metal 0.4 nozzle",
+        "Anker M5c 0.4 nozzle"
     ]
 }
diff --git a/resources/profiles/Anker/filament/Anker Generic PC @base.json b/resources/profiles/Anker/filament/Anker Generic PC @base.json
@@ -0,0 +1,8 @@
+{
+    "type": "filament",
+    "name": "Anker Generic PC @base",
+    "inherits": "fdm_filament_pc",
+    "from": "system",
+    "filament_id": "GFC99",
+    "instantiation": "false"
+}
diff --git a/resources/profiles/Anker/filament/Anker Generic PC.json b/resources/profiles/Anker/filament/Anker Generic PC.json
@@ -1,18 +1,12 @@
 {
     "type": "filament",
-    "filament_id": "GFC99",
-    "setting_id": "GFSA04",
     "name": "Anker Generic PC",
+    "inherits": "Anker Generic PC @base",
     "from": "system",
+    "setting_id": "GFSC99",
     "instantiation": "true",
-    "inherits": "fdm_filament_pc",
-    "filament_max_volumetric_speed": [
-        "12"
-    ],
-    "filament_flow_ratio": [
-        "0.94"
-    ],
     "compatible_printers": [
-        "Anker M5C 0.4 nozzle"
+        "Anker M5 All-Metal 0.4 nozzle",
+        "Anker M5c 0.4 nozzle"
     ]
 }
diff --git a/resources/profiles/Anker/filament/Anker Generic PETG @base.json b/resources/profiles/Anker/filament/Anker Generic PETG @base.json
@@ -0,0 +1,13 @@
+{
+    "type": "filament",
+    "name": "Anker Generic PETG @base",
+    "inherits": "fdm_filament_pet",
+    "from": "system",
+    "filament_id": "GFG99",
+    "instantiation": "false",
+    "filament_retraction_speed": "20",
+    "filament_deretraction_speed": "60",
+    "filament_retract_when_changing_layer": "1",
+    "filament_wipe": "1",
+    "filament_retract_before_wipe": "100"
+}