From 546aa5fb82485851ef70e2ed0e2278c4e60b2441 Mon Sep 17 00:00:00 2001 From: Jinbuhm Kim Date: Fri, 14 Dec 2018 13:06:57 +0900 Subject: [PATCH 1/4] Added definition for Creatable D3 https://creatablelabs.com/ --- resources/definitions/creatable_d3.def.json | 46 +++++++++++++++++++ .../creatable_d3_extruder_def.json | 16 +++++++ 2 files changed, 62 insertions(+) create mode 100644 resources/definitions/creatable_d3.def.json create mode 100644 resources/definitions/creatable_d3_extruder_def.json diff --git a/resources/definitions/creatable_d3.def.json b/resources/definitions/creatable_d3.def.json new file mode 100644 index 0000000000..06b84dbf66 --- /dev/null +++ b/resources/definitions/creatable_d3.def.json @@ -0,0 +1,46 @@ +{ + "version": 2, + "name": "Creatable D3", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Creatable Labs", + "manufacturer": "Ateam Ventures Co. Ltd.", + "file_formats": "text/x-gcode", + "icon": "icon_ultimaker.png", + "platform": "rostock_platform.stl", + "has_materials": false, + "machine_extruder_trains": + { + "0": "creatable_d3_extruder" + }, + }, + + "overrides": { + "machine_name": { "default_value": "Creatable D3" }, + "machine_center_is_zero": { "default_value": true }, + "machine_gcode_flavor": { "default_value": "RepRap (RepRap)" }, + "machine_width": { "default_value": 250 }, + "machine_height": { "default_value": 200 }, + "machine_depth": { "default_value": 250 }, + "machine_heated_bed": { "default_value": true }, + "machine_shape": { "default_value": "elliptic" }, + "machine_max_feedrate_z": { "default_value": 300 }, + "gantry_height": {"default_value": 43}, + "layer_height": { "default_value": 0.1 }, + "relative_extrusion": { "default_value": false }, + "retraction_combing": { "default_value": "off" }, + "retraction_hop_enabled": { "default_value": true }, + "retraction_hop_only_when_collides": { "default_value": false }, + "retraction_retract_speed": { "default_value": 100 }, + "retraction_speed": { "default_value": 100 }, + "retraction_amount": { "default_value": 4.5 }, + "retraction_prime_speed": { "default_value": 45 }, + "machine_start_gcode": { + "default_value": "G21\nG90\nM82\nM106 S255\nG28\nG92 E0\nG1 Z100 F5000\nM190 S50\nM109 S200\nG1 X-135\nG1 Z0.3\nG92 E-32\nG1 E0 F1000\nG1 E50 F200\nG1 F1000\nG1 X-125\nG92 E0" + }, + "machine_end_gcode": { + "default_value": "M400\nG28\nM104 S0\nM140 S0\nM107\nG92 E0\nG1 E-32 F300\nM84\nG90" + } + } +} diff --git a/resources/definitions/creatable_d3_extruder_def.json b/resources/definitions/creatable_d3_extruder_def.json new file mode 100644 index 0000000000..dd1a228348 --- /dev/null +++ b/resources/definitions/creatable_d3_extruder_def.json @@ -0,0 +1,16 @@ +{ + "id": "creatable_d3_extruder", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "Creatable D3", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} From db17116b370b20889a5a11bb634c8ed1e21c5f9c Mon Sep 17 00:00:00 2001 From: Jinbuhm Kim Date: Tue, 22 Jan 2019 11:56:18 +0900 Subject: [PATCH 2/4] Fix Json error --- resources/definitions/creatable_d3.def.json | 2 +- .../{definitions => extruders}/creatable_d3_extruder_def.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename resources/{definitions => extruders}/creatable_d3_extruder_def.json (90%) diff --git a/resources/definitions/creatable_d3.def.json b/resources/definitions/creatable_d3.def.json index 06b84dbf66..7922d091cf 100644 --- a/resources/definitions/creatable_d3.def.json +++ b/resources/definitions/creatable_d3.def.json @@ -13,7 +13,7 @@ "machine_extruder_trains": { "0": "creatable_d3_extruder" - }, + } }, "overrides": { diff --git a/resources/definitions/creatable_d3_extruder_def.json b/resources/extruders/creatable_d3_extruder_def.json similarity index 90% rename from resources/definitions/creatable_d3_extruder_def.json rename to resources/extruders/creatable_d3_extruder_def.json index dd1a228348..59ac352c6b 100644 --- a/resources/definitions/creatable_d3_extruder_def.json +++ b/resources/extruders/creatable_d3_extruder_def.json @@ -4,7 +4,7 @@ "name": "Extruder 1", "inherits": "fdmextruder", "metadata": { - "machine": "Creatable D3", + "machine": "Creatable_D3", "position": "0" }, From d1d344d739b0ae97f0964f1284eea33d31739f08 Mon Sep 17 00:00:00 2001 From: Jinbuhm Kim Date: Tue, 22 Jan 2019 20:56:44 +0900 Subject: [PATCH 3/4] change the extruder name & file name --- resources/definitions/creatable_d3.def.json | 2 +- ...le_d3_extruder_def.json => creatable_d3_extruder_0.def.json} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename resources/extruders/{creatable_d3_extruder_def.json => creatable_d3_extruder_0.def.json} (90%) diff --git a/resources/definitions/creatable_d3.def.json b/resources/definitions/creatable_d3.def.json index 7922d091cf..627a3d316d 100644 --- a/resources/definitions/creatable_d3.def.json +++ b/resources/definitions/creatable_d3.def.json @@ -12,7 +12,7 @@ "has_materials": false, "machine_extruder_trains": { - "0": "creatable_d3_extruder" + "0": "creatable_d3_extruder_0" } }, diff --git a/resources/extruders/creatable_d3_extruder_def.json b/resources/extruders/creatable_d3_extruder_0.def.json similarity index 90% rename from resources/extruders/creatable_d3_extruder_def.json rename to resources/extruders/creatable_d3_extruder_0.def.json index 59ac352c6b..7d45bb8e8a 100644 --- a/resources/extruders/creatable_d3_extruder_def.json +++ b/resources/extruders/creatable_d3_extruder_0.def.json @@ -1,5 +1,5 @@ { - "id": "creatable_d3_extruder", + "id": "creatable_d3_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", From 18cea54780c413a0aa290570bb1e31493babcb9c Mon Sep 17 00:00:00 2001 From: Jinbuhm Kim Date: Tue, 22 Jan 2019 21:22:28 +0900 Subject: [PATCH 4/4] Fix material menu issue --- resources/definitions/creatable_d3.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/creatable_d3.def.json b/resources/definitions/creatable_d3.def.json index 627a3d316d..3fb1205ead 100644 --- a/resources/definitions/creatable_d3.def.json +++ b/resources/definitions/creatable_d3.def.json @@ -9,7 +9,6 @@ "file_formats": "text/x-gcode", "icon": "icon_ultimaker.png", "platform": "rostock_platform.stl", - "has_materials": false, "machine_extruder_trains": { "0": "creatable_d3_extruder_0"