From 375529c2f0702e6df5ea9194abe15057be0d8393 Mon Sep 17 00:00:00 2001
From: ivovk9 <ivan.vovk@fsb.hr>
Date: Thu, 1 Jul 2021 09:57:06 +0200
Subject: [PATCH] new edits and files

new edits and files
---
 creasee_cs20.def.json                         | 32 -------------------
 creasee_cs30.def.json                         | 32 -------------------
 resources/definitions/creasee_cs30.def.json   |  2 +-
 .../extruders/creasee_extruder_0.def.json     |  2 +-
 .../extruders/creasee_extruder_1.def.json     |  2 +-
 5 files changed, 3 insertions(+), 67 deletions(-)
 delete mode 100644 creasee_cs20.def.json
 delete mode 100644 creasee_cs30.def.json
 rename creasee_extruder_0.def.json => resources/extruders/creasee_extruder_1.def.json (89%)

diff --git a/creasee_cs20.def.json b/creasee_cs20.def.json
deleted file mode 100644
index a3720fe710..0000000000
--- a/creasee_cs20.def.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "version": 2,
-    "name": "Creasee CS20",
-    "inherits": "fdmprinter",
-    "metadata": {
-        "visible": true,
-        "manufacturer": "CREASEE",
-        "machine_extruder_trains":
-        {
-            "0": "creasee_extruder_0"
-        }
-    },
-
-    "overrides": {
-        "machine_name": { "default_value": "Creasee CS20" },
-        "machine_width": {
-            "default_value": 220
-        },
-        "machine_depth": {
-            "default_value": 220
-        },
-        "machine_height": {
-            "default_value": 250
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
-    }
-}
diff --git a/creasee_cs30.def.json b/creasee_cs30.def.json
deleted file mode 100644
index 954cd4fee3..0000000000
--- a/creasee_cs30.def.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "version": 2,
-    "name": "Creasee CS30",
-    "inherits": "fdmprinter",
-    "metadata": {
-        "visible": true,
-        "manufacturer": "CREASEE",
-        "machine_extruder_trains":
-        {
-            "0": "creasee_extruder_0"
-        }
-    },
-
-    "overrides": {
-        "machine_name": { "default_value": "Creasee CS30" },
-        "machine_width": {
-            "default_value": 300
-        },
-        "machine_depth": {
-            "default_value": 300
-        },
-        "machine_height": {
-            "default_value": 400
-        },
-        "machine_start_gcode": {
-            "default_value": "G28 ;Home\nG1 Z15.0 F2000 ;Move the platform"
-        },
-        "machine_end_gcode": {
-            "default_value": "M104 S0\nM140 S0\nG92 E0\nG1 E-10 F2000\nG28 X0 Y0\nM84"
-        }
-    }
-}
diff --git a/resources/definitions/creasee_cs30.def.json b/resources/definitions/creasee_cs30.def.json
index 954cd4fee3..b879ecddc0 100644
--- a/resources/definitions/creasee_cs30.def.json
+++ b/resources/definitions/creasee_cs30.def.json
@@ -7,7 +7,7 @@
         "manufacturer": "CREASEE",
         "machine_extruder_trains":
         {
-            "0": "creasee_extruder_0"
+            "0": "creasee_extruder_1"
         }
     },
 
diff --git a/resources/extruders/creasee_extruder_0.def.json b/resources/extruders/creasee_extruder_0.def.json
index 8b8f13b9ae..abefa6b1c8 100644
--- a/resources/extruders/creasee_extruder_0.def.json
+++ b/resources/extruders/creasee_extruder_0.def.json
@@ -3,7 +3,7 @@
     "name": "Extruder 1",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "creasee",
+        "machine": "creasee_cs20",
         "position": "0"
     },
 
diff --git a/creasee_extruder_0.def.json b/resources/extruders/creasee_extruder_1.def.json
similarity index 89%
rename from creasee_extruder_0.def.json
rename to resources/extruders/creasee_extruder_1.def.json
index 8b8f13b9ae..747e1c48f8 100644
--- a/creasee_extruder_0.def.json
+++ b/resources/extruders/creasee_extruder_1.def.json
@@ -3,7 +3,7 @@
     "name": "Extruder 1",
     "inherits": "fdmextruder",
     "metadata": {
-        "machine": "creasee",
+        "machine": "creasee_cs30",
         "position": "0"
     },