From c4380d84597df7d9eff547dec3ef069da9854da4 Mon Sep 17 00:00:00 2001 From: ivovk9 Date: Wed, 26 May 2021 13:06:07 +0200 Subject: [PATCH 1/5] Creasee 3D printers Creasee 3D printers --- creasee_cs20.def.json | 31 +++++++++++++++++++++++++++++++ creasee_cs30.def.json | 31 +++++++++++++++++++++++++++++++ creasee_extruder_0.def.json | 15 +++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 creasee_cs20.def.json create mode 100644 creasee_cs30.def.json create mode 100644 creasee_extruder_0.def.json diff --git a/creasee_cs20.def.json b/creasee_cs20.def.json new file mode 100644 index 0000000000..2ca872957d --- /dev/null +++ b/creasee_cs20.def.json @@ -0,0 +1,31 @@ +{ + "version": 2, + "name": "Creasee CS20", + "inherits": "creasee", + "metadata": { + "visible": true, + "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 new file mode 100644 index 0000000000..ce02732570 --- /dev/null +++ b/creasee_cs30.def.json @@ -0,0 +1,31 @@ +{ + "version": 2, + "name": "Creasee CS30", + "inherits": "creasee", + "metadata": { + "visible": true, + "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/creasee_extruder_0.def.json b/creasee_extruder_0.def.json new file mode 100644 index 0000000000..8b8f13b9ae --- /dev/null +++ b/creasee_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "creasee", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} From 18ea18989d0b12297c92d2eb2e3bee64944eacf0 Mon Sep 17 00:00:00 2001 From: ivovk9 Date: Tue, 1 Jun 2021 16:21:58 +0200 Subject: [PATCH 2/5] Update creasee_cs20.def.json some small changes in the file. --- creasee_cs20.def.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/creasee_cs20.def.json b/creasee_cs20.def.json index 2ca872957d..a3720fe710 100644 --- a/creasee_cs20.def.json +++ b/creasee_cs20.def.json @@ -1,9 +1,10 @@ { "version": 2, "name": "Creasee CS20", - "inherits": "creasee", + "inherits": "fdmprinter", "metadata": { "visible": true, + "manufacturer": "CREASEE", "machine_extruder_trains": { "0": "creasee_extruder_0" From 7eeb92817d7666c7c6786b51fd6ce8496e497c64 Mon Sep 17 00:00:00 2001 From: ivovk9 Date: Tue, 1 Jun 2021 16:24:58 +0200 Subject: [PATCH 3/5] Update creasee_cs30.def.json small changes in the file. --- creasee_cs30.def.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/creasee_cs30.def.json b/creasee_cs30.def.json index ce02732570..954cd4fee3 100644 --- a/creasee_cs30.def.json +++ b/creasee_cs30.def.json @@ -1,9 +1,10 @@ { "version": 2, "name": "Creasee CS30", - "inherits": "creasee", + "inherits": "fdmprinter", "metadata": { "visible": true, + "manufacturer": "CREASEE", "machine_extruder_trains": { "0": "creasee_extruder_0" From 16e2ebd4890ad205bdd734947640ebcb2b3a87bb Mon Sep 17 00:00:00 2001 From: ivovk9 Date: Fri, 25 Jun 2021 09:01:06 +0200 Subject: [PATCH 4/5] moved files to folders moved files to folders --- resources/definitions/creasee_cs20.def.json | 32 +++++++++++++++++++ resources/definitions/creasee_cs30.def.json | 32 +++++++++++++++++++ .../extruders/creasee_extruder_0.def.json | 15 +++++++++ 3 files changed, 79 insertions(+) create mode 100644 resources/definitions/creasee_cs20.def.json create mode 100644 resources/definitions/creasee_cs30.def.json create mode 100644 resources/extruders/creasee_extruder_0.def.json diff --git a/resources/definitions/creasee_cs20.def.json b/resources/definitions/creasee_cs20.def.json new file mode 100644 index 0000000000..a3720fe710 --- /dev/null +++ b/resources/definitions/creasee_cs20.def.json @@ -0,0 +1,32 @@ +{ + "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/resources/definitions/creasee_cs30.def.json b/resources/definitions/creasee_cs30.def.json new file mode 100644 index 0000000000..954cd4fee3 --- /dev/null +++ b/resources/definitions/creasee_cs30.def.json @@ -0,0 +1,32 @@ +{ + "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/extruders/creasee_extruder_0.def.json b/resources/extruders/creasee_extruder_0.def.json new file mode 100644 index 0000000000..8b8f13b9ae --- /dev/null +++ b/resources/extruders/creasee_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "creasee", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} From 375529c2f0702e6df5ea9194abe15057be0d8393 Mon Sep 17 00:00:00 2001 From: ivovk9 Date: Thu, 1 Jul 2021 09:57:06 +0200 Subject: [PATCH 5/5] 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" },