From f9f2148cf840002204fc66e4e0ab7623edbf3da7 Mon Sep 17 00:00:00 2001
From: Heiko Liebscher <hliebscher@idn.de>
Date: Wed, 5 Apr 2023 11:26:41 +0200
Subject: [PATCH] j1 id fix

---
 resources/profiles/Snapmaker/filament/Snapmaker J1 ABS.json   | 2 +-
 resources/profiles/Snapmaker/filament/Snapmaker J1 ASA.json   | 2 +-
 resources/profiles/Snapmaker/filament/Snapmaker J1 PA-CF.json | 2 +-
 resources/profiles/Snapmaker/filament/Snapmaker J1 PA.json    | 2 +-
 resources/profiles/Snapmaker/filament/Snapmaker J1 PC.json    | 2 +-
 resources/profiles/Snapmaker/filament/Snapmaker J1 PETG.json  | 2 +-
 .../profiles/Snapmaker/filament/Snapmaker J1 PLA-CF.json      | 2 +-
 resources/profiles/Snapmaker/filament/Snapmaker J1 PLA.json   | 2 +-
 resources/profiles/Snapmaker/filament/Snapmaker J1 PVA.json   | 2 +-
 resources/profiles/Snapmaker/filament/Snapmaker J1 TPU.json   | 2 +-
 .../profiles/Snapmaker/machine/Snapmaker J1 0.4 nozzle .json  | 2 +-
 .../profiles/Snapmaker/machine/Snapmaker J1 0.6 nozzle .json  | 2 +-
 resources/profiles/Snapmaker/machine/Snapmaker J1.json        | 4 ++--
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 ABS.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 ABS.json
index 69455c47d73..ab9f85f8f6d 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker J1 ABS.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 ABS.json	
@@ -1,7 +1,7 @@
 {
     "type": "filament",
     "filament_id": "GFB99",
-    "setting_id": "GFSA04",
+    "setting_id": "GFSX04",
     "name": "Snapmaker J1 ABS",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 ASA.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 ASA.json
index 15e055d837d..cf5ed9ba5a4 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker J1 ASA.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 ASA.json	
@@ -1,7 +1,7 @@
 {
     "type": "filament",
     "filament_id": "GFB98",
-    "setting_id": "GFSA04",
+    "setting_id": "GFSX04",
     "name": "Snapmaker J1 ASA",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 PA-CF.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 PA-CF.json
index 2a5b5f5514a..b0fae488fb3 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker J1 PA-CF.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 PA-CF.json	
@@ -1,7 +1,7 @@
 {
     "type": "filament",
     "filament_id": "GFN98",
-    "setting_id": "GFSA04",
+    "setting_id": "GFSX04",
     "name": "Snapmaker J1 PA-CF",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 PA.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 PA.json
index 9798d1f1084..9c8ac4bd19c 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker J1 PA.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 PA.json	
@@ -1,7 +1,7 @@
 {
     "type": "filament",
     "filament_id": "GFN99",
-    "setting_id": "GFSA04",
+    "setting_id": "GFSX04",
     "name": "Snapmaker J1 PA",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 PC.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 PC.json
index cfe60d4aaa8..89d0d0cc8b3 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker J1 PC.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 PC.json	
@@ -1,7 +1,7 @@
 {
     "type": "filament",
     "filament_id": "GFC99",
-    "setting_id": "GFSA04",
+    "setting_id": "GFSX04",
     "name": "Snapmaker J1 PC",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 PETG.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 PETG.json
index 9a186d318ea..365b2f76dcc 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker J1 PETG.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 PETG.json	
@@ -1,7 +1,7 @@
 {
     "type": "filament",
     "filament_id": "GFG99",
-    "setting_id": "GFSA04",
+    "setting_id": "GFSX04",
     "name": "Snapmaker J1 PETG",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA-CF.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA-CF.json
index 7232874e5b2..8a8f174a9e7 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA-CF.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA-CF.json	
@@ -1,7 +1,7 @@
 {
     "type": "filament",
     "filament_id": "GFL98",
-    "setting_id": "GFSA04",
+    "setting_id": "GFSX04",
     "name": "Snapmaker J1 PLA-CF",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA.json
index bc15581ec0a..10e830746d2 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 PLA.json	
@@ -1,7 +1,7 @@
 {
     "type": "filament",
     "filament_id": "GFL99",
-    "setting_id": "GFSA04",
+    "setting_id": "GFSX04",
     "name": "Snapmaker J1 PLA",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 PVA.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 PVA.json
index 0afe945daf2..092ac485476 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker J1 PVA.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 PVA.json	
@@ -1,7 +1,7 @@
 {
     "type": "filament",
     "filament_id": "GFS99",
-    "setting_id": "GFSA04",
+    "setting_id": "GFSX04",
     "name": "Snapmaker J1 PVA",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/Snapmaker/filament/Snapmaker J1 TPU.json b/resources/profiles/Snapmaker/filament/Snapmaker J1 TPU.json
index 6f6b8c8a006..1208b4fe3bf 100644
--- a/resources/profiles/Snapmaker/filament/Snapmaker J1 TPU.json	
+++ b/resources/profiles/Snapmaker/filament/Snapmaker J1 TPU.json	
@@ -1,7 +1,7 @@
 {
     "type": "filament",
     "filament_id": "GFU99",
-    "setting_id": "GFSA04",
+    "setting_id": "GFSX04",
     "name": "Snapmaker J1 TPU",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/Snapmaker/machine/Snapmaker J1 0.4 nozzle .json b/resources/profiles/Snapmaker/machine/Snapmaker J1 0.4 nozzle .json
index 921c032f799..956c56888c3 100644
--- a/resources/profiles/Snapmaker/machine/Snapmaker J1 0.4 nozzle .json	
+++ b/resources/profiles/Snapmaker/machine/Snapmaker J1 0.4 nozzle .json	
@@ -1,6 +1,6 @@
 {
     "type": "machine",
-    "setting_id": "GM003",
+    "setting_id": "GM010",
     "name": "Snapmaker J1 0.4 nozzle",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/Snapmaker/machine/Snapmaker J1 0.6 nozzle .json b/resources/profiles/Snapmaker/machine/Snapmaker J1 0.6 nozzle .json
index 865b40db599..ef02997c0fe 100644
--- a/resources/profiles/Snapmaker/machine/Snapmaker J1 0.6 nozzle .json	
+++ b/resources/profiles/Snapmaker/machine/Snapmaker J1 0.6 nozzle .json	
@@ -1,6 +1,6 @@
 {
     "type": "machine",
-    "setting_id": "GM003",
+    "setting_id": "GM009",
     "name": "Snapmaker J1 0.6 nozzle",
     "from": "system",
     "instantiation": "true",
diff --git a/resources/profiles/Snapmaker/machine/Snapmaker J1.json b/resources/profiles/Snapmaker/machine/Snapmaker J1.json
index 6813a9d8592..18fcc0d1145 100644
--- a/resources/profiles/Snapmaker/machine/Snapmaker J1.json	
+++ b/resources/profiles/Snapmaker/machine/Snapmaker J1.json	
@@ -2,11 +2,11 @@
     "type": "machine_model",
     "name": "Snapmaker J1",
     "model_id": "SnapmakerJ1",
-    "nozzle_diameter": "0.4,0,6",
+    "nozzle_diameter": "0.4;0,6",
     "machine_tech": "FFF",
     "family": "Snapmaker",
     "bed_model": "",
-    "bed_texture": "",
+    "bed_texture": "j1_texture.svg",
     "hotend_model": "hotend.stl",
     "default_materials": "Snapmaker J1 ABS;Snapmaker J1 PLA;Snapmaker J1 PLA-CF;Snapmaker J1 PETG;Snapmaker J1 TPU;Snapmaker J1 ASA;Snapmaker J1 PC;Snapmaker J1 PVA;Snapmaker J1 PA;Snapmaker J1 PA-CF"
 }