From b9da340fc53133757f465281bb158bd35ba3f9d1 Mon Sep 17 00:00:00 2001
From: cochcoder <103969142+cochcoder@users.noreply.github.com>
Date: Mon, 30 Sep 2024 21:42:59 -0400
Subject: [PATCH] Another attempt at fixing filament issues

---
 resources/profiles/Elegoo.json                |  4 ---
 .../filament/Elegoo ASA @Elegoo Giga.json     |  3 +-
 .../Elegoo/filament/Elegoo Generic ASA.json   |  5 ++--
 .../filament/Elegoo Generic PETG PRO.json     |  5 ++--
 .../filament/Elegoo Generic PLA Matte.json    |  5 ++--
 .../filament/Elegoo Generic PLA Silk.json     | 29 -------------------
 .../Elegoo PETG PRO @Elegoo Giga.json         |  5 ++--
 .../filament/Elegoo PLA @Elegoo Giga.json     |  3 +-
 .../Elegoo PLA Matte @Elegoo Giga.json        |  3 +-
 9 files changed, 18 insertions(+), 44 deletions(-)
 delete mode 100644 resources/profiles/Elegoo/filament/Elegoo Generic PLA Silk.json

diff --git a/resources/profiles/Elegoo.json b/resources/profiles/Elegoo.json
index fc8a842d1b..ba3080a433 100644
--- a/resources/profiles/Elegoo.json
+++ b/resources/profiles/Elegoo.json
@@ -808,10 +808,6 @@
 			"name": "Elegoo Generic PLA",
 			"sub_path": "filament/Elegoo Generic PLA.json"
 		},
