From 3606ac8bd61f145756ab296942274fe7a79f0d5c Mon Sep 17 00:00:00 2001 From: F-Fischer Date: Mon, 16 Sep 2019 16:23:35 -0300 Subject: [PATCH 1/2] Hellbot printers definitions added --- resources/definitions/hellbot_adonis.def.json | 33 +++++++++ .../definitions/hellbot_magna_I.def.json | 33 +++++++++ .../definitions/hellbot_magna_dual.def.json | 34 +++++++++ .../hellbot_adonis_extruder.def.json | 16 ++++ .../hellbot_magna_dual_extruder_1.def.json | 16 ++++ .../hellbot_magna_dual_extruder_2.def.json | 16 ++++ .../hellbot_magna_i_extruder.def.json | 16 ++++ resources/images/hellbot.png | Bin 0 -> 38425 bytes resources/meshes/hellbot_adonis.obj | 70 ++++++++++++++++++ resources/meshes/hellbot_magna.obj | 70 ++++++++++++++++++ 10 files changed, 304 insertions(+) create mode 100644 resources/definitions/hellbot_adonis.def.json create mode 100644 resources/definitions/hellbot_magna_I.def.json create mode 100644 resources/definitions/hellbot_magna_dual.def.json create mode 100644 resources/extruders/hellbot_adonis_extruder.def.json create mode 100644 resources/extruders/hellbot_magna_dual_extruder_1.def.json create mode 100644 resources/extruders/hellbot_magna_dual_extruder_2.def.json create mode 100644 resources/extruders/hellbot_magna_i_extruder.def.json create mode 100644 resources/images/hellbot.png create mode 100644 resources/meshes/hellbot_adonis.obj create mode 100644 resources/meshes/hellbot_magna.obj diff --git a/resources/definitions/hellbot_adonis.def.json b/resources/definitions/hellbot_adonis.def.json new file mode 100644 index 0000000000..25c120eb8e --- /dev/null +++ b/resources/definitions/hellbot_adonis.def.json @@ -0,0 +1,33 @@ + { + "version": 2, + "name": "Hellbot Adonis", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "MUX team", + "manufacturer": "Hellbot", + "file_formats": "text/x-gcode", + "platform": "hellbot_adonis.obj", + "platform_texture": "hellbot.png", + "platform_offset": [0, -1, 0], + "has_materials": true, + "machine_extruder_trains": { + "0": "hellbot_adonis_extruder" + } + }, + "overrides": { + "machine_name": { + "default_value": "Hellbot Adonis" + }, + "machine_width": { + "default_value": 160 + }, + "machine_depth": { + "default_value": 160 + }, + "machine_height": { + "default_value": 160 + } + + } + } diff --git a/resources/definitions/hellbot_magna_I.def.json b/resources/definitions/hellbot_magna_I.def.json new file mode 100644 index 0000000000..cf9762f134 --- /dev/null +++ b/resources/definitions/hellbot_magna_I.def.json @@ -0,0 +1,33 @@ + { + "version": 2, + "name": "Hellbot Magna I", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "MUX team", + "manufacturer": "Hellbot", + "file_formats": "text/x-gcode", + "platform": "hellbot_magna.obj", + "platform_texture": "hellbot.png", + "platform_offset": [0, -1, 0], + "has_materials": true, + "machine_extruder_trains": { + "0": "hellbot_magna_i_extruder" + } + }, + "overrides": { + "machine_name": { + "default_value": "Hellbot Magna I" + }, + "machine_width": { + "default_value": 230 + }, + "machine_depth": { + "default_value": 220 + }, + "machine_height": { + "default_value": 260 + } + + } + } diff --git a/resources/definitions/hellbot_magna_dual.def.json b/resources/definitions/hellbot_magna_dual.def.json new file mode 100644 index 0000000000..5fa59e5a19 --- /dev/null +++ b/resources/definitions/hellbot_magna_dual.def.json @@ -0,0 +1,34 @@ + { + "version": 2, + "name": "Hellbot Magna dual", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "MUX team", + "manufacturer": "Hellbot", + "file_formats": "text/x-gcode", + "platform": "hellbot_magna.obj", + "platform_texture": "hellbot.png", + "platform_offset": [0, -1, 0], + "has_materials": true, + "machine_extruder_trains": { + "0": "hellbot_magna_dual_extruder_1", + "1": "hellbot_magna_dual_extruder_2" + } + }, + "overrides": { + "machine_name": { + "default_value": "Hellbot Magna I" + }, + "machine_width": { + "default_value": 220 + }, + "machine_depth": { + "default_value": 220 + }, + "machine_height": { + "default_value": 260 + } + + } + } diff --git a/resources/extruders/hellbot_adonis_extruder.def.json b/resources/extruders/hellbot_adonis_extruder.def.json new file mode 100644 index 0000000000..3da0e95ef3 --- /dev/null +++ b/resources/extruders/hellbot_adonis_extruder.def.json @@ -0,0 +1,16 @@ + { + "id": "hellbot_adonis_extruder", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "hellbot_adonis", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/hellbot_magna_dual_extruder_1.def.json b/resources/extruders/hellbot_magna_dual_extruder_1.def.json new file mode 100644 index 0000000000..f46290b503 --- /dev/null +++ b/resources/extruders/hellbot_magna_dual_extruder_1.def.json @@ -0,0 +1,16 @@ + { + "id": "hellbot_magna_dual_extruder_1", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "hellbot_magna_dual", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/hellbot_magna_dual_extruder_2.def.json b/resources/extruders/hellbot_magna_dual_extruder_2.def.json new file mode 100644 index 0000000000..5894970b78 --- /dev/null +++ b/resources/extruders/hellbot_magna_dual_extruder_2.def.json @@ -0,0 +1,16 @@ + { + "id": "hellbot_magna_dual_extruder_2", + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "hellbot_magna_dual", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 1 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/hellbot_magna_i_extruder.def.json b/resources/extruders/hellbot_magna_i_extruder.def.json new file mode 100644 index 0000000000..bb0822407c --- /dev/null +++ b/resources/extruders/hellbot_magna_i_extruder.def.json @@ -0,0 +1,16 @@ + { + "id": "hellbot_magna_i_extruder", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "hellbot_magna_i", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/images/hellbot.png b/resources/images/hellbot.png new file mode 100644 index 0000000000000000000000000000000000000000..e39ac419dcabc0e09128ae7cc4561ca743c28c1d GIT binary patch literal 38425 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 Date: Wed, 25 Sep 2019 13:52:42 -0300 Subject: [PATCH 2/2] Pull Request Requested changes --- resources/definitions/hellbot_magna_I.def.json | 6 +++--- resources/definitions/hellbot_magna_dual.def.json | 4 ++-- resources/extruders/hellbot_magna_dual_extruder_2.def.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/definitions/hellbot_magna_I.def.json b/resources/definitions/hellbot_magna_I.def.json index cf9762f134..fd7aa32684 100644 --- a/resources/definitions/hellbot_magna_I.def.json +++ b/resources/definitions/hellbot_magna_I.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Hellbot Magna I", + "name": "Hellbot Magna 1", "inherits": "fdmprinter", "metadata": { "visible": true, @@ -17,10 +17,10 @@ }, "overrides": { "machine_name": { - "default_value": "Hellbot Magna I" + "default_value": "Hellbot Magna 1" }, "machine_width": { - "default_value": 230 + "default_value": 220 }, "machine_depth": { "default_value": 220 diff --git a/resources/definitions/hellbot_magna_dual.def.json b/resources/definitions/hellbot_magna_dual.def.json index 5fa59e5a19..e258638a51 100644 --- a/resources/definitions/hellbot_magna_dual.def.json +++ b/resources/definitions/hellbot_magna_dual.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "Hellbot Magna dual", + "name": "Hellbot Magna DUAL", "inherits": "fdmprinter", "metadata": { "visible": true, @@ -18,7 +18,7 @@ }, "overrides": { "machine_name": { - "default_value": "Hellbot Magna I" + "default_value": "Hellbot Magna DUAL" }, "machine_width": { "default_value": 220 diff --git a/resources/extruders/hellbot_magna_dual_extruder_2.def.json b/resources/extruders/hellbot_magna_dual_extruder_2.def.json index 5894970b78..ffa0831bd7 100644 --- a/resources/extruders/hellbot_magna_dual_extruder_2.def.json +++ b/resources/extruders/hellbot_magna_dual_extruder_2.def.json @@ -5,7 +5,7 @@ "inherits": "fdmextruder", "metadata": { "machine": "hellbot_magna_dual", - "position": "0" + "position": "1" }, "overrides": {