From 98992a0b1ba4284b0f3c1545a71a471446ba507e Mon Sep 17 00:00:00 2001 From: moedn Date: Mon, 11 Jan 2021 15:56:08 +0100 Subject: [PATCH 01/38] create okhv2 --- okh.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 okh.json diff --git a/okh.json b/okh.json new file mode 100644 index 0000000..ad3ed6c --- /dev/null +++ b/okh.json @@ -0,0 +1,17 @@ +{ + "okhv": "2.0", + "image": "master/Documentation/User_Guide/User_Guide.jpg", + "documentation-language": "en-GB", + "function": "a weaving loom made of wooden and 3D printed parts", + "patent-class": "D03D 35/00", + "tscd-id": "ASM-MEC", + "simplified-bom": "sBoM.csv", + "development-stage": "prototype", + "functional-metadata": "400mm fabric width", + "production-metadata": "3D printed, wood", + "assembly-instruction": "/Documentation/Assembly_Guide/AssemblyGuide.md", + "version": "1.0", + "spdx-license": "CC-BY-SA-4.0", + "readme": "README.md", + "repo": "https://gitlab.com/OSEGermany/ohloom", + } -- GitLab From 5e5a56678e651e5742ed0bb5c67d104d87321b38 Mon Sep 17 00:00:00 2001 From: moedn Date: Mon, 11 Jan 2021 17:15:06 +0100 Subject: [PATCH 02/38] fix formatting; use original functional description --- okh.json | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/okh.json b/okh.json index ad3ed6c..276e027 100644 --- a/okh.json +++ b/okh.json @@ -1,17 +1,22 @@ { "okhv": "2.0", + "name": "OHLOOM", "image": "master/Documentation/User_Guide/User_Guide.jpg", "documentation-language": "en-GB", - "function": "a weaving loom made of wooden and 3D printed parts", + "function": "The Open Hardware Loom is a simple, hand-operated weaving loom made of wood, screws and 3D printed plastic pieces for the most part. It is simple to make and operate.", "patent-class": "D03D 35/00", "tscd-id": "ASM-MEC", "simplified-bom": "sBoM.csv", "development-stage": "prototype", "functional-metadata": "400mm fabric width", - "production-metadata": "3D printed, wood", - "assembly-instruction": "/Documentation/Assembly_Guide/AssemblyGuide.md", + "production-metadata": [ + "3D printed", + "wood" + ], + "source": "/Documentation/Assembly_Guide/AssemblyGuide.md", "version": "1.0", "spdx-license": "CC-BY-SA-4.0", + "licensor": "Jens Meisner", "readme": "README.md", "repo": "https://gitlab.com/OSEGermany/ohloom", } -- GitLab From e44183d49fa63408190f6cb8ea4f6b28bb59379d Mon Sep 17 00:00:00 2001 From: moedn Date: Mon, 11 Jan 2021 17:15:17 +0100 Subject: [PATCH 03/38] create sBoM --- sBoM.csv | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 sBoM.csv diff --git a/sBoM.csv b/sBoM.csv new file mode 100644 index 0000000..22ee459 --- /dev/null +++ b/sBoM.csv @@ -0,0 +1,24 @@ +NAME QUANTITY TYPE REFERENCE-1 REFERENCE-2 +threaded rod M8 2 STD DIN 795 M8 x 180 +M8 Nuts 4 STD ISO 4032 M8 +M8 Nuts with Rubber 2 STD ISO 7040 M8 +M6 Nuts 4 STD ISO 4032 M6 +M6 Cylinder Screw 4 STD ISO 8677 M6 x ?? +W60x4 Wood Screw 8 STD DIN 7997 4 x 60 +W35x4 Wood Screw 4 STD DIN 7997 4 x 35 +W12x4 Wood Screw 16 STD DIN 7997 4 x 12 +Ratchet Wheel 2 POSH +Clamp Ring 2 POSH ClampRing.json +Comb Module 5 POSH CombModul.json +Ratchet Pawl 2 POSH +Screw Socket w 12 POSH +Screw Socket w/o 4 POSH +Outer Warpcloth Beam (4 parts each) 2 POSH +Comb Holder 2 POSH +Side Frame 2 POSH +Cross Beam 2 POSH +Slot Beam 2 POSH +String Stick 2 POSH +Shuttle 1 POSH +Inner Warpcloth Beam 2 POSH +3m String 1 BUY -- GitLab From 75676ccd32e57f2b62680be7ec6ffbbdf387028f Mon Sep 17 00:00:00 2001 From: moedn Date: Mon, 11 Jan 2021 17:15:23 +0100 Subject: [PATCH 04/38] add POSH --- 3DParts/ClampRing/ClampRing.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 3DParts/ClampRing/ClampRing.json diff --git a/3DParts/ClampRing/ClampRing.json b/3DParts/ClampRing/ClampRing.json new file mode 100644 index 0000000..6b00965 --- /dev/null +++ b/3DParts/ClampRing/ClampRing.json @@ -0,0 +1,18 @@ +{ + "okhv": "2.0", + "name": "Clamp Ring", + "image": "Documentation/Assembly_Guide/Parts_Print_2.jpg", + "tscd-id": "COM-MAN", + "version": "1.0", + "production-metadata": [ + "3D printed", + "PLA", + "cylinder(h=30, r=56) + ], + "repo": "https://gitlab.com/OSEGermany/ohloom", + "source": "ClampRing.scad", + "export": [ + "ClampRing.pdf", + "ClampRing.stl" + ], + } -- GitLab From deacca8d954702e55c039997c2e32f11f41f0d33 Mon Sep 17 00:00:00 2001 From: moedn Date: Mon, 11 Jan 2021 17:15:28 +0100 Subject: [PATCH 05/38] add POSH --- 3DParts/CombModul/CombModul.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 3DParts/CombModul/CombModul.json diff --git a/3DParts/CombModul/CombModul.json b/3DParts/CombModul/CombModul.json new file mode 100644 index 0000000..450c39b --- /dev/null +++ b/3DParts/CombModul/CombModul.json @@ -0,0 +1,18 @@ +{ + "okhv": "2.0", + "name": "Comb Module", + "image": "Documentation/Assembly_Guide/Parts_Print_3.jpg", + "tscd-id": "COM-MAN", + "version": "1.0", + "production-metadata": [ + "3D printed", + "PLA", + "cube(size = [120,100,3] + ], + "repo": "https://gitlab.com/OSEGermany/ohloom", + "source": "ClampRing.scad", + "export": [ + "CombModul.pdf", + "CombModul.stl" + ], + } -- GitLab From c2312cc0911c1876c29a080c7d7eea6adca789f7 Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 12 Jan 2021 16:05:17 +0100 Subject: [PATCH 06/38] rename file --- 3DParts/ClampRing/{ClampRing.json => okh-ClampRing.json} | 6 +++--- 3DParts/CombModul/{CombModul.json => okh-CombModul.json} | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) rename 3DParts/ClampRing/{ClampRing.json => okh-ClampRing.json} (71%) rename 3DParts/CombModul/{CombModul.json => okh-CombModul.json} (72%) diff --git a/3DParts/ClampRing/ClampRing.json b/3DParts/ClampRing/okh-ClampRing.json similarity index 71% rename from 3DParts/ClampRing/ClampRing.json rename to 3DParts/ClampRing/okh-ClampRing.json index 6b00965..d8dfee6 100644 --- a/3DParts/ClampRing/ClampRing.json +++ b/3DParts/ClampRing/okh-ClampRing.json @@ -10,9 +10,9 @@ "cylinder(h=30, r=56) ], "repo": "https://gitlab.com/OSEGermany/ohloom", - "source": "ClampRing.scad", + "source": "/3DParts/ClampRing/ClampRing.scad", "export": [ - "ClampRing.pdf", - "ClampRing.stl" + "/3DParts/ClampRing/ClampRing.pdf", + "/3DParts/ClampRing/ClampRing.stl" ], } diff --git a/3DParts/CombModul/CombModul.json b/3DParts/CombModul/okh-CombModul.json similarity index 72% rename from 3DParts/CombModul/CombModul.json rename to 3DParts/CombModul/okh-CombModul.json index 450c39b..0432d91 100644 --- a/3DParts/CombModul/CombModul.json +++ b/3DParts/CombModul/okh-CombModul.json @@ -10,9 +10,9 @@ "cube(size = [120,100,3] ], "repo": "https://gitlab.com/OSEGermany/ohloom", - "source": "ClampRing.scad", + "source": "/3DParts/CombModul/CombModul.scad", "export": [ - "CombModul.pdf", - "CombModul.stl" + "/3DParts/CombModul/CombModul.pdf", + "/3DParts/CombModul/CombModul.stl" ], } -- GitLab From dcb00340a6dedd8c243e604c9cd9b729cedf488b Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 12 Jan 2021 16:05:28 +0100 Subject: [PATCH 07/38] create POSH --- 3DParts/RatchetPawl/okh-RatchetPawl.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 3DParts/RatchetPawl/okh-RatchetPawl.json diff --git a/3DParts/RatchetPawl/okh-RatchetPawl.json b/3DParts/RatchetPawl/okh-RatchetPawl.json new file mode 100644 index 0000000..150e0da --- /dev/null +++ b/3DParts/RatchetPawl/okh-RatchetPawl.json @@ -0,0 +1,18 @@ +{ + "okhv": "2.0", + "name": "Ratchet Pawl", + "image": "Documentation/Assembly_Guide/Parts_Print_4.jpg", + "tscd-id": "COM-MAN", + "version": "1.0", + "production-metadata": [ + "3D printed", + "PLA", + "cube(size = [130,20,20] + ], + "repo": "https://gitlab.com/OSEGermany/ohloom", + "source": "/3DParts/RatchetPawl/RatchetPawl.scad", + "export": [ + "/3DParts/RatchetPawl/RatchetPawl.pdf", + "/3DParts/RatchetPawl/RatchetPawl.stl" + ], + } -- GitLab From 570d044e0e171706ea05672277877b5e29257a98 Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 12 Jan 2021 16:05:37 +0100 Subject: [PATCH 08/38] update sBoM --- sBoM.csv | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sBoM.csv b/sBoM.csv index 22ee459..cc331bb 100644 --- a/sBoM.csv +++ b/sBoM.csv @@ -7,10 +7,10 @@ M6 Cylinder Screw 4 STD ISO 8677 M6 x ?? W60x4 Wood Screw 8 STD DIN 7997 4 x 60 W35x4 Wood Screw 4 STD DIN 7997 4 x 35 W12x4 Wood Screw 16 STD DIN 7997 4 x 12 -Ratchet Wheel 2 POSH -Clamp Ring 2 POSH ClampRing.json -Comb Module 5 POSH CombModul.json -Ratchet Pawl 2 POSH +Ratchet Wheel 2 POSH /3DParts/RatchetWheel/okh-RatchetWheel.json +Clamp Ring 2 POSH /3DParts/ClampRing/okh-ClampRing.json +Comb Module 5 POSH /3DParts/CombModul/okh-CombModul.json +Ratchet Pawl 2 POSH /3DParts/RatchetPawl/okh-RatchetPawl.json Screw Socket w 12 POSH Screw Socket w/o 4 POSH Outer Warpcloth Beam (4 parts each) 2 POSH -- GitLab From 1aac59b903b7dc8b1bc90b6294223624c9d5c974 Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 12 Jan 2021 16:25:23 +0100 Subject: [PATCH 09/38] add POS column --- sBoM.csv | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/sBoM.csv b/sBoM.csv index cc331bb..f3001ef 100644 --- a/sBoM.csv +++ b/sBoM.csv @@ -1,24 +1,24 @@ -NAME QUANTITY TYPE REFERENCE-1 REFERENCE-2 -threaded rod M8 2 STD DIN 795 M8 x 180 -M8 Nuts 4 STD ISO 4032 M8 -M8 Nuts with Rubber 2 STD ISO 7040 M8 -M6 Nuts 4 STD ISO 4032 M6 -M6 Cylinder Screw 4 STD ISO 8677 M6 x ?? -W60x4 Wood Screw 8 STD DIN 7997 4 x 60 -W35x4 Wood Screw 4 STD DIN 7997 4 x 35 -W12x4 Wood Screw 16 STD DIN 7997 4 x 12 -Ratchet Wheel 2 POSH /3DParts/RatchetWheel/okh-RatchetWheel.json -Clamp Ring 2 POSH /3DParts/ClampRing/okh-ClampRing.json -Comb Module 5 POSH /3DParts/CombModul/okh-CombModul.json -Ratchet Pawl 2 POSH /3DParts/RatchetPawl/okh-RatchetPawl.json -Screw Socket w 12 POSH -Screw Socket w/o 4 POSH -Outer Warpcloth Beam (4 parts each) 2 POSH -Comb Holder 2 POSH -Side Frame 2 POSH -Cross Beam 2 POSH -Slot Beam 2 POSH -String Stick 2 POSH -Shuttle 1 POSH -Inner Warpcloth Beam 2 POSH -3m String 1 BUY +POS NAME UNITS TYPE REFERENCE +1 threaded rod M8 2 STD DIN 795 M8 x 180 +2 M8 Nuts 4 STD ISO 4032 M8 +3 M8 Nuts with Rubber 2 STD ISO 7040 M8 +4 M6 Nuts 4 STD ISO 4032 M6 +5 M6 Cylinder Screw 4 STD ISO 8677 M6 x ?? +6 W60x4 Wood Screw 8 STD DIN 7997 4 x 60 +7 W35x4 Wood Screw 4 STD DIN 7997 4 x 35 +8 W12x4 Wood Screw 16 STD DIN 7997 4 x 12 +9 Ratchet Wheel 2 POSH /3DParts/RatchetWheel/okh-RatchetWheel.json +10 Clamp Ring 2 POSH /3DParts/ClampRing/okh-ClampRing.json +11 Comb Module 5 POSH /3DParts/CombModul/okh-CombModul.json +12 Ratchet Pawl 2 POSH /3DParts/RatchetPawl/okh-RatchetPawl.json +13 Screw Socket w 12 POSH +14 Screw Socket w/o 4 POSH +15 Outer Warpcloth Beam (4 parts each) 2 POSH +16 Comb Holder 2 POSH +17 Side Frame 2 POSH +18 Cross Beam 2 POSH +19 Slot Beam 2 POSH +20 String Stick 2 POSH +21 Shuttle 1 POSH +22 Inner Warpcloth Beam 2 POSH +23 3m String 1 BUY -- GitLab From 3d3ed2ef07b8e99ab33adcfee633a4bf907c4f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20H=C3=A4uer?= Date: Tue, 19 Jan 2021 13:13:49 +0000 Subject: [PATCH 10/38] Update okh-RatchetPawl.json --- 3DParts/RatchetPawl/okh-RatchetPawl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3DParts/RatchetPawl/okh-RatchetPawl.json b/3DParts/RatchetPawl/okh-RatchetPawl.json index 150e0da..6523da4 100644 --- a/3DParts/RatchetPawl/okh-RatchetPawl.json +++ b/3DParts/RatchetPawl/okh-RatchetPawl.json @@ -7,7 +7,7 @@ "production-metadata": [ "3D printed", "PLA", - "cube(size = [130,20,20] + "cube(size = [130,20,20]" ], "repo": "https://gitlab.com/OSEGermany/ohloom", "source": "/3DParts/RatchetPawl/RatchetPawl.scad", -- GitLab From 16c639467fa52a871717a3b80835a2218a18464b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20H=C3=A4uer?= Date: Tue, 19 Jan 2021 13:16:05 +0000 Subject: [PATCH 11/38] fix JSON --- 3DParts/RatchetPawl/okh-RatchetPawl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/3DParts/RatchetPawl/okh-RatchetPawl.json b/3DParts/RatchetPawl/okh-RatchetPawl.json index 6523da4..fe9a2da 100644 --- a/3DParts/RatchetPawl/okh-RatchetPawl.json +++ b/3DParts/RatchetPawl/okh-RatchetPawl.json @@ -2,12 +2,12 @@ "okhv": "2.0", "name": "Ratchet Pawl", "image": "Documentation/Assembly_Guide/Parts_Print_4.jpg", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "version": "1.0", "production-metadata": [ "3D printed", "PLA", - "cube(size = [130,20,20]" + "cube(size = [130,20,20])" ], "repo": "https://gitlab.com/OSEGermany/ohloom", "source": "/3DParts/RatchetPawl/RatchetPawl.scad", -- GitLab From 81052c219a80d149d059501a714a8d94a343b394 Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 10:44:43 +0100 Subject: [PATCH 12/38] add okh-polebase --- 3DParts/PoleBase/okh-PoleBase.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 3DParts/PoleBase/okh-PoleBase.json diff --git a/3DParts/PoleBase/okh-PoleBase.json b/3DParts/PoleBase/okh-PoleBase.json new file mode 100644 index 0000000..a4c361b --- /dev/null +++ b/3DParts/PoleBase/okh-PoleBase.json @@ -0,0 +1,19 @@ +{ + "okhv": "2.0", + "repo": "https://gitlab.com/OSEGermany/ohloom", + "version": "1.0.0", + "spdx-license": "CC-BY-SA-4.0", + "licensor": "Jens Meisner", + "documentation-language": "en-GB", + "tscd-id": "COM-MAN", + "production-metadata": [ + "3D printed", + "PLA", + "cube(size = [127,110,100] + ], + "source": "/3DParts/PoleBase/PoleBase.scad", + "export": [ + "/3DParts/PoleBase/PoleBase.pdf", + "/3DParts/PoleBase/PoleBase.stl" + ], + } -- GitLab From 096193d4e823f81986838ed05bf78f596654086a Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 10:45:00 +0100 Subject: [PATCH 13/38] add manifest file --- 3DParts/RatchetWheel/okh-RatchetWheel.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 3DParts/RatchetWheel/okh-RatchetWheel.json diff --git a/3DParts/RatchetWheel/okh-RatchetWheel.json b/3DParts/RatchetWheel/okh-RatchetWheel.json new file mode 100644 index 0000000..04c6f9a --- /dev/null +++ b/3DParts/RatchetWheel/okh-RatchetWheel.json @@ -0,0 +1,20 @@ + { + "okhv": "2.0", + "repo": "https://gitlab.com/OSEGermany/ohloom", + "version": "1.0.0", + "spdx-license": "CC-BY-SA-4.0", + "licensor": "Jens Meisner", + "image": "Documentation/Assembly_Guide/Parts_Print_1.jpg", + "documentation-language": "en-GB", + "tscd-id": "COM-MAN", + "production-metadata": [ + "3D printed", + "PLA", + "cylinder(h=45, r=??) + ], + "source": "/3DParts/RatchetWheel/RatchetWheel.scad", + "export": [ + "/3DParts/RatchetWheel/RatchetWheel.pdf", + "/3DParts/RatchetWheel/RatchetWheel.stl" + ], + } -- GitLab From fd9cabb43fb7c17cf196eb8a5aa94af71d37973c Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 10:45:15 +0100 Subject: [PATCH 14/38] add manifest file --- 3DParts/ScrewSockets/okh-ScrewSockets.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 3DParts/ScrewSockets/okh-ScrewSockets.json diff --git a/3DParts/ScrewSockets/okh-ScrewSockets.json b/3DParts/ScrewSockets/okh-ScrewSockets.json new file mode 100644 index 0000000..dfe36b4 --- /dev/null +++ b/3DParts/ScrewSockets/okh-ScrewSockets.json @@ -0,0 +1,19 @@ +{ + "okhv": "2.0", + "repo": "https://gitlab.com/OSEGermany/ohloom", + "version": "1.0.0", + "spdx-license": "CC-BY-SA-4.0", + "licensor": "Jens Meisner", + "documentation-language": "en-GB", + "tscd-id": "COM-MAN", + "production-metadata": [ + "3D printed", + "PLA", + "cylinder(h=12, r=14) + ], + "source": "/3DParts/ScrewSockets/ScrewSockets.scad", + "export": [ + "/3DParts/ClampRing/ScrewSockets.pdf", + "/3DParts/ClampRing/ScrewSockets.stl" + ], + } -- GitLab From d12bb6706ea32333e9246b7f179b1d33cb22e02d Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 10:45:27 +0100 Subject: [PATCH 15/38] add manifest file --- .../okh-ScrewSockets4ScrewHead.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json diff --git a/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json b/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json new file mode 100644 index 0000000..dfe36b4 --- /dev/null +++ b/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json @@ -0,0 +1,19 @@ +{ + "okhv": "2.0", + "repo": "https://gitlab.com/OSEGermany/ohloom", + "version": "1.0.0", + "spdx-license": "CC-BY-SA-4.0", + "licensor": "Jens Meisner", + "documentation-language": "en-GB", + "tscd-id": "COM-MAN", + "production-metadata": [ + "3D printed", + "PLA", + "cylinder(h=12, r=14) + ], + "source": "/3DParts/ScrewSockets/ScrewSockets.scad", + "export": [ + "/3DParts/ClampRing/ScrewSockets.pdf", + "/3DParts/ClampRing/ScrewSockets.stl" + ], + } -- GitLab From c20e404d9ba5c3ce702fcde73d5878fb34cd66df Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 10:45:32 +0100 Subject: [PATCH 16/38] add manifest file --- .../WarpClothBeam/okh-Warpclothbeam_P1.json | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json new file mode 100644 index 0000000..4bc35b9 --- /dev/null +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json @@ -0,0 +1,20 @@ +{ + "okhv": "2.0", + "repo": "https://gitlab.com/OSEGermany/ohloom", + "version": "1.0.0", + "spdx-license": "CC-BY-SA-4.0", + "licensor": "Jens Meisner", + "image": "Documentation/Assembly_Guide/Parts_Print_7.jpg", + "documentation-language": "en-GB", + "tscd-id": "COM-MAN", + "production-metadata": [ + "3D printed", + "PLA", + "cylinder(h=162, r=45) + ], + "source": "/3DParts/WarpClothBeam/Warpclothbeam_P1.scad", + "export": [ + "/3DParts/WarpClothBeam/Warpclothbeam_P1.pdf", + "/3DParts/WarpClothBeam/Warpclothbeam_P1.stl" + ], + } -- GitLab From e118aed30085d5af289644e129f3500f69316a4a Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 10:45:36 +0100 Subject: [PATCH 17/38] add manifest file --- .../WarpClothBeam/okh-Warpclothbeam_P2.json | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json new file mode 100644 index 0000000..4d6aeb9 --- /dev/null +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json @@ -0,0 +1,20 @@ +{ + "okhv": "2.0", + "repo": "https://gitlab.com/OSEGermany/ohloom", + "version": "1.0.0", + "spdx-license": "CC-BY-SA-4.0", + "licensor": "Jens Meisner", + "image": "Documentation/Assembly_Guide/Parts_Print_7.jpg", + "documentation-language": "en-GB", + "tscd-id": "COM-MAN", + "production-metadata": [ + "3D printed", + "PLA", + "cylinder(h=163, r=45) + ], + "source": "/3DParts/WarpClothBeam/Warpclothbeam_P2.scad", + "export": [ + "/3DParts/WarpClothBeam/Warpclothbeam_P2.pdf", + "/3DParts/WarpClothBeam/Warpclothbeam_P2.stl" + ], + } -- GitLab From e7d28485a8955d74259d87392acf864afd6c235d Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 10:45:40 +0100 Subject: [PATCH 18/38] add manifest file --- .../WarpClothBeam/okh-Warpclothbeam_P3.json | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json new file mode 100644 index 0000000..674d30c --- /dev/null +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json @@ -0,0 +1,20 @@ +{ + "okhv": "2.0", + "repo": "https://gitlab.com/OSEGermany/ohloom", + "version": "1.0.0", + "spdx-license": "CC-BY-SA-4.0", + "licensor": "Jens Meisner", + "image": "Documentation/Assembly_Guide/Parts_Print_7.jpg", + "documentation-language": "en-GB", + "tscd-id": "COM-MAN", + "production-metadata": [ + "3D printed", + "PLA", + "cylinder(h=163, r=45) + ], + "source": "/3DParts/WarpClothBeam/Warpclothbeam_P3.scad", + "export": [ + "/3DParts/WarpClothBeam/Warpclothbeam_P3.pdf", + "/3DParts/WarpClothBeam/Warpclothbeam_P3.stl" + ], + } -- GitLab From 575a95b33266ddb973447e09033cf135ede9a9c8 Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 10:45:45 +0100 Subject: [PATCH 19/38] add manifest file --- .../WarpClothBeam/okh-Warpclothbeam_P4.json | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json new file mode 100644 index 0000000..8358f35 --- /dev/null +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json @@ -0,0 +1,20 @@ +{ + "okhv": "2.0", + "repo": "https://gitlab.com/OSEGermany/ohloom", + "version": "1.0.0", + "spdx-license": "CC-BY-SA-4.0", + "licensor": "Jens Meisner", + "image": "Documentation/Assembly_Guide/Parts_Print_7.jpg", + "documentation-language": "en-GB", + "tscd-id": "COM-MAN", + "production-metadata": [ + "3D printed", + "PLA", + "cylinder(h=162, r=45) + ], + "source": "/3DParts/WarpClothBeam/Warpclothbeam_P4.scad", + "export": [ + "/3DParts/WarpClothBeam/Warpclothbeam_P4.pdf", + "/3DParts/WarpClothBeam/Warpclothbeam_P4.stl" + ], + } -- GitLab From 88e16af0f4f0efc895512dc4284e6631a9809631 Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 10:45:49 +0100 Subject: [PATCH 20/38] add manifest file --- WoodParts/CombHolder/okh-CombHolder.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 WoodParts/CombHolder/okh-CombHolder.json diff --git a/WoodParts/CombHolder/okh-CombHolder.json b/WoodParts/CombHolder/okh-CombHolder.json new file mode 100644 index 0000000..100cd0e --- /dev/null +++ b/WoodParts/CombHolder/okh-CombHolder.json @@ -0,0 +1,20 @@ +{ + "okhv": "2.0", + "repo": "https://gitlab.com/OSEGermany/ohloom", + "version": "1.0.0", + "spdx-license": "CC-BY-SA-4.0", + "licensor": "Jens Meisner", + "image": "/Documentation/Assembly_Guide/Parts_CNC_1.jpg", + "documentation-language": "en-GB", + "tscd-id": "COM-MAN", + "production-metadata": [ + "machined", + "wood", + "cube(size = [118,60,18]" + ], + "source": "/WoodParts/CombHolder/CombHolder.scad", + "export": [ + "/WoodParts/CombHolder/CombHolder.pdf", + "/WoodParts/CombHolder/CombHolder.stl" + ], + } -- GitLab From 8275d05f29ae72bb405d287b42e61886154bf5ff Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 10:46:00 +0100 Subject: [PATCH 21/38] update references --- sBoM.csv | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sBoM.csv b/sBoM.csv index f3001ef..c89c4f1 100644 --- a/sBoM.csv +++ b/sBoM.csv @@ -11,9 +11,13 @@ POS NAME UNITS TYPE REFERENCE 10 Clamp Ring 2 POSH /3DParts/ClampRing/okh-ClampRing.json 11 Comb Module 5 POSH /3DParts/CombModul/okh-CombModul.json 12 Ratchet Pawl 2 POSH /3DParts/RatchetPawl/okh-RatchetPawl.json -13 Screw Socket w 12 POSH -14 Screw Socket w/o 4 POSH +13 Screw Socket w 12 POSH /3DParts/ScrewSockets/okh-ScrewSockets.json +14 Screw Socket w/o 4 POSH /3DParts/ScrewSockets/okh-ScrewSocket4ScrewHead.json 15 Outer Warpcloth Beam (4 parts each) 2 POSH +15.1 Warpclothbeam_P1 1 POSH /3DParts/WarpClothBeam/Warpclothbeam_P1.json +15.2 Warpclothbeam_P2 1 POSH /3DParts/WarpClothBeam/Warpclothbeam_P2.json +15.3 Warpclothbeam_P3 1 POSH /3DParts/WarpClothBeam/Warpclothbeam_P3.json +15.4 Warpclothbeam_P4 1 POSH /3DParts/WarpClothBeam/Warpclothbeam_P4.json 16 Comb Holder 2 POSH 17 Side Frame 2 POSH 18 Cross Beam 2 POSH -- GitLab From d4edbbc0e95fa63fa74a611754035e3ea9580bc6 Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 10:46:07 +0100 Subject: [PATCH 22/38] cleanup repo --- okh.yml | 53 ----------------------------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 okh.yml diff --git a/okh.yml b/okh.yml deleted file mode 100644 index 6febb16..0000000 --- a/okh.yml +++ /dev/null @@ -1,53 +0,0 @@ -date-created: 2020-02-23 - -manifest-author: - name: Robin Vobruba - affiliation: Open Source Ecology Germany - email: robin.vobruba@ose-germany.de - -manifest-language: English-US - -documentation-language: English-US - - -# Properties - -title: OHLOOM - -description: | - The Open Hardware Loom is a simple, hand-operated loom made of wood, screws and 3D printed plastic pieces for the most part. - It is simple to make and operate. - -intended-use: Basic clothing manufacturing in catastrophic scenarios - -keywords: - - clothing - - low-tech - -project-link: https://wiki.opensourceecology.de/Open_Hardware-Webstuhl_%E2%80%93_OHLOOM - -contact: - name: Jens Meisner - affiliation: Open Source Ecology Germany - email: jens.meisner@ose-germany.de - -version: 1.0.0 - -development-stage: early-stages - -made: true - -made-independently: false - -license: - hardware: Creative Commons Attribution-ShareAlike 4.0 International - documentation: Creative Commons Attribution-ShareAlike 4.0 International - -licensor: - name: Jens Meisner - affiliation: Open Source Ecology Germany - email: jens.meisner@ose-germany.de - -# Documentation - -documentation-home: https://gitlab.com/OSEGermany/ohloom -- GitLab From 5d9b29bee216bbbd6c5b673b181b5441aef08efe Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 10:47:10 +0100 Subject: [PATCH 23/38] update template --- okh.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/okh.json b/okh.json index 276e027..4643abf 100644 --- a/okh.json +++ b/okh.json @@ -1,22 +1,22 @@ { "okhv": "2.0", + "repo": "https://gitlab.com/OSEGermany/ohloom", "name": "OHLOOM", - "image": "master/Documentation/User_Guide/User_Guide.jpg", + "version": "1.0.0", + "spdx-license": "CC-BY-SA-4.0", + "licensor": "Jens Meisner", + "readme": "README.md", + "image": "/Documentation/User_Guide/User_Guide.jpg", "documentation-language": "en-GB", + "project-stage": "prototype", "function": "The Open Hardware Loom is a simple, hand-operated weaving loom made of wood, screws and 3D printed plastic pieces for the most part. It is simple to make and operate.", "patent-class": "D03D 35/00", "tscd-id": "ASM-MEC", "simplified-bom": "sBoM.csv", - "development-stage": "prototype", "functional-metadata": "400mm fabric width", "production-metadata": [ "3D printed", "wood" ], "source": "/Documentation/Assembly_Guide/AssemblyGuide.md", - "version": "1.0", - "spdx-license": "CC-BY-SA-4.0", - "licensor": "Jens Meisner", - "readme": "README.md", - "repo": "https://gitlab.com/OSEGermany/ohloom", } -- GitLab From 220e7c62f65cf62ae39f17b94153a7aebe8a5cd4 Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 10:51:18 +0100 Subject: [PATCH 24/38] update template --- 3DParts/ClampRing/okh-ClampRing.json | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/3DParts/ClampRing/okh-ClampRing.json b/3DParts/ClampRing/okh-ClampRing.json index d8dfee6..1b0461d 100644 --- a/3DParts/ClampRing/okh-ClampRing.json +++ b/3DParts/ClampRing/okh-ClampRing.json @@ -1,15 +1,17 @@ { "okhv": "2.0", - "name": "Clamp Ring", - "image": "Documentation/Assembly_Guide/Parts_Print_2.jpg", + "repo": "https://gitlab.com/OSEGermany/ohloom", + "version": "1.0.0", + "spdx-license": "CC-BY-SA-4.0", + "licensor": "Jens Meisner", + "image": "/Documentation/Assembly_Guide/Parts_Print_2.jpg", + "documentation-language": "en-GB", "tscd-id": "COM-MAN", - "version": "1.0", "production-metadata": [ "3D printed", "PLA", - "cylinder(h=30, r=56) + "cylinder(h=30, r=56)" ], - "repo": "https://gitlab.com/OSEGermany/ohloom", "source": "/3DParts/ClampRing/ClampRing.scad", "export": [ "/3DParts/ClampRing/ClampRing.pdf", -- GitLab From e7e411fbc87dfcb6fd8c0019be0ae9f2d3da0ad9 Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 10:51:42 +0100 Subject: [PATCH 25/38] update template --- 3DParts/CombModul/okh-CombModul.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/3DParts/CombModul/okh-CombModul.json b/3DParts/CombModul/okh-CombModul.json index 0432d91..52dd712 100644 --- a/3DParts/CombModul/okh-CombModul.json +++ b/3DParts/CombModul/okh-CombModul.json @@ -1,15 +1,17 @@ { "okhv": "2.0", - "name": "Comb Module", + "repo": "https://gitlab.com/OSEGermany/ohloom", + "version": "1.0.0", + "spdx-license": "CC-BY-SA-4.0", + "licensor": "Jens Meisner", "image": "Documentation/Assembly_Guide/Parts_Print_3.jpg", + "documentation-language": "en-GB", "tscd-id": "COM-MAN", - "version": "1.0", "production-metadata": [ "3D printed", "PLA", - "cube(size = [120,100,3] + "cube(size = [120,100,3]" ], - "repo": "https://gitlab.com/OSEGermany/ohloom", "source": "/3DParts/CombModul/CombModul.scad", "export": [ "/3DParts/CombModul/CombModul.pdf", -- GitLab From ed30b96011ab34bfb7405dd5919416588127c41b Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 10:51:55 +0100 Subject: [PATCH 26/38] update template --- 3DParts/RatchetPawl/okh-RatchetPawl.json | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/3DParts/RatchetPawl/okh-RatchetPawl.json b/3DParts/RatchetPawl/okh-RatchetPawl.json index 150e0da..3127395 100644 --- a/3DParts/RatchetPawl/okh-RatchetPawl.json +++ b/3DParts/RatchetPawl/okh-RatchetPawl.json @@ -1,15 +1,17 @@ -{ + { "okhv": "2.0", - "name": "Ratchet Pawl", + "repo": "https://gitlab.com/OSEGermany/ohloom", + "version": "1.0.0", + "spdx-license": "CC-BY-SA-4.0", + "licensor": "Jens Meisner", "image": "Documentation/Assembly_Guide/Parts_Print_4.jpg", + "documentation-language": "en-GB", "tscd-id": "COM-MAN", - "version": "1.0", "production-metadata": [ "3D printed", "PLA", - "cube(size = [130,20,20] + "cube(size = [120,100,3]" ], - "repo": "https://gitlab.com/OSEGermany/ohloom", "source": "/3DParts/RatchetPawl/RatchetPawl.scad", "export": [ "/3DParts/RatchetPawl/RatchetPawl.pdf", -- GitLab From 3f288234efef35413df9edc9c6b2a8c9ccd8e389 Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 10:52:22 +0100 Subject: [PATCH 27/38] fix missing quotation marks --- 3DParts/PoleBase/okh-PoleBase.json | 2 +- 3DParts/RatchetWheel/okh-RatchetWheel.json | 2 +- 3DParts/ScrewSockets/okh-ScrewSockets.json | 2 +- 3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json | 2 +- 3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json | 2 +- 3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json | 2 +- 3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json | 2 +- 3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/3DParts/PoleBase/okh-PoleBase.json b/3DParts/PoleBase/okh-PoleBase.json index a4c361b..cc1aef9 100644 --- a/3DParts/PoleBase/okh-PoleBase.json +++ b/3DParts/PoleBase/okh-PoleBase.json @@ -9,7 +9,7 @@ "production-metadata": [ "3D printed", "PLA", - "cube(size = [127,110,100] + "cube(127 = [size,110,100]" ], "source": "/3DParts/PoleBase/PoleBase.scad", "export": [ diff --git a/3DParts/RatchetWheel/okh-RatchetWheel.json b/3DParts/RatchetWheel/okh-RatchetWheel.json index 04c6f9a..e861e60 100644 --- a/3DParts/RatchetWheel/okh-RatchetWheel.json +++ b/3DParts/RatchetWheel/okh-RatchetWheel.json @@ -10,7 +10,7 @@ "production-metadata": [ "3D printed", "PLA", - "cylinder(h=45, r=??) + "cylinder(h=45, r=??)" ], "source": "/3DParts/RatchetWheel/RatchetWheel.scad", "export": [ diff --git a/3DParts/ScrewSockets/okh-ScrewSockets.json b/3DParts/ScrewSockets/okh-ScrewSockets.json index dfe36b4..2985437 100644 --- a/3DParts/ScrewSockets/okh-ScrewSockets.json +++ b/3DParts/ScrewSockets/okh-ScrewSockets.json @@ -9,7 +9,7 @@ "production-metadata": [ "3D printed", "PLA", - "cylinder(h=12, r=14) + "cylinder(h=12, r=14)" ], "source": "/3DParts/ScrewSockets/ScrewSockets.scad", "export": [ diff --git a/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json b/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json index dfe36b4..2985437 100644 --- a/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json +++ b/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json @@ -9,7 +9,7 @@ "production-metadata": [ "3D printed", "PLA", - "cylinder(h=12, r=14) + "cylinder(h=12, r=14)" ], "source": "/3DParts/ScrewSockets/ScrewSockets.scad", "export": [ diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json index 4bc35b9..4037799 100644 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json @@ -10,7 +10,7 @@ "production-metadata": [ "3D printed", "PLA", - "cylinder(h=162, r=45) + "cylinder(h=162, r=45)" ], "source": "/3DParts/WarpClothBeam/Warpclothbeam_P1.scad", "export": [ diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json index 4d6aeb9..d97364b 100644 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json @@ -10,7 +10,7 @@ "production-metadata": [ "3D printed", "PLA", - "cylinder(h=163, r=45) + "cylinder(h=163, r=45)" ], "source": "/3DParts/WarpClothBeam/Warpclothbeam_P2.scad", "export": [ diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json index 674d30c..c9b3835 100644 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json @@ -10,7 +10,7 @@ "production-metadata": [ "3D printed", "PLA", - "cylinder(h=163, r=45) + "cylinder(h=163, r=45)" ], "source": "/3DParts/WarpClothBeam/Warpclothbeam_P3.scad", "export": [ diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json index 8358f35..55b1d6c 100644 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json @@ -10,7 +10,7 @@ "production-metadata": [ "3D printed", "PLA", - "cylinder(h=162, r=45) + "cylinder(h=162, r=45)" ], "source": "/3DParts/WarpClothBeam/Warpclothbeam_P4.scad", "export": [ -- GitLab From 4bb68936e731aff248df66fd32a3b571c7785b36 Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 11:02:13 +0100 Subject: [PATCH 28/38] fix typo & cube size --- 3DParts/RatchetPawl/okh-RatchetPawl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/3DParts/RatchetPawl/okh-RatchetPawl.json b/3DParts/RatchetPawl/okh-RatchetPawl.json index 3127395..0dff066 100644 --- a/3DParts/RatchetPawl/okh-RatchetPawl.json +++ b/3DParts/RatchetPawl/okh-RatchetPawl.json @@ -6,11 +6,11 @@ "licensor": "Jens Meisner", "image": "Documentation/Assembly_Guide/Parts_Print_4.jpg", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "3D printed", "PLA", - "cube(size = [120,100,3]" + "cube(size = [130,20,20]" ], "source": "/3DParts/RatchetPawl/RatchetPawl.scad", "export": [ -- GitLab From 88a9aa2554e4bce928245534e9f3b67281fd5b58 Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 11:04:09 +0100 Subject: [PATCH 29/38] fix tsdc typo --- 3DParts/ClampRing/okh-ClampRing.json | 2 +- 3DParts/CombModul/okh-CombModul.json | 2 +- 3DParts/PoleBase/okh-PoleBase.json | 2 +- 3DParts/RatchetWheel/okh-RatchetWheel.json | 2 +- 3DParts/ScrewSockets/okh-ScrewSockets.json | 2 +- 3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json | 2 +- 3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json | 2 +- 3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json | 2 +- 3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json | 2 +- 3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json | 2 +- WoodParts/CombHolder/okh-CombHolder.json | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/3DParts/ClampRing/okh-ClampRing.json b/3DParts/ClampRing/okh-ClampRing.json index 1b0461d..a94d15d 100644 --- a/3DParts/ClampRing/okh-ClampRing.json +++ b/3DParts/ClampRing/okh-ClampRing.json @@ -6,7 +6,7 @@ "licensor": "Jens Meisner", "image": "/Documentation/Assembly_Guide/Parts_Print_2.jpg", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "3D printed", "PLA", diff --git a/3DParts/CombModul/okh-CombModul.json b/3DParts/CombModul/okh-CombModul.json index 52dd712..0fe1fd9 100644 --- a/3DParts/CombModul/okh-CombModul.json +++ b/3DParts/CombModul/okh-CombModul.json @@ -6,7 +6,7 @@ "licensor": "Jens Meisner", "image": "Documentation/Assembly_Guide/Parts_Print_3.jpg", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "3D printed", "PLA", diff --git a/3DParts/PoleBase/okh-PoleBase.json b/3DParts/PoleBase/okh-PoleBase.json index cc1aef9..76fcc2f 100644 --- a/3DParts/PoleBase/okh-PoleBase.json +++ b/3DParts/PoleBase/okh-PoleBase.json @@ -5,7 +5,7 @@ "spdx-license": "CC-BY-SA-4.0", "licensor": "Jens Meisner", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "3D printed", "PLA", diff --git a/3DParts/RatchetWheel/okh-RatchetWheel.json b/3DParts/RatchetWheel/okh-RatchetWheel.json index e861e60..7323717 100644 --- a/3DParts/RatchetWheel/okh-RatchetWheel.json +++ b/3DParts/RatchetWheel/okh-RatchetWheel.json @@ -6,7 +6,7 @@ "licensor": "Jens Meisner", "image": "Documentation/Assembly_Guide/Parts_Print_1.jpg", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "3D printed", "PLA", diff --git a/3DParts/ScrewSockets/okh-ScrewSockets.json b/3DParts/ScrewSockets/okh-ScrewSockets.json index 2985437..975e444 100644 --- a/3DParts/ScrewSockets/okh-ScrewSockets.json +++ b/3DParts/ScrewSockets/okh-ScrewSockets.json @@ -5,7 +5,7 @@ "spdx-license": "CC-BY-SA-4.0", "licensor": "Jens Meisner", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "3D printed", "PLA", diff --git a/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json b/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json index 2985437..975e444 100644 --- a/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json +++ b/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json @@ -5,7 +5,7 @@ "spdx-license": "CC-BY-SA-4.0", "licensor": "Jens Meisner", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "3D printed", "PLA", diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json index 4037799..08dcc4a 100644 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json @@ -6,7 +6,7 @@ "licensor": "Jens Meisner", "image": "Documentation/Assembly_Guide/Parts_Print_7.jpg", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "3D printed", "PLA", diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json index d97364b..b4c27e8 100644 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json @@ -6,7 +6,7 @@ "licensor": "Jens Meisner", "image": "Documentation/Assembly_Guide/Parts_Print_7.jpg", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "3D printed", "PLA", diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json index c9b3835..58597c2 100644 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json @@ -6,7 +6,7 @@ "licensor": "Jens Meisner", "image": "Documentation/Assembly_Guide/Parts_Print_7.jpg", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "3D printed", "PLA", diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json index 55b1d6c..7aa380b 100644 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json @@ -6,7 +6,7 @@ "licensor": "Jens Meisner", "image": "Documentation/Assembly_Guide/Parts_Print_7.jpg", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "3D printed", "PLA", diff --git a/WoodParts/CombHolder/okh-CombHolder.json b/WoodParts/CombHolder/okh-CombHolder.json index 100cd0e..cf91e96 100644 --- a/WoodParts/CombHolder/okh-CombHolder.json +++ b/WoodParts/CombHolder/okh-CombHolder.json @@ -6,7 +6,7 @@ "licensor": "Jens Meisner", "image": "/Documentation/Assembly_Guide/Parts_CNC_1.jpg", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "machined", "wood", -- GitLab From 969a4986003e18542b010267863b3d08513f632f Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 11:04:09 +0100 Subject: [PATCH 30/38] fix tsdc typo --- 3DParts/ClampRing/okh-ClampRing.json | 2 +- 3DParts/CombModul/okh-CombModul.json | 2 +- 3DParts/PoleBase/okh-PoleBase.json | 2 +- 3DParts/RatchetWheel/okh-RatchetWheel.json | 2 +- 3DParts/ScrewSockets/okh-ScrewSockets.json | 2 +- 3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json | 2 +- 3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json | 2 +- 3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json | 2 +- 3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json | 2 +- 3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json | 2 +- WoodParts/CombHolder/okh-CombHolder.json | 2 +- okh.json | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/3DParts/ClampRing/okh-ClampRing.json b/3DParts/ClampRing/okh-ClampRing.json index 1b0461d..a94d15d 100644 --- a/3DParts/ClampRing/okh-ClampRing.json +++ b/3DParts/ClampRing/okh-ClampRing.json @@ -6,7 +6,7 @@ "licensor": "Jens Meisner", "image": "/Documentation/Assembly_Guide/Parts_Print_2.jpg", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "3D printed", "PLA", diff --git a/3DParts/CombModul/okh-CombModul.json b/3DParts/CombModul/okh-CombModul.json index 52dd712..0fe1fd9 100644 --- a/3DParts/CombModul/okh-CombModul.json +++ b/3DParts/CombModul/okh-CombModul.json @@ -6,7 +6,7 @@ "licensor": "Jens Meisner", "image": "Documentation/Assembly_Guide/Parts_Print_3.jpg", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "3D printed", "PLA", diff --git a/3DParts/PoleBase/okh-PoleBase.json b/3DParts/PoleBase/okh-PoleBase.json index cc1aef9..76fcc2f 100644 --- a/3DParts/PoleBase/okh-PoleBase.json +++ b/3DParts/PoleBase/okh-PoleBase.json @@ -5,7 +5,7 @@ "spdx-license": "CC-BY-SA-4.0", "licensor": "Jens Meisner", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "3D printed", "PLA", diff --git a/3DParts/RatchetWheel/okh-RatchetWheel.json b/3DParts/RatchetWheel/okh-RatchetWheel.json index e861e60..7323717 100644 --- a/3DParts/RatchetWheel/okh-RatchetWheel.json +++ b/3DParts/RatchetWheel/okh-RatchetWheel.json @@ -6,7 +6,7 @@ "licensor": "Jens Meisner", "image": "Documentation/Assembly_Guide/Parts_Print_1.jpg", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "3D printed", "PLA", diff --git a/3DParts/ScrewSockets/okh-ScrewSockets.json b/3DParts/ScrewSockets/okh-ScrewSockets.json index 2985437..975e444 100644 --- a/3DParts/ScrewSockets/okh-ScrewSockets.json +++ b/3DParts/ScrewSockets/okh-ScrewSockets.json @@ -5,7 +5,7 @@ "spdx-license": "CC-BY-SA-4.0", "licensor": "Jens Meisner", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "3D printed", "PLA", diff --git a/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json b/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json index 2985437..975e444 100644 --- a/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json +++ b/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json @@ -5,7 +5,7 @@ "spdx-license": "CC-BY-SA-4.0", "licensor": "Jens Meisner", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "3D printed", "PLA", diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json index 4037799..08dcc4a 100644 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json @@ -6,7 +6,7 @@ "licensor": "Jens Meisner", "image": "Documentation/Assembly_Guide/Parts_Print_7.jpg", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "3D printed", "PLA", diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json index d97364b..b4c27e8 100644 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json @@ -6,7 +6,7 @@ "licensor": "Jens Meisner", "image": "Documentation/Assembly_Guide/Parts_Print_7.jpg", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "3D printed", "PLA", diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json index c9b3835..58597c2 100644 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json @@ -6,7 +6,7 @@ "licensor": "Jens Meisner", "image": "Documentation/Assembly_Guide/Parts_Print_7.jpg", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "3D printed", "PLA", diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json index 55b1d6c..7aa380b 100644 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json @@ -6,7 +6,7 @@ "licensor": "Jens Meisner", "image": "Documentation/Assembly_Guide/Parts_Print_7.jpg", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "3D printed", "PLA", diff --git a/WoodParts/CombHolder/okh-CombHolder.json b/WoodParts/CombHolder/okh-CombHolder.json index 100cd0e..cf91e96 100644 --- a/WoodParts/CombHolder/okh-CombHolder.json +++ b/WoodParts/CombHolder/okh-CombHolder.json @@ -6,7 +6,7 @@ "licensor": "Jens Meisner", "image": "/Documentation/Assembly_Guide/Parts_CNC_1.jpg", "documentation-language": "en-GB", - "tscd-id": "COM-MAN", + "tsdc-id": "COM-MAN", "production-metadata": [ "machined", "wood", diff --git a/okh.json b/okh.json index 4643abf..1f2d5fa 100644 --- a/okh.json +++ b/okh.json @@ -11,7 +11,7 @@ "project-stage": "prototype", "function": "The Open Hardware Loom is a simple, hand-operated weaving loom made of wood, screws and 3D printed plastic pieces for the most part. It is simple to make and operate.", "patent-class": "D03D 35/00", - "tscd-id": "ASM-MEC", + "tsdc-id": "ASM-MEC", "simplified-bom": "sBoM.csv", "functional-metadata": "400mm fabric width", "production-metadata": [ -- GitLab From 3ef0bd1069adf7c0259d7cdf469306c7f52dab7b Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 11:35:54 +0100 Subject: [PATCH 31/38] create manifest files --- WoodParts/Crossbeam/okh-CrossBeam.json | 20 +++++++++++++++++++ WoodParts/Shuttle/okh-Shuttle.json | 20 +++++++++++++++++++ WoodParts/SideFrame/okh-SideFrame.json | 20 +++++++++++++++++++ WoodParts/SlotBeam/okh-SlotBeam.json | 20 +++++++++++++++++++ WoodParts/StringStick/okh-StringStick.json | 20 +++++++++++++++++++ .../okh-WarpClothBeam.json | 20 +++++++++++++++++++ 6 files changed, 120 insertions(+) create mode 100644 WoodParts/Crossbeam/okh-CrossBeam.json create mode 100644 WoodParts/Shuttle/okh-Shuttle.json create mode 100644 WoodParts/SideFrame/okh-SideFrame.json create mode 100644 WoodParts/SlotBeam/okh-SlotBeam.json create mode 100644 WoodParts/StringStick/okh-StringStick.json create mode 100644 WoodParts/WarpClothBeam_NoCNC/okh-WarpClothBeam.json diff --git a/WoodParts/Crossbeam/okh-CrossBeam.json b/WoodParts/Crossbeam/okh-CrossBeam.json new file mode 100644 index 0000000..2ed3064 --- /dev/null +++ b/WoodParts/Crossbeam/okh-CrossBeam.json @@ -0,0 +1,20 @@ +{ + "okhv": "2.0", + "repo": "https://gitlab.com/OSEGermany/ohloom", + "version": "1.0.0", + "spdx-license": "CC-BY-SA-4.0", + "licensor": "Jens Meisner", + "image": "/Documentation/Assembly_Guide/Parts_CNC_3.jpg", + "documentation-language": "en-GB", + "tsdc-id": "COM-MAN", + "production-metadata": [ + "machined", + "wood", + "cube(size = [572,100,20]" + ], + "source": "/WoodParts/CrossBeam/CrossBeam.scad", + "export": [ + "/WoodParts/CrossBeam/CrossBeam.pdf", + "/WoodParts/CrossBeam/CrossBeam.stl" + ], + } diff --git a/WoodParts/Shuttle/okh-Shuttle.json b/WoodParts/Shuttle/okh-Shuttle.json new file mode 100644 index 0000000..6360251 --- /dev/null +++ b/WoodParts/Shuttle/okh-Shuttle.json @@ -0,0 +1,20 @@ +{ + "okhv": "2.0", + "repo": "https://gitlab.com/OSEGermany/ohloom", + "version": "1.0.0", + "spdx-license": "CC-BY-SA-4.0", + "licensor": "Jens Meisner", + "image": "/Documentation/Assembly_Guide/Parts_CNC_6.jpg", + "documentation-language": "en-GB", + "tsdc-id": "COM-MAN", + "production-metadata": [ + "machined", + "wood", + "cube(size = [497,45,6]" + ], + "source": "/WoodParts/Shuttle/Shuttle.scad", + "export": [ + "/WoodParts/Shuttle/Shuttle.pdf", + "/WoodParts/Shuttle/Shuttle.stl" + ], + } diff --git a/WoodParts/SideFrame/okh-SideFrame.json b/WoodParts/SideFrame/okh-SideFrame.json new file mode 100644 index 0000000..d8fa1ca --- /dev/null +++ b/WoodParts/SideFrame/okh-SideFrame.json @@ -0,0 +1,20 @@ +{ + "okhv": "2.0", + "repo": "https://gitlab.com/OSEGermany/ohloom", + "version": "1.0.0", + "spdx-license": "CC-BY-SA-4.0", + "licensor": "Jens Meisner", + "image": "/Documentation/Assembly_Guide/Parts_CNC_2.jpg", + "documentation-language": "en-GB", + "tsdc-id": "COM-MAN", + "production-metadata": [ + "machined", + "wood", + "cube(size = [580,140,18]" + ], + "source": "/WoodParts/SideFrame/SideFrame.scad", + "export": [ + "/WoodParts/SideFrame/SideFrame.pdf", + "/WoodParts/SideFrame/SideFrame.stl" + ], + } diff --git a/WoodParts/SlotBeam/okh-SlotBeam.json b/WoodParts/SlotBeam/okh-SlotBeam.json new file mode 100644 index 0000000..7a47b0d --- /dev/null +++ b/WoodParts/SlotBeam/okh-SlotBeam.json @@ -0,0 +1,20 @@ +{ + "okhv": "2.0", + "repo": "https://gitlab.com/OSEGermany/ohloom", + "version": "1.0.0", + "spdx-license": "CC-BY-SA-4.0", + "licensor": "Jens Meisner", + "image": "/Documentation/Assembly_Guide/Parts_CNC_4.jpg", + "documentation-language": "en-GB", + "tsdc-id": "COM-MAN", + "production-metadata": [ + "machined", + "wood", + "cube(size = [566,24,22]" + ], + "source": "/WoodParts/SlotBeam/SlotBeam.scad", + "export": [ + "/WoodParts/SlotBeam/SlotBeam.pdf", + "/WoodParts/SlotBeam/SlotBeam.stl" + ], + } diff --git a/WoodParts/StringStick/okh-StringStick.json b/WoodParts/StringStick/okh-StringStick.json new file mode 100644 index 0000000..e532d47 --- /dev/null +++ b/WoodParts/StringStick/okh-StringStick.json @@ -0,0 +1,20 @@ +{ + "okhv": "2.0", + "repo": "https://gitlab.com/OSEGermany/ohloom", + "version": "1.0.0", + "spdx-license": "CC-BY-SA-4.0", + "licensor": "Jens Meisner", + "image": "/Documentation/Assembly_Guide/Parts_CNC_5.jpg", + "documentation-language": "en-GB", + "tsdc-id": "COM-MAN", + "production-metadata": [ + "machined", + "wood", + "cube(size = [560,22,6]" + ], + "source": "/WoodParts/StringStick/StringStick.scad", + "export": [ + "/WoodParts/StringStick/StringStick.pdf", + "/WoodParts/StringStick/StringStick.stl" + ], + } diff --git a/WoodParts/WarpClothBeam_NoCNC/okh-WarpClothBeam.json b/WoodParts/WarpClothBeam_NoCNC/okh-WarpClothBeam.json new file mode 100644 index 0000000..2801c9d --- /dev/null +++ b/WoodParts/WarpClothBeam_NoCNC/okh-WarpClothBeam.json @@ -0,0 +1,20 @@ +{ + "okhv": "2.0", + "repo": "https://gitlab.com/OSEGermany/ohloom", + "version": "1.0.0", + "spdx-license": "CC-BY-SA-4.0", + "licensor": "Jens Meisner", + "image": "/Documentation/Assembly_Guide/Parts_Other_1.jpg", + "documentation-language": "en-GB", + "tsdc-id": "COM-MAN", + "production-metadata": [ + "machined", + "wood", + "cylinder(h=710, r=17.5)" + ], + "source": "/WoodParts/WarpClothBeam_NoCNC/WarpClothBeam_Wood_NoCNC.scad", + "export": [ + "/WoodParts/WarpClothBeam_NoCNC/WarpClothBeam_Shaft.pdf", + "/WoodParts/WarpClothBeam_NoCNC/WarpClothBeam_Wood_NoCNC.stl" + ], + } -- GitLab From d9eb4744cb2531619558bd8d486456d215c0ff5c Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 11:48:40 +0100 Subject: [PATCH 32/38] fix diameter vs radius --- 3DParts/ClampRing/okh-ClampRing.json | 2 +- 3DParts/RatchetWheel/okh-RatchetWheel.json | 2 +- 3DParts/ScrewSockets/okh-ScrewSockets.json | 2 +- 3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json | 2 +- 3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json | 2 +- 3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json | 2 +- 3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json | 2 +- 3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/3DParts/ClampRing/okh-ClampRing.json b/3DParts/ClampRing/okh-ClampRing.json index a94d15d..fa6bfc0 100644 --- a/3DParts/ClampRing/okh-ClampRing.json +++ b/3DParts/ClampRing/okh-ClampRing.json @@ -10,7 +10,7 @@ "production-metadata": [ "3D printed", "PLA", - "cylinder(h=30, r=56)" + "cylinder(h=30, r=28)" ], "source": "/3DParts/ClampRing/ClampRing.scad", "export": [ diff --git a/3DParts/RatchetWheel/okh-RatchetWheel.json b/3DParts/RatchetWheel/okh-RatchetWheel.json index 7323717..86510e4 100644 --- a/3DParts/RatchetWheel/okh-RatchetWheel.json +++ b/3DParts/RatchetWheel/okh-RatchetWheel.json @@ -10,7 +10,7 @@ "production-metadata": [ "3D printed", "PLA", - "cylinder(h=45, r=??)" + "cylinder(h=45, r=45)" ], "source": "/3DParts/RatchetWheel/RatchetWheel.scad", "export": [ diff --git a/3DParts/ScrewSockets/okh-ScrewSockets.json b/3DParts/ScrewSockets/okh-ScrewSockets.json index 975e444..7643560 100644 --- a/3DParts/ScrewSockets/okh-ScrewSockets.json +++ b/3DParts/ScrewSockets/okh-ScrewSockets.json @@ -9,7 +9,7 @@ "production-metadata": [ "3D printed", "PLA", - "cylinder(h=12, r=14)" + "cylinder(h=12, r=7)" ], "source": "/3DParts/ScrewSockets/ScrewSockets.scad", "export": [ diff --git a/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json b/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json index 975e444..7643560 100644 --- a/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json +++ b/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json @@ -9,7 +9,7 @@ "production-metadata": [ "3D printed", "PLA", - "cylinder(h=12, r=14)" + "cylinder(h=12, r=7)" ], "source": "/3DParts/ScrewSockets/ScrewSockets.scad", "export": [ diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json index 08dcc4a..8f736c9 100644 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json @@ -10,7 +10,7 @@ "production-metadata": [ "3D printed", "PLA", - "cylinder(h=162, r=45)" + "cylinder(h=162, r=22.5)" ], "source": "/3DParts/WarpClothBeam/Warpclothbeam_P1.scad", "export": [ diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json index b4c27e8..99dc63d 100644 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json @@ -10,7 +10,7 @@ "production-metadata": [ "3D printed", "PLA", - "cylinder(h=163, r=45)" + "cylinder(h=163, r=22.5)" ], "source": "/3DParts/WarpClothBeam/Warpclothbeam_P2.scad", "export": [ diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json index 58597c2..a95eb75 100644 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json @@ -10,7 +10,7 @@ "production-metadata": [ "3D printed", "PLA", - "cylinder(h=163, r=45)" + "cylinder(h=163, r=22.5)" ], "source": "/3DParts/WarpClothBeam/Warpclothbeam_P3.scad", "export": [ diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json index 7aa380b..da838fd 100644 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json @@ -10,7 +10,7 @@ "production-metadata": [ "3D printed", "PLA", - "cylinder(h=162, r=45)" + "cylinder(h=162, r=22.5)" ], "source": "/3DParts/WarpClothBeam/Warpclothbeam_P4.scad", "export": [ -- GitLab From 2ae18717e3f907e5fee071abd7ca92412c6ef408 Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 11:49:31 +0100 Subject: [PATCH 33/38] fix typo --- 3DParts/PoleBase/okh-PoleBase.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/3DParts/PoleBase/okh-PoleBase.json b/3DParts/PoleBase/okh-PoleBase.json index 76fcc2f..f5e8168 100644 --- a/3DParts/PoleBase/okh-PoleBase.json +++ b/3DParts/PoleBase/okh-PoleBase.json @@ -9,11 +9,10 @@ "production-metadata": [ "3D printed", "PLA", - "cube(127 = [size,110,100]" + "cube(size = [125,110,100]" ], "source": "/3DParts/PoleBase/PoleBase.scad", "export": [ - "/3DParts/PoleBase/PoleBase.pdf", "/3DParts/PoleBase/PoleBase.stl" ], } -- GitLab From d9281eb90cff06ce66b8a37da5313770ebb2df4c Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 26 Jan 2021 11:49:38 +0100 Subject: [PATCH 34/38] complete references --- sBoM.csv | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sBoM.csv b/sBoM.csv index c89c4f1..664dd99 100644 --- a/sBoM.csv +++ b/sBoM.csv @@ -14,15 +14,15 @@ POS NAME UNITS TYPE REFERENCE 13 Screw Socket w 12 POSH /3DParts/ScrewSockets/okh-ScrewSockets.json 14 Screw Socket w/o 4 POSH /3DParts/ScrewSockets/okh-ScrewSocket4ScrewHead.json 15 Outer Warpcloth Beam (4 parts each) 2 POSH -15.1 Warpclothbeam_P1 1 POSH /3DParts/WarpClothBeam/Warpclothbeam_P1.json -15.2 Warpclothbeam_P2 1 POSH /3DParts/WarpClothBeam/Warpclothbeam_P2.json -15.3 Warpclothbeam_P3 1 POSH /3DParts/WarpClothBeam/Warpclothbeam_P3.json -15.4 Warpclothbeam_P4 1 POSH /3DParts/WarpClothBeam/Warpclothbeam_P4.json -16 Comb Holder 2 POSH -17 Side Frame 2 POSH -18 Cross Beam 2 POSH -19 Slot Beam 2 POSH -20 String Stick 2 POSH -21 Shuttle 1 POSH -22 Inner Warpcloth Beam 2 POSH -23 3m String 1 BUY +15.1 Warpclothbeam_P1 1 POSH /3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json +15.2 Warpclothbeam_P2 1 POSH /3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json +15.3 Warpclothbeam_P3 1 POSH /3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json +15.4 Warpclothbeam_P4 1 POSH /3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json +16 Comb Holder 2 POSH /WoodParts/CombHolder/okh-CombHolder.json +17 Side Frame 2 POSH /WoodParts/SideFrame/okh-SideFrame.json +18 Cross Beam 2 POSH /WoodParts/CrossBeam/okh-CrossBeam.json +19 Slot Beam 2 POSH /WoodParts/SlotBeam/okh-SlotBeam.json +20 String Stick 2 POSH /WoodParts/StringStick/okh-StringStick.json +21 Shuttle 1 POSH /WoodParts/Shuttle/okh-Shuttle.json +22 Inner Warpcloth Beam 2 POSH /WoodParts/WarpClothBeam_NoCNC/WarpClothBeam.json +23 3m String 1 BUY ⌀2…3 mm, Polypropylen -- GitLab From 834222370f34ad2a07d0e41d09eb54378573b8c3 Mon Sep 17 00:00:00 2001 From: moedn Date: Wed, 27 Jan 2021 18:06:06 +0100 Subject: [PATCH 35/38] replace JSON by TOML --- 3DParts/ClampRing/okh-ClampRing.json | 20 ----------------- 3DParts/ClampRing/okh-ClampRing.toml | 14 ++++++++++++ 3DParts/CombModul/okh-CombModul.json | 20 ----------------- 3DParts/CombModul/okh-CombModul.toml | 14 ++++++++++++ 3DParts/PoleBase/okh-PoleBase.json | 18 --------------- 3DParts/PoleBase/okh-PoleBase.toml | 10 +++++++++ 3DParts/RatchetPawl/okh-RatchetPawl.json | 20 ----------------- 3DParts/RatchetPawl/okh-RatchetPawl.toml | 14 ++++++++++++ 3DParts/RatchetWheel/okh-RatchetWheel.json | 20 ----------------- 3DParts/RatchetWheel/okh-RatchetWheel.toml | 14 ++++++++++++ 3DParts/ScrewSockets/okh-ScrewSockets.json | 19 ---------------- 3DParts/ScrewSockets/okh-ScrewSockets.toml | 13 +++++++++++ .../okh-ScrewSockets4ScrewHead.json | 19 ---------------- .../okh-ScrewSockets4ScrewHead.toml | 13 +++++++++++ .../WarpClothBeam/okh-Warpclothbeam_P1.json | 20 ----------------- .../WarpClothBeam/okh-Warpclothbeam_P1.toml | 14 ++++++++++++ .../WarpClothBeam/okh-Warpclothbeam_P2.json | 20 ----------------- .../WarpClothBeam/okh-Warpclothbeam_P2.toml | 14 ++++++++++++ .../WarpClothBeam/okh-Warpclothbeam_P3.json | 20 ----------------- .../WarpClothBeam/okh-Warpclothbeam_P3.toml | 14 ++++++++++++ .../WarpClothBeam/okh-Warpclothbeam_P4.json | 20 ----------------- .../WarpClothBeam/okh-Warpclothbeam_P4.toml | 14 ++++++++++++ WoodParts/CombHolder/okh-CombHolder.json | 20 ----------------- WoodParts/CombHolder/okh-CombHolder.toml | 15 +++++++++++++ WoodParts/Crossbeam/okh-CrossBeam.json | 20 ----------------- WoodParts/Crossbeam/okh-CrossBeam.toml | 14 ++++++++++++ WoodParts/Shuttle/okh-Shuttle.json | 20 ----------------- WoodParts/Shuttle/okh-Shuttle.toml | 14 ++++++++++++ WoodParts/SideFrame/okh-SideFrame.json | 20 ----------------- WoodParts/SideFrame/okh-SideFrame.toml | 14 ++++++++++++ WoodParts/SlotBeam/okh-SlotBeam.json | 20 ----------------- WoodParts/SlotBeam/okh-SlotBeam.toml | 14 ++++++++++++ WoodParts/StringStick/okh-StringStick.json | 20 ----------------- WoodParts/StringStick/okh-StringStick.toml | 14 ++++++++++++ .../okh-WarpClothBeam.json | 20 ----------------- .../okh-WarpClothBeam.toml | 14 ++++++++++++ okh.json | 22 ------------------- okh.toml | 17 ++++++++++++++ 38 files changed, 264 insertions(+), 378 deletions(-) delete mode 100644 3DParts/ClampRing/okh-ClampRing.json create mode 100644 3DParts/ClampRing/okh-ClampRing.toml delete mode 100644 3DParts/CombModul/okh-CombModul.json create mode 100644 3DParts/CombModul/okh-CombModul.toml delete mode 100644 3DParts/PoleBase/okh-PoleBase.json create mode 100644 3DParts/PoleBase/okh-PoleBase.toml delete mode 100644 3DParts/RatchetPawl/okh-RatchetPawl.json create mode 100644 3DParts/RatchetPawl/okh-RatchetPawl.toml delete mode 100644 3DParts/RatchetWheel/okh-RatchetWheel.json create mode 100644 3DParts/RatchetWheel/okh-RatchetWheel.toml delete mode 100644 3DParts/ScrewSockets/okh-ScrewSockets.json create mode 100644 3DParts/ScrewSockets/okh-ScrewSockets.toml delete mode 100644 3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json create mode 100644 3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.toml delete mode 100644 3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json create mode 100644 3DParts/WarpClothBeam/okh-Warpclothbeam_P1.toml delete mode 100644 3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json create mode 100644 3DParts/WarpClothBeam/okh-Warpclothbeam_P2.toml delete mode 100644 3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json create mode 100644 3DParts/WarpClothBeam/okh-Warpclothbeam_P3.toml delete mode 100644 3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json create mode 100644 3DParts/WarpClothBeam/okh-Warpclothbeam_P4.toml delete mode 100644 WoodParts/CombHolder/okh-CombHolder.json create mode 100644 WoodParts/CombHolder/okh-CombHolder.toml delete mode 100644 WoodParts/Crossbeam/okh-CrossBeam.json create mode 100644 WoodParts/Crossbeam/okh-CrossBeam.toml delete mode 100644 WoodParts/Shuttle/okh-Shuttle.json create mode 100644 WoodParts/Shuttle/okh-Shuttle.toml delete mode 100644 WoodParts/SideFrame/okh-SideFrame.json create mode 100644 WoodParts/SideFrame/okh-SideFrame.toml delete mode 100644 WoodParts/SlotBeam/okh-SlotBeam.json create mode 100644 WoodParts/SlotBeam/okh-SlotBeam.toml delete mode 100644 WoodParts/StringStick/okh-StringStick.json create mode 100644 WoodParts/StringStick/okh-StringStick.toml delete mode 100644 WoodParts/WarpClothBeam_NoCNC/okh-WarpClothBeam.json create mode 100644 WoodParts/WarpClothBeam_NoCNC/okh-WarpClothBeam.toml delete mode 100644 okh.json create mode 100644 okh.toml diff --git a/3DParts/ClampRing/okh-ClampRing.json b/3DParts/ClampRing/okh-ClampRing.json deleted file mode 100644 index fa6bfc0..0000000 --- a/3DParts/ClampRing/okh-ClampRing.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "okhv": "2.0", - "repo": "https://gitlab.com/OSEGermany/ohloom", - "version": "1.0.0", - "spdx-license": "CC-BY-SA-4.0", - "licensor": "Jens Meisner", - "image": "/Documentation/Assembly_Guide/Parts_Print_2.jpg", - "documentation-language": "en-GB", - "tsdc-id": "COM-MAN", - "production-metadata": [ - "3D printed", - "PLA", - "cylinder(h=30, r=28)" - ], - "source": "/3DParts/ClampRing/ClampRing.scad", - "export": [ - "/3DParts/ClampRing/ClampRing.pdf", - "/3DParts/ClampRing/ClampRing.stl" - ], - } diff --git a/3DParts/ClampRing/okh-ClampRing.toml b/3DParts/ClampRing/okh-ClampRing.toml new file mode 100644 index 0000000..0429dca --- /dev/null +++ b/3DParts/ClampRing/okh-ClampRing.toml @@ -0,0 +1,14 @@ +okhv = "2.0" +repo = "https://gitlab.com/OSEGermany/ohloom" +version = "1.0.0" +spdx-license = "CC-BY-SA-4.0" +licensor = "Jens Meisner" +image = "/Documentation/Assembly_Guide/Parts_Print_2.jpg" +documentation-language = "en-GB" +tsdc-id = "COM-MAN" +production-metadata = [ "3D printed", "PLA", "cylinder(h=30, r=28)" ] +source = "/3DParts/ClampRing/ClampRing.scad" +export = [ + "/3DParts/ClampRing/ClampRing.pdf", + "/3DParts/ClampRing/ClampRing.stl" +] diff --git a/3DParts/CombModul/okh-CombModul.json b/3DParts/CombModul/okh-CombModul.json deleted file mode 100644 index 0fe1fd9..0000000 --- a/3DParts/CombModul/okh-CombModul.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "okhv": "2.0", - "repo": "https://gitlab.com/OSEGermany/ohloom", - "version": "1.0.0", - "spdx-license": "CC-BY-SA-4.0", - "licensor": "Jens Meisner", - "image": "Documentation/Assembly_Guide/Parts_Print_3.jpg", - "documentation-language": "en-GB", - "tsdc-id": "COM-MAN", - "production-metadata": [ - "3D printed", - "PLA", - "cube(size = [120,100,3]" - ], - "source": "/3DParts/CombModul/CombModul.scad", - "export": [ - "/3DParts/CombModul/CombModul.pdf", - "/3DParts/CombModul/CombModul.stl" - ], - } diff --git a/3DParts/CombModul/okh-CombModul.toml b/3DParts/CombModul/okh-CombModul.toml new file mode 100644 index 0000000..80eb7e5 --- /dev/null +++ b/3DParts/CombModul/okh-CombModul.toml @@ -0,0 +1,14 @@ +okhv = "2.0" +repo = "https://gitlab.com/OSEGermany/ohloom" +version = "1.0.0" +spdx-license = "CC-BY-SA-4.0" +licensor = "Jens Meisner" +image = "Documentation/Assembly_Guide/Parts_Print_3.jpg" +documentation-language = "en-GB" +tsdc-id = "COM-MAN" +production-metadata = [ "3D printed", "PLA", "cube(size = [120,100,3]" ] +source = "/3DParts/CombModul/CombModul.scad" +export = [ + "/3DParts/CombModul/CombModul.pdf", + "/3DParts/CombModul/CombModul.stl" +] diff --git a/3DParts/PoleBase/okh-PoleBase.json b/3DParts/PoleBase/okh-PoleBase.json deleted file mode 100644 index f5e8168..0000000 --- a/3DParts/PoleBase/okh-PoleBase.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "okhv": "2.0", - "repo": "https://gitlab.com/OSEGermany/ohloom", - "version": "1.0.0", - "spdx-license": "CC-BY-SA-4.0", - "licensor": "Jens Meisner", - "documentation-language": "en-GB", - "tsdc-id": "COM-MAN", - "production-metadata": [ - "3D printed", - "PLA", - "cube(size = [125,110,100]" - ], - "source": "/3DParts/PoleBase/PoleBase.scad", - "export": [ - "/3DParts/PoleBase/PoleBase.stl" - ], - } diff --git a/3DParts/PoleBase/okh-PoleBase.toml b/3DParts/PoleBase/okh-PoleBase.toml new file mode 100644 index 0000000..ee142b6 --- /dev/null +++ b/3DParts/PoleBase/okh-PoleBase.toml @@ -0,0 +1,10 @@ +okhv = "2.0" +repo = "https://gitlab.com/OSEGermany/ohloom" +version = "1.0.0" +spdx-license = "CC-BY-SA-4.0" +licensor = "Jens Meisner" +documentation-language = "en-GB" +tsdc-id = "COM-MAN" +production-metadata = [ "3D printed", "PLA", "cube(size = [125,110,100]" ] +source = "/3DParts/PoleBase/PoleBase.scad" +export = [ "/3DParts/PoleBase/PoleBase.stl" ] diff --git a/3DParts/RatchetPawl/okh-RatchetPawl.json b/3DParts/RatchetPawl/okh-RatchetPawl.json deleted file mode 100644 index 0dff066..0000000 --- a/3DParts/RatchetPawl/okh-RatchetPawl.json +++ /dev/null @@ -1,20 +0,0 @@ - { - "okhv": "2.0", - "repo": "https://gitlab.com/OSEGermany/ohloom", - "version": "1.0.0", - "spdx-license": "CC-BY-SA-4.0", - "licensor": "Jens Meisner", - "image": "Documentation/Assembly_Guide/Parts_Print_4.jpg", - "documentation-language": "en-GB", - "tsdc-id": "COM-MAN", - "production-metadata": [ - "3D printed", - "PLA", - "cube(size = [130,20,20]" - ], - "source": "/3DParts/RatchetPawl/RatchetPawl.scad", - "export": [ - "/3DParts/RatchetPawl/RatchetPawl.pdf", - "/3DParts/RatchetPawl/RatchetPawl.stl" - ], - } diff --git a/3DParts/RatchetPawl/okh-RatchetPawl.toml b/3DParts/RatchetPawl/okh-RatchetPawl.toml new file mode 100644 index 0000000..4f49564 --- /dev/null +++ b/3DParts/RatchetPawl/okh-RatchetPawl.toml @@ -0,0 +1,14 @@ +okhv = "2.0" +repo = "https://gitlab.com/OSEGermany/ohloom" +version = "1.0.0" +spdx-license = "CC-BY-SA-4.0" +licensor = "Jens Meisner" +image = "Documentation/Assembly_Guide/Parts_Print_4.jpg" +documentation-language = "en-GB" +tsdc-id = "COM-MAN" +production-metadata = [ "3D printed", "PLA", "cube(size = [130,20,20]" ] +source = "/3DParts/RatchetPawl/RatchetPawl.scad" +export = [ + "/3DParts/RatchetPawl/RatchetPawl.pdf", + "/3DParts/RatchetPawl/RatchetPawl.stl" +] diff --git a/3DParts/RatchetWheel/okh-RatchetWheel.json b/3DParts/RatchetWheel/okh-RatchetWheel.json deleted file mode 100644 index 86510e4..0000000 --- a/3DParts/RatchetWheel/okh-RatchetWheel.json +++ /dev/null @@ -1,20 +0,0 @@ - { - "okhv": "2.0", - "repo": "https://gitlab.com/OSEGermany/ohloom", - "version": "1.0.0", - "spdx-license": "CC-BY-SA-4.0", - "licensor": "Jens Meisner", - "image": "Documentation/Assembly_Guide/Parts_Print_1.jpg", - "documentation-language": "en-GB", - "tsdc-id": "COM-MAN", - "production-metadata": [ - "3D printed", - "PLA", - "cylinder(h=45, r=45)" - ], - "source": "/3DParts/RatchetWheel/RatchetWheel.scad", - "export": [ - "/3DParts/RatchetWheel/RatchetWheel.pdf", - "/3DParts/RatchetWheel/RatchetWheel.stl" - ], - } diff --git a/3DParts/RatchetWheel/okh-RatchetWheel.toml b/3DParts/RatchetWheel/okh-RatchetWheel.toml new file mode 100644 index 0000000..e892532 --- /dev/null +++ b/3DParts/RatchetWheel/okh-RatchetWheel.toml @@ -0,0 +1,14 @@ +okhv = "2.0" +repo = "https://gitlab.com/OSEGermany/ohloom" +version = "1.0.0" +spdx-license = "CC-BY-SA-4.0" +licensor = "Jens Meisner" +image = "Documentation/Assembly_Guide/Parts_Print_1.jpg" +documentation-language = "en-GB" +tsdc-id = "COM-MAN" +production-metadata = [ "3D printed", "PLA", "cylinder(h=45, r=45)" ] +source = "/3DParts/RatchetWheel/RatchetWheel.scad" +export = [ + "/3DParts/RatchetWheel/RatchetWheel.pdf", + "/3DParts/RatchetWheel/RatchetWheel.stl" +] diff --git a/3DParts/ScrewSockets/okh-ScrewSockets.json b/3DParts/ScrewSockets/okh-ScrewSockets.json deleted file mode 100644 index 7643560..0000000 --- a/3DParts/ScrewSockets/okh-ScrewSockets.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "okhv": "2.0", - "repo": "https://gitlab.com/OSEGermany/ohloom", - "version": "1.0.0", - "spdx-license": "CC-BY-SA-4.0", - "licensor": "Jens Meisner", - "documentation-language": "en-GB", - "tsdc-id": "COM-MAN", - "production-metadata": [ - "3D printed", - "PLA", - "cylinder(h=12, r=7)" - ], - "source": "/3DParts/ScrewSockets/ScrewSockets.scad", - "export": [ - "/3DParts/ClampRing/ScrewSockets.pdf", - "/3DParts/ClampRing/ScrewSockets.stl" - ], - } diff --git a/3DParts/ScrewSockets/okh-ScrewSockets.toml b/3DParts/ScrewSockets/okh-ScrewSockets.toml new file mode 100644 index 0000000..d87e09c --- /dev/null +++ b/3DParts/ScrewSockets/okh-ScrewSockets.toml @@ -0,0 +1,13 @@ +okhv = "2.0" +repo = "https://gitlab.com/OSEGermany/ohloom" +version = "1.0.0" +spdx-license = "CC-BY-SA-4.0" +licensor = "Jens Meisner" +documentation-language = "en-GB" +tsdc-id = "COM-MAN" +production-metadata = [ "3D printed", "PLA", "cylinder(h=12, r=7)" ] +source = "/3DParts/ScrewSockets/ScrewSockets.scad" +export = [ + "/3DParts/ClampRing/ScrewSockets.pdf", + "/3DParts/ClampRing/ScrewSockets.stl" +] diff --git a/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json b/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json deleted file mode 100644 index 7643560..0000000 --- a/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "okhv": "2.0", - "repo": "https://gitlab.com/OSEGermany/ohloom", - "version": "1.0.0", - "spdx-license": "CC-BY-SA-4.0", - "licensor": "Jens Meisner", - "documentation-language": "en-GB", - "tsdc-id": "COM-MAN", - "production-metadata": [ - "3D printed", - "PLA", - "cylinder(h=12, r=7)" - ], - "source": "/3DParts/ScrewSockets/ScrewSockets.scad", - "export": [ - "/3DParts/ClampRing/ScrewSockets.pdf", - "/3DParts/ClampRing/ScrewSockets.stl" - ], - } diff --git a/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.toml b/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.toml new file mode 100644 index 0000000..d87e09c --- /dev/null +++ b/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.toml @@ -0,0 +1,13 @@ +okhv = "2.0" +repo = "https://gitlab.com/OSEGermany/ohloom" +version = "1.0.0" +spdx-license = "CC-BY-SA-4.0" +licensor = "Jens Meisner" +documentation-language = "en-GB" +tsdc-id = "COM-MAN" +production-metadata = [ "3D printed", "PLA", "cylinder(h=12, r=7)" ] +source = "/3DParts/ScrewSockets/ScrewSockets.scad" +export = [ + "/3DParts/ClampRing/ScrewSockets.pdf", + "/3DParts/ClampRing/ScrewSockets.stl" +] diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json deleted file mode 100644 index 8f736c9..0000000 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "okhv": "2.0", - "repo": "https://gitlab.com/OSEGermany/ohloom", - "version": "1.0.0", - "spdx-license": "CC-BY-SA-4.0", - "licensor": "Jens Meisner", - "image": "Documentation/Assembly_Guide/Parts_Print_7.jpg", - "documentation-language": "en-GB", - "tsdc-id": "COM-MAN", - "production-metadata": [ - "3D printed", - "PLA", - "cylinder(h=162, r=22.5)" - ], - "source": "/3DParts/WarpClothBeam/Warpclothbeam_P1.scad", - "export": [ - "/3DParts/WarpClothBeam/Warpclothbeam_P1.pdf", - "/3DParts/WarpClothBeam/Warpclothbeam_P1.stl" - ], - } diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.toml b/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.toml new file mode 100644 index 0000000..7ba7160 --- /dev/null +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.toml @@ -0,0 +1,14 @@ +okhv = "2.0" +repo = "https://gitlab.com/OSEGermany/ohloom" +version = "1.0.0" +spdx-license = "CC-BY-SA-4.0" +licensor = "Jens Meisner" +image = "Documentation/Assembly_Guide/Parts_Print_7.jpg" +documentation-language = "en-GB" +tsdc-id = "COM-MAN" +production-metadata = [ "3D printed", "PLA", "cylinder(h=162, r=22.5)" ] +source = "/3DParts/WarpClothBeam/Warpclothbeam_P1.scad" +export = [ + "/3DParts/WarpClothBeam/Warpclothbeam_P1.pdf", + "/3DParts/WarpClothBeam/Warpclothbeam_P1.stl" +] diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json deleted file mode 100644 index 99dc63d..0000000 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "okhv": "2.0", - "repo": "https://gitlab.com/OSEGermany/ohloom", - "version": "1.0.0", - "spdx-license": "CC-BY-SA-4.0", - "licensor": "Jens Meisner", - "image": "Documentation/Assembly_Guide/Parts_Print_7.jpg", - "documentation-language": "en-GB", - "tsdc-id": "COM-MAN", - "production-metadata": [ - "3D printed", - "PLA", - "cylinder(h=163, r=22.5)" - ], - "source": "/3DParts/WarpClothBeam/Warpclothbeam_P2.scad", - "export": [ - "/3DParts/WarpClothBeam/Warpclothbeam_P2.pdf", - "/3DParts/WarpClothBeam/Warpclothbeam_P2.stl" - ], - } diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.toml b/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.toml new file mode 100644 index 0000000..ccabf9a --- /dev/null +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.toml @@ -0,0 +1,14 @@ +okhv = "2.0" +repo = "https://gitlab.com/OSEGermany/ohloom" +version = "1.0.0" +spdx-license = "CC-BY-SA-4.0" +licensor = "Jens Meisner" +image = "Documentation/Assembly_Guide/Parts_Print_7.jpg" +documentation-language = "en-GB" +tsdc-id = "COM-MAN" +production-metadata = [ "3D printed", "PLA", "cylinder(h=163, r=22.5)" ] +source = "/3DParts/WarpClothBeam/Warpclothbeam_P2.scad" +export = [ + "/3DParts/WarpClothBeam/Warpclothbeam_P2.pdf", + "/3DParts/WarpClothBeam/Warpclothbeam_P2.stl" +] diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json deleted file mode 100644 index a95eb75..0000000 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "okhv": "2.0", - "repo": "https://gitlab.com/OSEGermany/ohloom", - "version": "1.0.0", - "spdx-license": "CC-BY-SA-4.0", - "licensor": "Jens Meisner", - "image": "Documentation/Assembly_Guide/Parts_Print_7.jpg", - "documentation-language": "en-GB", - "tsdc-id": "COM-MAN", - "production-metadata": [ - "3D printed", - "PLA", - "cylinder(h=163, r=22.5)" - ], - "source": "/3DParts/WarpClothBeam/Warpclothbeam_P3.scad", - "export": [ - "/3DParts/WarpClothBeam/Warpclothbeam_P3.pdf", - "/3DParts/WarpClothBeam/Warpclothbeam_P3.stl" - ], - } diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.toml b/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.toml new file mode 100644 index 0000000..54db6d2 --- /dev/null +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.toml @@ -0,0 +1,14 @@ +okhv = "2.0" +repo = "https://gitlab.com/OSEGermany/ohloom" +version = "1.0.0" +spdx-license = "CC-BY-SA-4.0" +licensor = "Jens Meisner" +image = "Documentation/Assembly_Guide/Parts_Print_7.jpg" +documentation-language = "en-GB" +tsdc-id = "COM-MAN" +production-metadata = [ "3D printed", "PLA", "cylinder(h=163, r=22.5)" ] +source = "/3DParts/WarpClothBeam/Warpclothbeam_P3.scad" +export = [ + "/3DParts/WarpClothBeam/Warpclothbeam_P3.pdf", + "/3DParts/WarpClothBeam/Warpclothbeam_P3.stl" +] diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json b/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json deleted file mode 100644 index da838fd..0000000 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "okhv": "2.0", - "repo": "https://gitlab.com/OSEGermany/ohloom", - "version": "1.0.0", - "spdx-license": "CC-BY-SA-4.0", - "licensor": "Jens Meisner", - "image": "Documentation/Assembly_Guide/Parts_Print_7.jpg", - "documentation-language": "en-GB", - "tsdc-id": "COM-MAN", - "production-metadata": [ - "3D printed", - "PLA", - "cylinder(h=162, r=22.5)" - ], - "source": "/3DParts/WarpClothBeam/Warpclothbeam_P4.scad", - "export": [ - "/3DParts/WarpClothBeam/Warpclothbeam_P4.pdf", - "/3DParts/WarpClothBeam/Warpclothbeam_P4.stl" - ], - } diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.toml b/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.toml new file mode 100644 index 0000000..d28fed4 --- /dev/null +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.toml @@ -0,0 +1,14 @@ +okhv = "2.0" +repo = "https://gitlab.com/OSEGermany/ohloom" +version = "1.0.0" +spdx-license = "CC-BY-SA-4.0" +licensor = "Jens Meisner" +image = "Documentation/Assembly_Guide/Parts_Print_7.jpg" +documentation-language = "en-GB" +tsdc-id = "COM-MAN" +production-metadata = [ "3D printed", "PLA", "cylinder(h=162, r=22.5)" ] +source = "/3DParts/WarpClothBeam/Warpclothbeam_P4.scad" +export = [ + "/3DParts/WarpClothBeam/Warpclothbeam_P4.pdf", + "/3DParts/WarpClothBeam/Warpclothbeam_P4.stl" +] diff --git a/WoodParts/CombHolder/okh-CombHolder.json b/WoodParts/CombHolder/okh-CombHolder.json deleted file mode 100644 index cf91e96..0000000 --- a/WoodParts/CombHolder/okh-CombHolder.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "okhv": "2.0", - "repo": "https://gitlab.com/OSEGermany/ohloom", - "version": "1.0.0", - "spdx-license": "CC-BY-SA-4.0", - "licensor": "Jens Meisner", - "image": "/Documentation/Assembly_Guide/Parts_CNC_1.jpg", - "documentation-language": "en-GB", - "tsdc-id": "COM-MAN", - "production-metadata": [ - "machined", - "wood", - "cube(size = [118,60,18]" - ], - "source": "/WoodParts/CombHolder/CombHolder.scad", - "export": [ - "/WoodParts/CombHolder/CombHolder.pdf", - "/WoodParts/CombHolder/CombHolder.stl" - ], - } diff --git a/WoodParts/CombHolder/okh-CombHolder.toml b/WoodParts/CombHolder/okh-CombHolder.toml new file mode 100644 index 0000000..ca1db9f --- /dev/null +++ b/WoodParts/CombHolder/okh-CombHolder.toml @@ -0,0 +1,15 @@ +okhv = "2.0" +repo = "https://gitlab.com/OSEGermany/ohloom" +version = "1.0.0" +spdx-license = "CC-BY-SA-4.0" +licensor = "Jens Meisner" +image = "/Documentation/Assembly_Guide/Parts_CNC_1.jpg" +documentation-language = "en-GB" +tsdc-id = "COM-MAN" +production-metadata = [ "machined", "wood", "cube(size = [118,60,18]" ] +source = "/WoodParts/CombHolder/CombHolder.scad" +export = [ + "/WoodParts/CombHolder/CombHolder.pdf", + "/WoodParts/CombHolder/CombHolder.stl" +] + diff --git a/WoodParts/Crossbeam/okh-CrossBeam.json b/WoodParts/Crossbeam/okh-CrossBeam.json deleted file mode 100644 index 2ed3064..0000000 --- a/WoodParts/Crossbeam/okh-CrossBeam.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "okhv": "2.0", - "repo": "https://gitlab.com/OSEGermany/ohloom", - "version": "1.0.0", - "spdx-license": "CC-BY-SA-4.0", - "licensor": "Jens Meisner", - "image": "/Documentation/Assembly_Guide/Parts_CNC_3.jpg", - "documentation-language": "en-GB", - "tsdc-id": "COM-MAN", - "production-metadata": [ - "machined", - "wood", - "cube(size = [572,100,20]" - ], - "source": "/WoodParts/CrossBeam/CrossBeam.scad", - "export": [ - "/WoodParts/CrossBeam/CrossBeam.pdf", - "/WoodParts/CrossBeam/CrossBeam.stl" - ], - } diff --git a/WoodParts/Crossbeam/okh-CrossBeam.toml b/WoodParts/Crossbeam/okh-CrossBeam.toml new file mode 100644 index 0000000..a4b438c --- /dev/null +++ b/WoodParts/Crossbeam/okh-CrossBeam.toml @@ -0,0 +1,14 @@ +okhv = "2.0" +repo = "https://gitlab.com/OSEGermany/ohloom" +version = "1.0.0" +spdx-license = "CC-BY-SA-4.0" +licensor = "Jens Meisner" +image = "/Documentation/Assembly_Guide/Parts_CNC_3.jpg" +documentation-language = "en-GB" +tsdc-id = "COM-MAN" +production-metadata = [ "machined", "wood", "cube(size = [572,100,20]" ] +source = "/WoodParts/CrossBeam/CrossBeam.scad" +export = [ + "/WoodParts/CrossBeam/CrossBeam.pdf", + "/WoodParts/CrossBeam/CrossBeam.stl" +] diff --git a/WoodParts/Shuttle/okh-Shuttle.json b/WoodParts/Shuttle/okh-Shuttle.json deleted file mode 100644 index 6360251..0000000 --- a/WoodParts/Shuttle/okh-Shuttle.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "okhv": "2.0", - "repo": "https://gitlab.com/OSEGermany/ohloom", - "version": "1.0.0", - "spdx-license": "CC-BY-SA-4.0", - "licensor": "Jens Meisner", - "image": "/Documentation/Assembly_Guide/Parts_CNC_6.jpg", - "documentation-language": "en-GB", - "tsdc-id": "COM-MAN", - "production-metadata": [ - "machined", - "wood", - "cube(size = [497,45,6]" - ], - "source": "/WoodParts/Shuttle/Shuttle.scad", - "export": [ - "/WoodParts/Shuttle/Shuttle.pdf", - "/WoodParts/Shuttle/Shuttle.stl" - ], - } diff --git a/WoodParts/Shuttle/okh-Shuttle.toml b/WoodParts/Shuttle/okh-Shuttle.toml new file mode 100644 index 0000000..6116b9b --- /dev/null +++ b/WoodParts/Shuttle/okh-Shuttle.toml @@ -0,0 +1,14 @@ +okhv = "2.0" +repo = "https://gitlab.com/OSEGermany/ohloom" +version = "1.0.0" +spdx-license = "CC-BY-SA-4.0" +licensor = "Jens Meisner" +image = "/Documentation/Assembly_Guide/Parts_CNC_6.jpg" +documentation-language = "en-GB" +tsdc-id = "COM-MAN" +production-metadata = [ "machined", "wood", "cube(size = [497,45,6]" ] +source = "/WoodParts/Shuttle/Shuttle.scad" +export = [ + "/WoodParts/Shuttle/Shuttle.pdf", + "/WoodParts/Shuttle/Shuttle.stl" +] diff --git a/WoodParts/SideFrame/okh-SideFrame.json b/WoodParts/SideFrame/okh-SideFrame.json deleted file mode 100644 index d8fa1ca..0000000 --- a/WoodParts/SideFrame/okh-SideFrame.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "okhv": "2.0", - "repo": "https://gitlab.com/OSEGermany/ohloom", - "version": "1.0.0", - "spdx-license": "CC-BY-SA-4.0", - "licensor": "Jens Meisner", - "image": "/Documentation/Assembly_Guide/Parts_CNC_2.jpg", - "documentation-language": "en-GB", - "tsdc-id": "COM-MAN", - "production-metadata": [ - "machined", - "wood", - "cube(size = [580,140,18]" - ], - "source": "/WoodParts/SideFrame/SideFrame.scad", - "export": [ - "/WoodParts/SideFrame/SideFrame.pdf", - "/WoodParts/SideFrame/SideFrame.stl" - ], - } diff --git a/WoodParts/SideFrame/okh-SideFrame.toml b/WoodParts/SideFrame/okh-SideFrame.toml new file mode 100644 index 0000000..4854956 --- /dev/null +++ b/WoodParts/SideFrame/okh-SideFrame.toml @@ -0,0 +1,14 @@ +okhv = "2.0" +repo = "https://gitlab.com/OSEGermany/ohloom" +version = "1.0.0" +spdx-license = "CC-BY-SA-4.0" +licensor = "Jens Meisner" +image = "/Documentation/Assembly_Guide/Parts_CNC_2.jpg" +documentation-language = "en-GB" +tsdc-id = "COM-MAN" +production-metadata = [ "machined", "wood", "cube(size = [580,140,18]" ] +source = "/WoodParts/SideFrame/SideFrame.scad" +export = [ + "/WoodParts/SideFrame/SideFrame.pdf", + "/WoodParts/SideFrame/SideFrame.stl" +] diff --git a/WoodParts/SlotBeam/okh-SlotBeam.json b/WoodParts/SlotBeam/okh-SlotBeam.json deleted file mode 100644 index 7a47b0d..0000000 --- a/WoodParts/SlotBeam/okh-SlotBeam.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "okhv": "2.0", - "repo": "https://gitlab.com/OSEGermany/ohloom", - "version": "1.0.0", - "spdx-license": "CC-BY-SA-4.0", - "licensor": "Jens Meisner", - "image": "/Documentation/Assembly_Guide/Parts_CNC_4.jpg", - "documentation-language": "en-GB", - "tsdc-id": "COM-MAN", - "production-metadata": [ - "machined", - "wood", - "cube(size = [566,24,22]" - ], - "source": "/WoodParts/SlotBeam/SlotBeam.scad", - "export": [ - "/WoodParts/SlotBeam/SlotBeam.pdf", - "/WoodParts/SlotBeam/SlotBeam.stl" - ], - } diff --git a/WoodParts/SlotBeam/okh-SlotBeam.toml b/WoodParts/SlotBeam/okh-SlotBeam.toml new file mode 100644 index 0000000..9ab1794 --- /dev/null +++ b/WoodParts/SlotBeam/okh-SlotBeam.toml @@ -0,0 +1,14 @@ +okhv = "2.0" +repo = "https://gitlab.com/OSEGermany/ohloom" +version = "1.0.0" +spdx-license = "CC-BY-SA-4.0" +licensor = "Jens Meisner" +image = "/Documentation/Assembly_Guide/Parts_CNC_4.jpg" +documentation-language = "en-GB" +tsdc-id = "COM-MAN" +production-metadata = [ "machined", "wood", "cube(size = [566,24,22]" ] +source = "/WoodParts/SlotBeam/SlotBeam.scad" +export = [ + "/WoodParts/SlotBeam/SlotBeam.pdf", + "/WoodParts/SlotBeam/SlotBeam.stl" +] diff --git a/WoodParts/StringStick/okh-StringStick.json b/WoodParts/StringStick/okh-StringStick.json deleted file mode 100644 index e532d47..0000000 --- a/WoodParts/StringStick/okh-StringStick.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "okhv": "2.0", - "repo": "https://gitlab.com/OSEGermany/ohloom", - "version": "1.0.0", - "spdx-license": "CC-BY-SA-4.0", - "licensor": "Jens Meisner", - "image": "/Documentation/Assembly_Guide/Parts_CNC_5.jpg", - "documentation-language": "en-GB", - "tsdc-id": "COM-MAN", - "production-metadata": [ - "machined", - "wood", - "cube(size = [560,22,6]" - ], - "source": "/WoodParts/StringStick/StringStick.scad", - "export": [ - "/WoodParts/StringStick/StringStick.pdf", - "/WoodParts/StringStick/StringStick.stl" - ], - } diff --git a/WoodParts/StringStick/okh-StringStick.toml b/WoodParts/StringStick/okh-StringStick.toml new file mode 100644 index 0000000..cbbd1ba --- /dev/null +++ b/WoodParts/StringStick/okh-StringStick.toml @@ -0,0 +1,14 @@ +okhv = "2.0" +repo = "https://gitlab.com/OSEGermany/ohloom" +version = "1.0.0" +spdx-license = "CC-BY-SA-4.0" +licensor = "Jens Meisner" +image = "/Documentation/Assembly_Guide/Parts_CNC_5.jpg" +documentation-language = "en-GB" +tsdc-id = "COM-MAN" +production-metadata = [ "machined", "wood", "cube(size = [560,22,6]" ] +source = "/WoodParts/StringStick/StringStick.scad" +export = [ + "/WoodParts/StringStick/StringStick.pdf", + "/WoodParts/StringStick/StringStick.stl" +] diff --git a/WoodParts/WarpClothBeam_NoCNC/okh-WarpClothBeam.json b/WoodParts/WarpClothBeam_NoCNC/okh-WarpClothBeam.json deleted file mode 100644 index 2801c9d..0000000 --- a/WoodParts/WarpClothBeam_NoCNC/okh-WarpClothBeam.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "okhv": "2.0", - "repo": "https://gitlab.com/OSEGermany/ohloom", - "version": "1.0.0", - "spdx-license": "CC-BY-SA-4.0", - "licensor": "Jens Meisner", - "image": "/Documentation/Assembly_Guide/Parts_Other_1.jpg", - "documentation-language": "en-GB", - "tsdc-id": "COM-MAN", - "production-metadata": [ - "machined", - "wood", - "cylinder(h=710, r=17.5)" - ], - "source": "/WoodParts/WarpClothBeam_NoCNC/WarpClothBeam_Wood_NoCNC.scad", - "export": [ - "/WoodParts/WarpClothBeam_NoCNC/WarpClothBeam_Shaft.pdf", - "/WoodParts/WarpClothBeam_NoCNC/WarpClothBeam_Wood_NoCNC.stl" - ], - } diff --git a/WoodParts/WarpClothBeam_NoCNC/okh-WarpClothBeam.toml b/WoodParts/WarpClothBeam_NoCNC/okh-WarpClothBeam.toml new file mode 100644 index 0000000..e0e8c34 --- /dev/null +++ b/WoodParts/WarpClothBeam_NoCNC/okh-WarpClothBeam.toml @@ -0,0 +1,14 @@ +okhv = "2.0" +repo = "https://gitlab.com/OSEGermany/ohloom" +version = "1.0.0" +spdx-license = "CC-BY-SA-4.0" +licensor = "Jens Meisner" +image = "/Documentation/Assembly_Guide/Parts_Other_1.jpg" +documentation-language = "en-GB" +tsdc-id = "COM-MAN" +production-metadata = [ "machined", "wood", "cylinder(h=710, r=17.5)" ] +source = "/WoodParts/WarpClothBeam_NoCNC/WarpClothBeam_Wood_NoCNC.scad" +export = [ + "/WoodParts/WarpClothBeam_NoCNC/WarpClothBeam_Shaft.pdf", + "/WoodParts/WarpClothBeam_NoCNC/WarpClothBeam_Wood_NoCNC.stl" +] diff --git a/okh.json b/okh.json deleted file mode 100644 index 1f2d5fa..0000000 --- a/okh.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "okhv": "2.0", - "repo": "https://gitlab.com/OSEGermany/ohloom", - "name": "OHLOOM", - "version": "1.0.0", - "spdx-license": "CC-BY-SA-4.0", - "licensor": "Jens Meisner", - "readme": "README.md", - "image": "/Documentation/User_Guide/User_Guide.jpg", - "documentation-language": "en-GB", - "project-stage": "prototype", - "function": "The Open Hardware Loom is a simple, hand-operated weaving loom made of wood, screws and 3D printed plastic pieces for the most part. It is simple to make and operate.", - "patent-class": "D03D 35/00", - "tsdc-id": "ASM-MEC", - "simplified-bom": "sBoM.csv", - "functional-metadata": "400mm fabric width", - "production-metadata": [ - "3D printed", - "wood" - ], - "source": "/Documentation/Assembly_Guide/AssemblyGuide.md", - } diff --git a/okh.toml b/okh.toml new file mode 100644 index 0000000..42e3007 --- /dev/null +++ b/okh.toml @@ -0,0 +1,17 @@ +okhv = "2.0" +repo = "https://gitlab.com/OSEGermany/ohloom" +name = "OHLOOM" +version = "1.0.0" +spdx-license = "CC-BY-SA-4.0" +licensor = "Jens Meisner" +readme = "README.md" +image = "/Documentation/User_Guide/User_Guide.jpg" +documentation-language = "en-GB" +project-stage = "prototype" +function = "The Open Hardware Loom is a simple, hand-operated weaving loom made of wood, screws and 3D printed plastic pieces for the most part. It is simple to make and operate." +patent-class = "D03D 35/00" +tsdc-id = "ASM-MEC" +simplified-bom = "sBoM.csv" +functional-metadata = "400mm fabric width" +production-metadata = [ "3D printed", "wood" ] +source = "/Documentation/Assembly_Guide/AssemblyGuide.md" -- GitLab From 4cdc395cc678d2aef2ec404a1c10718bc688348b Mon Sep 17 00:00:00 2001 From: moedn Date: Wed, 27 Jan 2021 18:14:02 +0100 Subject: [PATCH 36/38] remove redundant information --- 3DParts/ClampRing/okh-ClampRing.toml | 5 ----- 3DParts/CombModul/okh-CombModul.toml | 5 ----- 3DParts/PoleBase/okh-PoleBase.toml | 5 ----- 3DParts/RatchetPawl/okh-RatchetPawl.toml | 5 ----- 3DParts/RatchetWheel/okh-RatchetWheel.toml | 5 ----- 3DParts/ScrewSockets/okh-ScrewSockets.toml | 5 ----- 3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.toml | 5 ----- 3DParts/WarpClothBeam/okh-Warpclothbeam_P1.toml | 5 ----- 3DParts/WarpClothBeam/okh-Warpclothbeam_P2.toml | 5 ----- 3DParts/WarpClothBeam/okh-Warpclothbeam_P3.toml | 5 ----- 3DParts/WarpClothBeam/okh-Warpclothbeam_P4.toml | 5 ----- WoodParts/CombHolder/okh-CombHolder.toml | 5 ----- WoodParts/Crossbeam/okh-CrossBeam.toml | 5 ----- WoodParts/Shuttle/okh-Shuttle.toml | 5 ----- WoodParts/SideFrame/okh-SideFrame.toml | 5 ----- WoodParts/SlotBeam/okh-SlotBeam.toml | 5 ----- WoodParts/StringStick/okh-StringStick.toml | 5 ----- WoodParts/WarpClothBeam_NoCNC/okh-WarpClothBeam.toml | 5 ----- 18 files changed, 90 deletions(-) diff --git a/3DParts/ClampRing/okh-ClampRing.toml b/3DParts/ClampRing/okh-ClampRing.toml index 0429dca..5d76660 100644 --- a/3DParts/ClampRing/okh-ClampRing.toml +++ b/3DParts/ClampRing/okh-ClampRing.toml @@ -1,10 +1,5 @@ okhv = "2.0" -repo = "https://gitlab.com/OSEGermany/ohloom" -version = "1.0.0" -spdx-license = "CC-BY-SA-4.0" -licensor = "Jens Meisner" image = "/Documentation/Assembly_Guide/Parts_Print_2.jpg" -documentation-language = "en-GB" tsdc-id = "COM-MAN" production-metadata = [ "3D printed", "PLA", "cylinder(h=30, r=28)" ] source = "/3DParts/ClampRing/ClampRing.scad" diff --git a/3DParts/CombModul/okh-CombModul.toml b/3DParts/CombModul/okh-CombModul.toml index 80eb7e5..86f76d7 100644 --- a/3DParts/CombModul/okh-CombModul.toml +++ b/3DParts/CombModul/okh-CombModul.toml @@ -1,10 +1,5 @@ okhv = "2.0" -repo = "https://gitlab.com/OSEGermany/ohloom" -version = "1.0.0" -spdx-license = "CC-BY-SA-4.0" -licensor = "Jens Meisner" image = "Documentation/Assembly_Guide/Parts_Print_3.jpg" -documentation-language = "en-GB" tsdc-id = "COM-MAN" production-metadata = [ "3D printed", "PLA", "cube(size = [120,100,3]" ] source = "/3DParts/CombModul/CombModul.scad" diff --git a/3DParts/PoleBase/okh-PoleBase.toml b/3DParts/PoleBase/okh-PoleBase.toml index ee142b6..8f3b17c 100644 --- a/3DParts/PoleBase/okh-PoleBase.toml +++ b/3DParts/PoleBase/okh-PoleBase.toml @@ -1,9 +1,4 @@ okhv = "2.0" -repo = "https://gitlab.com/OSEGermany/ohloom" -version = "1.0.0" -spdx-license = "CC-BY-SA-4.0" -licensor = "Jens Meisner" -documentation-language = "en-GB" tsdc-id = "COM-MAN" production-metadata = [ "3D printed", "PLA", "cube(size = [125,110,100]" ] source = "/3DParts/PoleBase/PoleBase.scad" diff --git a/3DParts/RatchetPawl/okh-RatchetPawl.toml b/3DParts/RatchetPawl/okh-RatchetPawl.toml index 4f49564..0aabf02 100644 --- a/3DParts/RatchetPawl/okh-RatchetPawl.toml +++ b/3DParts/RatchetPawl/okh-RatchetPawl.toml @@ -1,10 +1,5 @@ okhv = "2.0" -repo = "https://gitlab.com/OSEGermany/ohloom" -version = "1.0.0" -spdx-license = "CC-BY-SA-4.0" -licensor = "Jens Meisner" image = "Documentation/Assembly_Guide/Parts_Print_4.jpg" -documentation-language = "en-GB" tsdc-id = "COM-MAN" production-metadata = [ "3D printed", "PLA", "cube(size = [130,20,20]" ] source = "/3DParts/RatchetPawl/RatchetPawl.scad" diff --git a/3DParts/RatchetWheel/okh-RatchetWheel.toml b/3DParts/RatchetWheel/okh-RatchetWheel.toml index e892532..e4b9189 100644 --- a/3DParts/RatchetWheel/okh-RatchetWheel.toml +++ b/3DParts/RatchetWheel/okh-RatchetWheel.toml @@ -1,10 +1,5 @@ okhv = "2.0" -repo = "https://gitlab.com/OSEGermany/ohloom" -version = "1.0.0" -spdx-license = "CC-BY-SA-4.0" -licensor = "Jens Meisner" image = "Documentation/Assembly_Guide/Parts_Print_1.jpg" -documentation-language = "en-GB" tsdc-id = "COM-MAN" production-metadata = [ "3D printed", "PLA", "cylinder(h=45, r=45)" ] source = "/3DParts/RatchetWheel/RatchetWheel.scad" diff --git a/3DParts/ScrewSockets/okh-ScrewSockets.toml b/3DParts/ScrewSockets/okh-ScrewSockets.toml index d87e09c..408f724 100644 --- a/3DParts/ScrewSockets/okh-ScrewSockets.toml +++ b/3DParts/ScrewSockets/okh-ScrewSockets.toml @@ -1,9 +1,4 @@ okhv = "2.0" -repo = "https://gitlab.com/OSEGermany/ohloom" -version = "1.0.0" -spdx-license = "CC-BY-SA-4.0" -licensor = "Jens Meisner" -documentation-language = "en-GB" tsdc-id = "COM-MAN" production-metadata = [ "3D printed", "PLA", "cylinder(h=12, r=7)" ] source = "/3DParts/ScrewSockets/ScrewSockets.scad" diff --git a/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.toml b/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.toml index d87e09c..408f724 100644 --- a/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.toml +++ b/3DParts/ScrewSockets/okh-ScrewSockets4ScrewHead.toml @@ -1,9 +1,4 @@ okhv = "2.0" -repo = "https://gitlab.com/OSEGermany/ohloom" -version = "1.0.0" -spdx-license = "CC-BY-SA-4.0" -licensor = "Jens Meisner" -documentation-language = "en-GB" tsdc-id = "COM-MAN" production-metadata = [ "3D printed", "PLA", "cylinder(h=12, r=7)" ] source = "/3DParts/ScrewSockets/ScrewSockets.scad" diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.toml b/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.toml index 7ba7160..13b28d7 100644 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.toml +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P1.toml @@ -1,10 +1,5 @@ okhv = "2.0" -repo = "https://gitlab.com/OSEGermany/ohloom" -version = "1.0.0" -spdx-license = "CC-BY-SA-4.0" -licensor = "Jens Meisner" image = "Documentation/Assembly_Guide/Parts_Print_7.jpg" -documentation-language = "en-GB" tsdc-id = "COM-MAN" production-metadata = [ "3D printed", "PLA", "cylinder(h=162, r=22.5)" ] source = "/3DParts/WarpClothBeam/Warpclothbeam_P1.scad" diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.toml b/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.toml index ccabf9a..02fb7f1 100644 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.toml +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P2.toml @@ -1,10 +1,5 @@ okhv = "2.0" -repo = "https://gitlab.com/OSEGermany/ohloom" -version = "1.0.0" -spdx-license = "CC-BY-SA-4.0" -licensor = "Jens Meisner" image = "Documentation/Assembly_Guide/Parts_Print_7.jpg" -documentation-language = "en-GB" tsdc-id = "COM-MAN" production-metadata = [ "3D printed", "PLA", "cylinder(h=163, r=22.5)" ] source = "/3DParts/WarpClothBeam/Warpclothbeam_P2.scad" diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.toml b/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.toml index 54db6d2..f1163e4 100644 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.toml +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P3.toml @@ -1,10 +1,5 @@ okhv = "2.0" -repo = "https://gitlab.com/OSEGermany/ohloom" -version = "1.0.0" -spdx-license = "CC-BY-SA-4.0" -licensor = "Jens Meisner" image = "Documentation/Assembly_Guide/Parts_Print_7.jpg" -documentation-language = "en-GB" tsdc-id = "COM-MAN" production-metadata = [ "3D printed", "PLA", "cylinder(h=163, r=22.5)" ] source = "/3DParts/WarpClothBeam/Warpclothbeam_P3.scad" diff --git a/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.toml b/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.toml index d28fed4..e630195 100644 --- a/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.toml +++ b/3DParts/WarpClothBeam/okh-Warpclothbeam_P4.toml @@ -1,10 +1,5 @@ okhv = "2.0" -repo = "https://gitlab.com/OSEGermany/ohloom" -version = "1.0.0" -spdx-license = "CC-BY-SA-4.0" -licensor = "Jens Meisner" image = "Documentation/Assembly_Guide/Parts_Print_7.jpg" -documentation-language = "en-GB" tsdc-id = "COM-MAN" production-metadata = [ "3D printed", "PLA", "cylinder(h=162, r=22.5)" ] source = "/3DParts/WarpClothBeam/Warpclothbeam_P4.scad" diff --git a/WoodParts/CombHolder/okh-CombHolder.toml b/WoodParts/CombHolder/okh-CombHolder.toml index ca1db9f..bd9bb33 100644 --- a/WoodParts/CombHolder/okh-CombHolder.toml +++ b/WoodParts/CombHolder/okh-CombHolder.toml @@ -1,10 +1,5 @@ okhv = "2.0" -repo = "https://gitlab.com/OSEGermany/ohloom" -version = "1.0.0" -spdx-license = "CC-BY-SA-4.0" -licensor = "Jens Meisner" image = "/Documentation/Assembly_Guide/Parts_CNC_1.jpg" -documentation-language = "en-GB" tsdc-id = "COM-MAN" production-metadata = [ "machined", "wood", "cube(size = [118,60,18]" ] source = "/WoodParts/CombHolder/CombHolder.scad" diff --git a/WoodParts/Crossbeam/okh-CrossBeam.toml b/WoodParts/Crossbeam/okh-CrossBeam.toml index a4b438c..66554f6 100644 --- a/WoodParts/Crossbeam/okh-CrossBeam.toml +++ b/WoodParts/Crossbeam/okh-CrossBeam.toml @@ -1,10 +1,5 @@ okhv = "2.0" -repo = "https://gitlab.com/OSEGermany/ohloom" -version = "1.0.0" -spdx-license = "CC-BY-SA-4.0" -licensor = "Jens Meisner" image = "/Documentation/Assembly_Guide/Parts_CNC_3.jpg" -documentation-language = "en-GB" tsdc-id = "COM-MAN" production-metadata = [ "machined", "wood", "cube(size = [572,100,20]" ] source = "/WoodParts/CrossBeam/CrossBeam.scad" diff --git a/WoodParts/Shuttle/okh-Shuttle.toml b/WoodParts/Shuttle/okh-Shuttle.toml index 6116b9b..a996083 100644 --- a/WoodParts/Shuttle/okh-Shuttle.toml +++ b/WoodParts/Shuttle/okh-Shuttle.toml @@ -1,10 +1,5 @@ okhv = "2.0" -repo = "https://gitlab.com/OSEGermany/ohloom" -version = "1.0.0" -spdx-license = "CC-BY-SA-4.0" -licensor = "Jens Meisner" image = "/Documentation/Assembly_Guide/Parts_CNC_6.jpg" -documentation-language = "en-GB" tsdc-id = "COM-MAN" production-metadata = [ "machined", "wood", "cube(size = [497,45,6]" ] source = "/WoodParts/Shuttle/Shuttle.scad" diff --git a/WoodParts/SideFrame/okh-SideFrame.toml b/WoodParts/SideFrame/okh-SideFrame.toml index 4854956..88a5f18 100644 --- a/WoodParts/SideFrame/okh-SideFrame.toml +++ b/WoodParts/SideFrame/okh-SideFrame.toml @@ -1,10 +1,5 @@ okhv = "2.0" -repo = "https://gitlab.com/OSEGermany/ohloom" -version = "1.0.0" -spdx-license = "CC-BY-SA-4.0" -licensor = "Jens Meisner" image = "/Documentation/Assembly_Guide/Parts_CNC_2.jpg" -documentation-language = "en-GB" tsdc-id = "COM-MAN" production-metadata = [ "machined", "wood", "cube(size = [580,140,18]" ] source = "/WoodParts/SideFrame/SideFrame.scad" diff --git a/WoodParts/SlotBeam/okh-SlotBeam.toml b/WoodParts/SlotBeam/okh-SlotBeam.toml index 9ab1794..4458dbc 100644 --- a/WoodParts/SlotBeam/okh-SlotBeam.toml +++ b/WoodParts/SlotBeam/okh-SlotBeam.toml @@ -1,10 +1,5 @@ okhv = "2.0" -repo = "https://gitlab.com/OSEGermany/ohloom" -version = "1.0.0" -spdx-license = "CC-BY-SA-4.0" -licensor = "Jens Meisner" image = "/Documentation/Assembly_Guide/Parts_CNC_4.jpg" -documentation-language = "en-GB" tsdc-id = "COM-MAN" production-metadata = [ "machined", "wood", "cube(size = [566,24,22]" ] source = "/WoodParts/SlotBeam/SlotBeam.scad" diff --git a/WoodParts/StringStick/okh-StringStick.toml b/WoodParts/StringStick/okh-StringStick.toml index cbbd1ba..ed31805 100644 --- a/WoodParts/StringStick/okh-StringStick.toml +++ b/WoodParts/StringStick/okh-StringStick.toml @@ -1,10 +1,5 @@ okhv = "2.0" -repo = "https://gitlab.com/OSEGermany/ohloom" -version = "1.0.0" -spdx-license = "CC-BY-SA-4.0" -licensor = "Jens Meisner" image = "/Documentation/Assembly_Guide/Parts_CNC_5.jpg" -documentation-language = "en-GB" tsdc-id = "COM-MAN" production-metadata = [ "machined", "wood", "cube(size = [560,22,6]" ] source = "/WoodParts/StringStick/StringStick.scad" diff --git a/WoodParts/WarpClothBeam_NoCNC/okh-WarpClothBeam.toml b/WoodParts/WarpClothBeam_NoCNC/okh-WarpClothBeam.toml index e0e8c34..8111623 100644 --- a/WoodParts/WarpClothBeam_NoCNC/okh-WarpClothBeam.toml +++ b/WoodParts/WarpClothBeam_NoCNC/okh-WarpClothBeam.toml @@ -1,10 +1,5 @@ okhv = "2.0" -repo = "https://gitlab.com/OSEGermany/ohloom" -version = "1.0.0" -spdx-license = "CC-BY-SA-4.0" -licensor = "Jens Meisner" image = "/Documentation/Assembly_Guide/Parts_Other_1.jpg" -documentation-language = "en-GB" tsdc-id = "COM-MAN" production-metadata = [ "machined", "wood", "cylinder(h=710, r=17.5)" ] source = "/WoodParts/WarpClothBeam_NoCNC/WarpClothBeam_Wood_NoCNC.scad" -- GitLab From 51bd0bacd09df402f848f5e4251e33e2f8e22ab1 Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 2 Feb 2021 16:13:44 +0100 Subject: [PATCH 37/38] add measure --- sBoM.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sBoM.csv b/sBoM.csv index 664dd99..edecc2d 100644 --- a/sBoM.csv +++ b/sBoM.csv @@ -3,7 +3,7 @@ POS NAME UNITS TYPE REFERENCE 2 M8 Nuts 4 STD ISO 4032 M8 3 M8 Nuts with Rubber 2 STD ISO 7040 M8 4 M6 Nuts 4 STD ISO 4032 M6 -5 M6 Cylinder Screw 4 STD ISO 8677 M6 x ?? +5 M6 Cylinder Screw 4 STD ISO 8677 M6 x 70 6 W60x4 Wood Screw 8 STD DIN 7997 4 x 60 7 W35x4 Wood Screw 4 STD DIN 7997 4 x 35 8 W12x4 Wood Screw 16 STD DIN 7997 4 x 12 -- GitLab From 6c7fa81df9ae6f6a3c736e135c9572c0bce69915 Mon Sep 17 00:00:00 2001 From: moedn Date: Tue, 2 Feb 2021 16:14:03 +0100 Subject: [PATCH 38/38] add note to source --- 3DParts/ScrewSockets/NOTE-to-source | 1 + 3DParts/WarpClothBeam/NOTE-to-source | 1 + 2 files changed, 2 insertions(+) create mode 100644 3DParts/ScrewSockets/NOTE-to-source create mode 100644 3DParts/WarpClothBeam/NOTE-to-source diff --git a/3DParts/ScrewSockets/NOTE-to-source b/3DParts/ScrewSockets/NOTE-to-source new file mode 100644 index 0000000..7bc1b4b --- /dev/null +++ b/3DParts/ScrewSockets/NOTE-to-source @@ -0,0 +1 @@ +Both STL files are exports from the same SCAD file. Indeed, there's just a minor change between them, so we thought a single source file would be more handy. diff --git a/3DParts/WarpClothBeam/NOTE-to-source b/3DParts/WarpClothBeam/NOTE-to-source new file mode 100644 index 0000000..939379a --- /dev/null +++ b/3DParts/WarpClothBeam/NOTE-to-source @@ -0,0 +1 @@ +All STL files are exports from the same SCAD file. Indeed, there're just minor changes between them, so we thought a single source file would be more handy. -- GitLab