-		{
-			"name": "Elegoo Generic PLA Silk",
-			"sub_path": "filament/Elegoo Generic PLA Silk.json"
-		},
 		{
 			"name": "Elegoo Generic PLA Matte",
 			"sub_path": "filament/Elegoo Generic PLA Matte.json"
diff --git a/resources/profiles/Elegoo/filament/Elegoo ASA @Elegoo Giga.json b/resources/profiles/Elegoo/filament/Elegoo ASA @Elegoo Giga.json
index 503ae42a70..165c177049 100644
--- a/resources/profiles/Elegoo/filament/Elegoo ASA @Elegoo Giga.json	
+++ b/resources/profiles/Elegoo/filament/Elegoo ASA @Elegoo Giga.json	
@@ -1,9 +1,10 @@
 {
     "type": "filament",
+    "filament_id": "GFB98",
+    "setting_id": "GFSA04",
     "name": "Elegoo ASA @Elegoo Giga",
     "inherits": "Elegoo Generic ASA",
     "from": "system",
-    "setting_id": "EASAEOSG00",
     "instantiation": "true",
     "filament_max_volumetric_speed": [
         "30"
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic ASA.json b/resources/profiles/Elegoo/filament/Elegoo Generic ASA.json
index 20abe3e5a8..c45a4095df 100644
--- a/resources/profiles/Elegoo/filament/Elegoo Generic ASA.json	
+++ b/resources/profiles/Elegoo/filament/Elegoo Generic ASA.json	
@@ -1,10 +1,11 @@
 {
     "type": "filament",
+    "filament_id": "GFB98",
+    "setting_id": "GFSA04",
     "name": "Elegoo Generic ASA",
     "inherits": "fdm_filament_asa",
     "from": "system",
-    "filament_id": "EASAB00",
-    "instantiation": "false",
+    "instantiation": "true",
     "filament_vendor": [
         "Elegoo"
     ],
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic PETG PRO.json b/resources/profiles/Elegoo/filament/Elegoo Generic PETG PRO.json
index 7d62bb1951..444d6524b1 100644
--- a/resources/profiles/Elegoo/filament/Elegoo Generic PETG PRO.json	
+++ b/resources/profiles/Elegoo/filament/Elegoo Generic PETG PRO.json	
@@ -1,10 +1,11 @@
 {
     "type": "filament",
+    "filament_id": "GFG99",
+	  "setting_id": "GFSG99",
     "name": "Elegoo Generic PETG PRO",
     "inherits": "fdm_filament_pet",
     "from": "system",
-    "filament_id": "EPETGPROB00",
-    "instantiation": "false",
+    "instantiation": "true",
     "cool_plate_temp": [
       "0"
     ],
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic PLA Matte.json b/resources/profiles/Elegoo/filament/Elegoo Generic PLA Matte.json
index 56619258af..bad35c3b98 100644
--- a/resources/profiles/Elegoo/filament/Elegoo Generic PLA Matte.json	
+++ b/resources/profiles/Elegoo/filament/Elegoo Generic PLA Matte.json	
@@ -1,10 +1,11 @@
 {
     "type": "filament",
+    "filament_id": "GFL99",
+	"setting_id": "GFSL99",
     "name": "Elegoo Generic PLA Matte",
     "inherits": "fdm_filament_pla",
     "from": "system",
-    "filament_id": "EPLAMB00",
-    "instantiation": "false",
+    "instantiation": "true",
     "filament_cost": [
         "0"
     ],
diff --git a/resources/profiles/Elegoo/filament/Elegoo Generic PLA Silk.json b/resources/profiles/Elegoo/filament/Elegoo Generic PLA Silk.json
deleted file mode 100644
index 3738329d98..0000000000
--- a/resources/profiles/Elegoo/filament/Elegoo Generic PLA Silk.json	
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "type": "filament",
-    "name": "Elegoo Generic PLA Silk",
-    "inherits": "fdm_filament_pla",
-    "from": "system",
-    "filament_id": "EPLASB00",
-    "instantiation": "false",
-    "filament_cost": [
-        "0"
-    ],
-    "filament_density": [
-        "1.32"
-    ],
-    "filament_vendor": [
-        "Elegoo"
-    ],
-    "filament_max_volumetric_speed": [
-         "16"
-    ],
-    "nozzle_temperature": [
-        "230"
-    ],
-    "nozzle_temperature_initial_layer": [
-        "230"
-    ],
-    "filament_start_gcode": [
-        "; filament start gcode\n"
-    ]
-}
\ No newline at end of file
diff --git a/resources/profiles/Elegoo/filament/Elegoo PETG PRO @Elegoo Giga.json b/resources/profiles/Elegoo/filament/Elegoo PETG PRO @Elegoo Giga.json
index 1af78a003c..55a85981cd 100644
--- a/resources/profiles/Elegoo/filament/Elegoo PETG PRO @Elegoo Giga.json	
+++ b/resources/profiles/Elegoo/filament/Elegoo PETG PRO @Elegoo Giga.json	
@@ -1,9 +1,10 @@
 {
   "type": "filament",
+  "filament_id": "GFG99",
+	"setting_id": "GFSG99",
   "name": "Elegoo PETG PRO @Elegoo Giga",
-  "inherits": "Elegoo PETG PRO @base",
+  "inherits": "Elegoo Generic PETG PRO",
   "from": "system",
-  "setting_id": "EGPETGEOSG00",
   "instantiation": "true",
   "filament_max_volumetric_speed": [
     "21"
diff --git a/resources/profiles/Elegoo/filament/Elegoo PLA @Elegoo Giga.json b/resources/profiles/Elegoo/filament/Elegoo PLA @Elegoo Giga.json
index 00d422ae0e..abb545591a 100644
--- a/resources/profiles/Elegoo/filament/Elegoo PLA @Elegoo Giga.json	
+++ b/resources/profiles/Elegoo/filament/Elegoo PLA @Elegoo Giga.json	
@@ -1,9 +1,10 @@
 {
   "type": "filament",
+  "filament_id": "GFL99",
+	"setting_id": "GFSL99",
   "name": "Elegoo PLA @Elegoo Giga",
   "inherits": "Elegoo Generic PLA",
   "from": "system",
-  "setting_id": "EPLAEOSG00",
   "instantiation": "true",
   "filament_max_volumetric_speed": [
     "30"
diff --git a/resources/profiles/Elegoo/filament/Elegoo PLA Matte @Elegoo Giga.json b/resources/profiles/Elegoo/filament/Elegoo PLA Matte @Elegoo Giga.json
index 65f3a58c80..c5d0f84f41 100644
--- a/resources/profiles/Elegoo/filament/Elegoo PLA Matte @Elegoo Giga.json	
+++ b/resources/profiles/Elegoo/filament/Elegoo PLA Matte @Elegoo Giga.json	
@@ -1,9 +1,10 @@
 {
     "type": "filament",
+    "filament_id": "GFL99",
+	"setting_id": "GFSL99",
     "name": "Elegoo PLA Matte @Elegoo Giga",
     "inherits": "Elegoo Generic PLA Matte",
     "from": "system",
-    "setting_id": "EPLAMEOSG00",
     "instantiation": "true",
     "fan_cooling_layer_time": [
         "80"