From eaf3c1f1dd6366c8befaef4b0685344dfb7f6f55 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Sat, 22 Oct 2016 15:36:22 +0200 Subject: [PATCH 1/2] Correct machine reference --- resources/extruders/punchtec_connect_xl_extruder_left.def.json | 2 +- resources/extruders/punchtec_connect_xl_extruder_right.def.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/extruders/punchtec_connect_xl_extruder_left.def.json b/resources/extruders/punchtec_connect_xl_extruder_left.def.json index 4bc6bc8b84..b618999fc2 100644 --- a/resources/extruders/punchtec_connect_xl_extruder_left.def.json +++ b/resources/extruders/punchtec_connect_xl_extruder_left.def.json @@ -4,7 +4,7 @@ "name": "0", "inherits": "fdmextruder", "metadata": { - "machine": "ord", + "machine": "punchtec_connect_xl", "position": "0" }, diff --git a/resources/extruders/punchtec_connect_xl_extruder_right.def.json b/resources/extruders/punchtec_connect_xl_extruder_right.def.json index f5df25c27c..1173bb5584 100644 --- a/resources/extruders/punchtec_connect_xl_extruder_right.def.json +++ b/resources/extruders/punchtec_connect_xl_extruder_right.def.json @@ -4,7 +4,7 @@ "name": "1", "inherits": "fdmextruder", "metadata": { - "machine": "ord", + "machine": "punchtec_connect_xl", "position": "1" }, From 0597610388fe6faee4ced19e9ed1a8638f905ee7 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Sat, 22 Oct 2016 15:37:28 +0200 Subject: [PATCH 2/2] Add known manufacturers, make capitalization consistent --- resources/definitions/bfb.def.json | 2 +- resources/definitions/julia.def.json | 4 ++-- resources/definitions/kupido.def.json | 2 +- resources/definitions/makerbotreplicator.def.json | 2 +- resources/definitions/ord.def.json | 4 ++-- resources/definitions/punchtec_connect_xl.def.json | 2 +- resources/definitions/rigid3d.def.json | 2 +- resources/definitions/rigid3d_3rdgen.def.json | 4 ++-- resources/definitions/rigid3d_hobby.def.json | 4 ++-- resources/definitions/rigid3d_zero.def.json | 4 ++-- resources/definitions/robo_3d_r1.def.json | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/resources/definitions/bfb.def.json b/resources/definitions/bfb.def.json index 8f883dc8d7..b685b3d94d 100644 --- a/resources/definitions/bfb.def.json +++ b/resources/definitions/bfb.def.json @@ -6,7 +6,7 @@ "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "BFB", "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] diff --git a/resources/definitions/julia.def.json b/resources/definitions/julia.def.json index fecf1bd5c1..8d908de5e0 100644 --- a/resources/definitions/julia.def.json +++ b/resources/definitions/julia.def.json @@ -1,12 +1,12 @@ { "id": "julia", - "name": "julia", + "name": "Julia", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "Fracktal", "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json index ce0a65741f..2555a14e89 100644 --- a/resources/definitions/kupido.def.json +++ b/resources/definitions/kupido.def.json @@ -6,7 +6,7 @@ "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "Kupido", "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] diff --git a/resources/definitions/makerbotreplicator.def.json b/resources/definitions/makerbotreplicator.def.json index 115fd4bd21..9c49f301bd 100644 --- a/resources/definitions/makerbotreplicator.def.json +++ b/resources/definitions/makerbotreplicator.def.json @@ -6,7 +6,7 @@ "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "MakerBot", "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] diff --git a/resources/definitions/ord.def.json b/resources/definitions/ord.def.json index ffa6d2be74..7b954298f7 100644 --- a/resources/definitions/ord.def.json +++ b/resources/definitions/ord.def.json @@ -1,12 +1,12 @@ { "id": "ord", - "name": "Ord", + "name": "ORD", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "ORD Solutions", "category": "Other", "file_formats": "text/x-gcode", "machine_extruder_trains": diff --git a/resources/definitions/punchtec_connect_xl.def.json b/resources/definitions/punchtec_connect_xl.def.json index 81b71b9cb0..e9d63cbb33 100644 --- a/resources/definitions/punchtec_connect_xl.def.json +++ b/resources/definitions/punchtec_connect_xl.def.json @@ -6,7 +6,7 @@ "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "Punchtec", "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] diff --git a/resources/definitions/rigid3d.def.json b/resources/definitions/rigid3d.def.json index e067c6147e..b167646f6e 100644 --- a/resources/definitions/rigid3d.def.json +++ b/resources/definitions/rigid3d.def.json @@ -6,7 +6,7 @@ "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "Rigid3D", "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] diff --git a/resources/definitions/rigid3d_3rdgen.def.json b/resources/definitions/rigid3d_3rdgen.def.json index 4df0466df5..e7c73ed54d 100644 --- a/resources/definitions/rigid3d_3rdgen.def.json +++ b/resources/definitions/rigid3d_3rdgen.def.json @@ -1,12 +1,12 @@ { "id": "rigid3d_3rdgen", - "name": "rigid3d_3rdGen", + "name": "Rigid3D 3rdGen", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "Rigid3D", "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] diff --git a/resources/definitions/rigid3d_hobby.def.json b/resources/definitions/rigid3d_hobby.def.json index fe46a3c7d6..09ba77f63c 100644 --- a/resources/definitions/rigid3d_hobby.def.json +++ b/resources/definitions/rigid3d_hobby.def.json @@ -1,12 +1,12 @@ { "id": "rigid3d_hobby", - "name": "RIGID3D HOBBY", + "name": "Rigid3D Hobby", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "Rigid3D", "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] diff --git a/resources/definitions/rigid3d_zero.def.json b/resources/definitions/rigid3d_zero.def.json index a3e254c1a3..e5b24baa4d 100644 --- a/resources/definitions/rigid3d_zero.def.json +++ b/resources/definitions/rigid3d_zero.def.json @@ -1,12 +1,12 @@ { "id": "rigid3d_zero", - "name": "Rigid3d_Zero", + "name": "Rigid3D Zero", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "Rigid3D", "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0] diff --git a/resources/definitions/robo_3d_r1.def.json b/resources/definitions/robo_3d_r1.def.json index fa84b74e0d..4ba3f2eb73 100644 --- a/resources/definitions/robo_3d_r1.def.json +++ b/resources/definitions/robo_3d_r1.def.json @@ -1,12 +1,12 @@ { "id": "robo_3d_r1", - "name": "ROBO 3D R1", + "name": "Robo R1", "version": 2, "inherits": "fdmprinter", "metadata": { "visible": true, "author": "Ultimaker", - "manufacturer": "Unknown", + "manufacturer": "Robo 3D", "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0]