From 8d052969c33072a61a5112be6171172420544584 Mon Sep 17 00:00:00 2001 From: Matthias Cullmann Date: Thu, 16 Mar 2023 19:42:25 +0100 Subject: [PATCH] Feinschliff --- LICENSE.txt | 289 ------------------------------------ LICENSES/README.md | 6 + bom.csv | 75 +++++----- howto.md | 163 -------------------- mod/B_Lampenstiel/README.md | 5 +- 5 files changed, 47 insertions(+), 491 deletions(-) delete mode 100644 LICENSE.txt delete mode 100644 howto.md diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 114486f..0000000 --- a/LICENSE.txt +++ /dev/null @@ -1,289 +0,0 @@ -CERN Open Hardware Licence Version 2 - Strongly Reciprocal - - -Preamble - -CERN has developed this licence to promote collaboration among -hardware designers and to provide a legal tool which supports the -freedom to use, study, modify, share and distribute hardware designs -and products based on those designs. Version 2 of the CERN Open -Hardware Licence comes in three variants: CERN-OHL-P (permissive); and -two reciprocal licences: CERN-OHL-W (weakly reciprocal) and this -licence, CERN-OHL-S (strongly reciprocal). - -The CERN-OHL-S is copyright CERN 2020. Anyone is welcome to use it, in -unmodified form only. - -Use of this Licence does not imply any endorsement by CERN of any -Licensor or their designs nor does it imply any involvement by CERN in -their development. - - -1 Definitions - - 1.1 'Licence' means this CERN-OHL-S. - - 1.2 'Compatible Licence' means - - a) any earlier version of the CERN Open Hardware licence, or - - b) any version of the CERN-OHL-S, or - - c) any licence which permits You to treat the Source to which - it applies as licensed under CERN-OHL-S provided that on - Conveyance of any such Source, or any associated Product You - treat the Source in question as being licensed under - CERN-OHL-S. - - 1.3 'Source' means information such as design materials or digital - code which can be applied to Make or test a Product or to - prepare a Product for use, Conveyance or sale, regardless of its - medium or how it is expressed. It may include Notices. - - 1.4 'Covered Source' means Source that is explicitly made available - under this Licence. - - 1.5 'Product' means any device, component, work or physical object, - whether in finished or intermediate form, arising from the use, - application or processing of Covered Source. - - 1.6 'Make' means to create or configure something, whether by - manufacture, assembly, compiling, loading or applying Covered - Source or another Product or otherwise. - - 1.7 'Available Component' means any part, sub-assembly, library or - code which: - - a) is licensed to You as Complete Source under a Compatible - Licence; or - - b) is available, at the time a Product or the Source containing - it is first Conveyed, to You and any other prospective - licensees - - i) as a physical part with sufficient rights and - information (including any configuration and - programming files and information about its - characteristics and interfaces) to enable it either to - be Made itself, or to be sourced and used to Make the - Product; or - ii) as part of the normal distribution of a tool used to - design or Make the Product. - - 1.8 'Complete Source' means the set of all Source necessary to Make - a Product, in the preferred form for making modifications, - including necessary installation and interfacing information - both for the Product, and for any included Available Components. - If the format is proprietary, it must also be made available in - a format (if the proprietary tool can create it) which is - viewable with a tool available to potential licensees and - licensed under a licence approved by the Free Software - Foundation or the Open Source Initiative. Complete Source need - not include the Source of any Available Component, provided that - You include in the Complete Source sufficient information to - enable a recipient to Make or source and use the Available - Component to Make the Product. - - 1.9 'Source Location' means a location where a Licensor has placed - Covered Source, and which that Licensor reasonably believes will - remain easily accessible for at least three years for anyone to - obtain a digital copy. - - 1.10 'Notice' means copyright, acknowledgement and trademark notices, - Source Location references, modification notices (subsection - 3.3(b)) and all notices that refer to this Licence and to the - disclaimer of warranties that are included in the Covered - Source. - - 1.11 'Licensee' or 'You' means any person exercising rights under - this Licence. - - 1.12 'Licensor' means a natural or legal person who creates or - modifies Covered Source. A person may be a Licensee and a - Licensor at the same time. - - 1.13 'Convey' means to communicate to the public or distribute. - - -2 Applicability - - 2.1 This Licence governs the use, copying, modification, Conveying - of Covered Source and Products, and the Making of Products. By - exercising any right granted under this Licence, You irrevocably - accept these terms and conditions. - - 2.2 This Licence is granted by the Licensor directly to You, and - shall apply worldwide and without limitation in time. - - 2.3 You shall not attempt to restrict by contract or otherwise the - rights granted under this Licence to other Licensees. - - 2.4 This Licence is not intended to restrict fair use, fair dealing, - or any other similar right. - - -3 Copying, modifying and Conveying Covered Source - - 3.1 You may copy and Convey verbatim copies of Covered Source, in - any medium, provided You retain all Notices. - - 3.2 You may modify Covered Source, other than Notices, provided that - You irrevocably undertake to make that modified Covered Source - available from a Source Location should You Convey a Product in - circumstances where the recipient does not otherwise receive a - copy of the modified Covered Source. In each case subsection 3.3 - shall apply. - - You may only delete Notices if they are no longer applicable to - the corresponding Covered Source as modified by You and You may - add additional Notices applicable to Your modifications. - Including Covered Source in a larger work is modifying the - Covered Source, and the larger work becomes modified Covered - Source. - - 3.3 You may Convey modified Covered Source (with the effect that You - shall also become a Licensor) provided that You: - - a) retain Notices as required in subsection 3.2; - - b) add a Notice to the modified Covered Source stating that You - have modified it, with the date and brief description of how - You have modified it; - - c) add a Source Location Notice for the modified Covered Source - if You Convey in circumstances where the recipient does not - otherwise receive a copy of the modified Covered Source; and - - d) license the modified Covered Source under the terms and - conditions of this Licence (or, as set out in subsection - 8.3, a later version, if permitted by the licence of the - original Covered Source). Such modified Covered Source must - be licensed as a whole, but excluding Available Components - contained in it, which remain licensed under their own - applicable licences. - - -4 Making and Conveying Products - -You may Make Products, and/or Convey them, provided that You either -provide each recipient with a copy of the Complete Source or ensure -that each recipient is notified of the Source Location of the Complete -Source. That Complete Source is Covered Source, and You must -accordingly satisfy Your obligations set out in subsection 3.3. If -specified in a Notice, the Product must visibly and securely display -the Source Location on it or its packaging or documentation in the -manner specified in that Notice. - - -5 Research and Development - -You may Convey Covered Source, modified Covered Source or Products to -a legal entity carrying out development, testing or quality assurance -work on Your behalf provided that the work is performed on terms which -prevent the entity from both using the Source or Products for its own -internal purposes and Conveying the Source or Products or any -modifications to them to any person other than You. Any modifications -made by the entity shall be deemed to be made by You pursuant to -subsection 3.2. - - -6 DISCLAIMER AND LIABILITY - - 6.1 DISCLAIMER OF WARRANTY -- The Covered Source and any Products - are provided 'as is' and any express or implied warranties, - including, but not limited to, implied warranties of - merchantability, of satisfactory quality, non-infringement of - third party rights, and fitness for a particular purpose or use - are disclaimed in respect of any Source or Product to the - maximum extent permitted by law. The Licensor makes no - representation that any Source or Product does not or will not - infringe any patent, copyright, trade secret or other - proprietary right. The entire risk as to the use, quality, and - performance of any Source or Product shall be with You and not - the Licensor. This disclaimer of warranty is an essential part - of this Licence and a condition for the grant of any rights - granted under this Licence. - - 6.2 EXCLUSION AND LIMITATION OF LIABILITY -- The Licensor shall, to - the maximum extent permitted by law, have no liability for - direct, indirect, special, incidental, consequential, exemplary, - punitive or other damages of any character including, without - limitation, procurement of substitute goods or services, loss of - use, data or profits, or business interruption, however caused - and on any theory of contract, warranty, tort (including - negligence), product liability or otherwise, arising in any way - in relation to the Covered Source, modified Covered Source - and/or the Making or Conveyance of a Product, even if advised of - the possibility of such damages, and You shall hold the - Licensor(s) free and harmless from any liability, costs, - damages, fees and expenses, including claims by third parties, - in relation to such use. - - -7 Patents - - 7.1 Subject to the terms and conditions of this Licence, each - Licensor hereby grants to You a perpetual, worldwide, - non-exclusive, no-charge, royalty-free, irrevocable (except as - stated in subsections 7.2 and 8.4) patent license to Make, have - Made, use, offer to sell, sell, import, and otherwise transfer - the Covered Source and Products, where such licence applies only - to those patent claims licensable by such Licensor that are - necessarily infringed by exercising rights under the Covered - Source as Conveyed by that Licensor. - - 7.2 If You institute patent litigation against any entity (including - a cross-claim or counterclaim in a lawsuit) alleging that the - Covered Source or a Product constitutes direct or contributory - patent infringement, or You seek any declaration that a patent - licensed to You under this Licence is invalid or unenforceable - then any rights granted to You under this Licence shall - terminate as of the date such process is initiated. - - -8 General - - 8.1 If any provisions of this Licence are or subsequently become - invalid or unenforceable for any reason, the remaining - provisions shall remain effective. - - 8.2 You shall not use any of the name (including acronyms and - abbreviations), image, or logo by which the Licensor or CERN is - known, except where needed to comply with section 3, or where - the use is otherwise allowed by law. Any such permitted use - shall be factual and shall not be made so as to suggest any kind - of endorsement or implication of involvement by the Licensor or - its personnel. - - 8.3 CERN may publish updated versions and variants of this Licence - which it considers to be in the spirit of this version, but may - differ in detail to address new problems or concerns. New - versions will be published with a unique version number and a - variant identifier specifying the variant. If the Licensor has - specified that a given variant applies to the Covered Source - without specifying a version, You may treat that Covered Source - as being released under any version of the CERN-OHL with that - variant. If no variant is specified, the Covered Source shall be - treated as being released under CERN-OHL-S. The Licensor may - also specify that the Covered Source is subject to a specific - version of the CERN-OHL or any later version in which case You - may apply this or any later version of CERN-OHL with the same - variant identifier published by CERN. - - 8.4 This Licence shall terminate with immediate effect if You fail - to comply with any of its terms and conditions. - - 8.5 However, if You cease all breaches of this Licence, then Your - Licence from any Licensor is reinstated unless such Licensor has - terminated this Licence by giving You, while You remain in - breach, a notice specifying the breach and requiring You to cure - it within 30 days, and You have failed to come into compliance - in all material respects by the end of the 30 day period. Should - You repeat the breach after receipt of a cure notice and - subsequent reinstatement, this Licence will terminate - immediately and permanently. Section 6 shall continue to apply - after any termination. - - 8.6 This Licence shall not be enforceable except by a Licensor - acting as such, and third party beneficiary rights are - specifically excluded. diff --git a/LICENSES/README.md b/LICENSES/README.md index 49f8848..b6dcbc2 100644 --- a/LICENSES/README.md +++ b/LICENSES/README.md @@ -1,3 +1,9 @@ # README `LICENSES/` REUSE license files (preferred over single LICENSE file) + + diff --git a/bom.csv b/bom.csv index e25d448..8796e71 100644 --- a/bom.csv +++ b/bom.csv @@ -21,55 +21,56 @@ POS,PHASE,NAME,UNITS,DESCRIPTION,SOURCE,LINK 13,A7,Große Plastiktasche,1,"eine große Plastiktasche, wie die großen blauen von IKEA",z.B. bei IKEA,https://www.ikea.com/de/de/p/frakta-tasche-gross-blau-17228340/ 14,A5,Wassersprühflasche,1,Sprühflasche mit Wasser,Drogerie oder Recycling, 15,A5,Weizenmehl,4 EL,normales Weizenmehl,Supermarkt oder Drogerie, +16,A5,"Optional: Gelber Sack, Müllbeutel",1,,, ,,,,,, ,,Getreidekultur,,,, ,,,,,, -16,A1,Gläser mit Deckel,>1,Schraubglas mit Deckel ab 600ml,Recycling oder neu z.B. bei Flaschenland,https://www.flaschenland.de/Marmeladenglaeser-Einmachglaeser/Glaeser/ab-400ml-Glaeser/1065ml-Rundglas-mit-Twist-Off-82.html -17a,A1,Aquarienfilterwatte,etwas,Filterwatte für Aquarienfilter,Zoohandlung z.B. bei Fressnapf,https://www.fressnapf.de/p/anione-filterwatte-m-1235284/?isSearchPage=filterwatte -17b,A1,alternativ: Füllwatte,etwas,Füllwatte aus Kunststoff als Kuscheltier- oder Kopfkissenfüllung,Kuscheltierschlachtung, -18,A1,Schnellkochtopf,1,Dampfruckkochtopf oder professioneller Autoclav,gebraucht über Kleinanzeigen oder neu,https://www.kaufland.de/schnellkochtoepfe/ -19a,A1,Roggen,500g,Roggen in Bioqualität,Supermarkt oder Drogerie z.B. Alnatura,https://www.alnatura.de/de-de/produkte/alle-produkte/getreide-koerner-getreideprodukte/getreide-ganzes-korn/roggen-200049/ -19b,A1,alternativ: Sittichfutter,,Wellensittichfutter mit hohem Hirseanteil,Zoohandel z.B. Fressnapf,https://www.fressnapf.de/p/multifit-wellensittichfutter-3-kg-1286331/ -20,A1,Pilzkultur,,"als Flüssigkultur, Petrischale oder bereits durchwachsene Getreidebrut",Pilzfachhandel oder eigene Herstellung, -21,A1,Alufolie,Rolle,,Supermarkt oder Drogerie z.B. Rossmann,https://www.rossmann.de/de/haushalt-rubin-aluminiumfolie/p/4305615414409 -22,A1,Plastikbox,1,"transparente Box, groß genug um drin zu arbeiten",Baumarkt oder IKEA,https://www.ikea.com/de/de/p/samla-box-transparent-00102975/ -23,A1,Topf und Sieb,,zum Kochen und Abgießen des Getreides,, +17,A1,Gläser mit Deckel,>1,Schraubglas mit Deckel ab 600ml,Recycling oder neu z.B. bei Flaschenland,https://www.flaschenland.de/Marmeladenglaeser-Einmachglaeser/Glaeser/ab-400ml-Glaeser/1065ml-Rundglas-mit-Twist-Off-82.html +18a,A1,Aquarienfilterwatte,etwas,Filterwatte für Aquarienfilter,Zoohandlung z.B. bei Fressnapf,https://www.fressnapf.de/p/anione-filterwatte-m-1235284/?isSearchPage=filterwatte +18b,A1,alternativ: Füllwatte,etwas,Füllwatte aus Kunststoff als Kuscheltier- oder Kopfkissenfüllung,Kuscheltierschlachtung, +19,A1,Schnellkochtopf,1,Dampfruckkochtopf oder professioneller Autoclav,gebraucht über Kleinanzeigen oder neu,https://www.kaufland.de/schnellkochtoepfe/ +20a,A1,Roggen,500g,Roggen in Bioqualität,Supermarkt oder Drogerie z.B. Alnatura,https://www.alnatura.de/de-de/produkte/alle-produkte/getreide-koerner-getreideprodukte/getreide-ganzes-korn/roggen-200049/ +20b,A1,alternativ: Sittichfutter,,Wellensittichfutter mit hohem Hirseanteil,Zoohandel z.B. Fressnapf,https://www.fressnapf.de/p/multifit-wellensittichfutter-3-kg-1286331/ +21,A1,Pilzkultur,,"als Flüssigkultur, Petrischale oder bereits durchwachsene Getreidebrut",Pilzfachhandel oder eigene Herstellung, +22,A1,Alufolie,Rolle,,Supermarkt oder Drogerie z.B. Rossmann,https://www.rossmann.de/de/haushalt-rubin-aluminiumfolie/p/4305615414409 +23,A1,Plastikbox,1,"transparente Box, groß genug um drin zu arbeiten",Baumarkt oder IKEA,https://www.ikea.com/de/de/p/samla-box-transparent-00102975/ +24,A1,Topf und Sieb,,zum Kochen und Abgießen des Getreides,, ,,,,,, ,," Lampenhardware",,,, ,,,,,, -24,B,Rundstab Holz,1,Rundstab 28x28x2400mm,Baumarkt z.B. Bauhaus Buche oder Bauhaus Kiefer,https://www.bauhaus.info/rundstaebe/rundstab/p/14608123 -25,D,Lampenaufhängung,1,"Lampenfassung E14 mit 4m Stoffkabel, Schalter und Stecker, weiß",z.B. IKEA,https://www.ikea.com/de/de/p/strala-lampenaufhaengung-weiss-20366404/ -26,D,alternativ: Lampenfassung E27,1,Lampenfassung E27 mit Stoffkabel in schwarz,IKEA,https://www.ikea.com/de/de/p/havsris-aufhaengung-mit-schalter-textil-schwarz-10511109/ -27,D,Leuchtmittel,1,E14 LED Leuchtmittel mit 4-6 Watt in Warmweiß. Schlanke Form,Baumarkt z.B. OBI oder OBI,https://www.obi.de/e14-led/osram-led-lampe-classic-t-form-klar-e14-4w-470-lm-warmweiss/p/8471187 -28,D,Klettkabelbinder,2,Klett Kabelbinder oder normale Kabelbinder,Baumarkt z.B. bei OBI,https://www.obi.de/zubehoer-fuer-computer-multimedia/schwaiger-klett-kabelbinder-rolle-doppelseitig-ltc-roll-straps-mehrfarbig/p/8368805 -29,B,Holzdübel,2,Holzdübel Ø 8mm,Baumarkt, +25,B,Rundstab Holz,1,Rundstab 28x28x2400mm,Baumarkt z.B. Bauhaus Buche oder Bauhaus Kiefer,https://www.bauhaus.info/rundstaebe/rundstab/p/14608123 +26,D,Lampenaufhängung,1,"Lampenfassung E14 mit 4m Stoffkabel, Schalter und Stecker, weiß",z.B. IKEA,https://www.ikea.com/de/de/p/strala-lampenaufhaengung-weiss-20366404/ +27,D,alternativ: Lampenfassung E27,1,Lampenfassung E27 mit Stoffkabel in schwarz,IKEA,https://www.ikea.com/de/de/p/havsris-aufhaengung-mit-schalter-textil-schwarz-10511109/ +28,D,Leuchtmittel,1,E14 LED Leuchtmittel mit 4-6 Watt in Warmweiß. Schlanke Form,Baumarkt z.B. OBI oder OBI,https://www.obi.de/e14-led/osram-led-lampe-classic-t-form-klar-e14-4w-470-lm-warmweiss/p/8471187 +29,D,Klettkabelbinder,2,Klett Kabelbinder oder normale Kabelbinder,Baumarkt z.B. bei OBI,https://www.obi.de/zubehoer-fuer-computer-multimedia/schwaiger-klett-kabelbinder-rolle-doppelseitig-ltc-roll-straps-mehrfarbig/p/8368805 +30,B,Holzdübel,2,Holzdübel Ø 8mm,Baumarkt, ,,,,,, ,," Lampenfuß",,,, ,,,,,, -30,C,Maisstärke,300g,als Speisestärke gut erhältlich,Supermarkt z.B. REWE,https://shop.rewe.de/p/ja-feine-speisestaerke-reine-maisstaerke-400g/8245234 -31,C,Sand,"1,5 kg",feiner sauberer Sand. z.B. Spielsand oder Vogelsand,Baumarkt z.B. Hagebaumarkt,https://www.hagebau.de/p/go-on-sand-spielsand-braun%C3%98-beige-anP7000090803/ -32,C,Form für den Lampenfuß mit Deckel,1,"Rund (z.B. Ø 18cm x 13,5) muss Mikrowellengeeignet sein.","Baumarkt, Billigladen, Recycling", -33,C,optional: Kurkuma oder Rote Beete Saft,,zum Färben des Fußes,Supermarkt, +31,C,Maisstärke,300g,als Speisestärke gut erhältlich,Supermarkt z.B. REWE,https://shop.rewe.de/p/ja-feine-speisestaerke-reine-maisstaerke-400g/8245234 +32,C,Sand,"1,5 kg",feiner sauberer Sand. z.B. Spielsand oder Vogelsand,Baumarkt z.B. Hagebaumarkt,https://www.hagebau.de/p/go-on-sand-spielsand-braun%C3%98-beige-anP7000090803/ +33,C,Form für den Lampenfuß mit Deckel,1,"Rund (z.B. Ø 18cm x 13,5) muss Mikrowellengeeignet sein.","Baumarkt, Billigladen, Recycling", +34,C,optional: Kurkuma oder Rote Beete Saft,,zum Färben des Fußes,Supermarkt, ,,,,,, ,," Küchenutensilien",,,, ,,,,,, -34,A1-A3,Wasserkocher oder Herd,,,, -35,A1-A5,Wasser,,,, -36,A3,großer Topf oder Eimer mit Deckel (min. 5 Liter),,,, -37,C,Schüssel zum Mischen,,,, -38,"A,C",Messbecher 1L,,,, -39,"A,C",Esslöffel,,,, -40,"A,C","großer Metalllöffel, z.B. von Salatbesteck",,,, -41,C,Mikrowelle,,,, -42,"A,C",Waage (d:1g),,,, +35,A1-A3,Wasserkocher oder Herd,,,, +36,A1-A5,Wasser,,,, +37,A3,großer Topf oder Eimer mit Deckel (min. 5 Liter),,,, +38,C,Schüssel zum Mischen,,,, +39,"A,C",Messbecher 1L,,,, +40,"A,C",Esslöffel,,,, +41,"A,C","großer Metalllöffel, z.B. von Salatbesteck",,,, +42,C,Mikrowelle,,,, +43,"A,C",Waage (d:1g),,,, ,,,,,, ,,Werkzeug & Maschinen,,,, ,,,,,, -43,D,Tackerpistole mit 10mm Nadeln,,,, -44,B,Oberfräse mit 6-8mm Nutfräse,,,, -45,B,"Kappsäge, Japansäge o.ä…",,,, -46,B,Schraubzwingen,,,, -47,B,Akkuschrauber,,,, -48,D,Lochbohrer mit Ø 29mm,,,, -49,B,Holzbohrer 8mm Ø,,,, -50,B,"Zollstock, Maßband",,,, \ No newline at end of file +44,D,Tackerpistole mit 10mm Nadeln,,,, +45,B,Oberfräse mit 6-8mm Nutfräse,,,, +46,B,"Kappsäge, Japansäge o.ä…",,,, +47,B,Schraubzwingen,,,, +48,B,Akkuschrauber,,,, +49,D,Lochbohrer mit Ø 29mm,,,, +50,B,Holzbohrer 8mm Ø,,,, +51,B,"Zollstock, Maßband",,,, \ No newline at end of file diff --git a/howto.md b/howto.md deleted file mode 100644 index b073cd0..0000000 --- a/howto.md +++ /dev/null @@ -1,163 +0,0 @@ - - -# README-Struktur - -## Beschreibung - -Damit das Repository in seinem Inhalt und in seiner Struktur besonders schnell erfasst werden kann, werden hier die Qualitätsmerkmale beschrieben. - -Die Readme-Struktur des [Fabulasers](https://github.com/fab-machines/Fabulaser-Mini) ist dabei eine gute Orientierung. - -Innerhalb der README des Repos sollten in jedem Fall folgende Kategorien mit Inhalt gefüllt werden: - -1. Kurzbeschreibung der OSH (analog "Katalogbeschreibung") -2. Bild(er) der OSH -3. Spezifikation/Features (Datenblatt-Information, Besonderheiten, ggf. Maße) -4. Linkbaum (Links zu den wichtigesten Repo-Dokumenten, damit man sich einfach zurechtfindet (Designfiles, Assembly guideline, BoM) etwa so wie in der Kategorie _Guides_)) -5. Lizenz (in Worten was womit lizensiert ist (unterteilt in Hardware, Software/ Firmware, Dokumentation) - -# Checkliste für das gesamte Repository - -## Lizenzablage - -- [ ] gemäß REUSE -- [ ] Vorhanden für OSH -- [ ] Vorhanden für Dokumentation -- [ ] Vorhanden für Software/ Firmware -- [ ] Die 3 Copyrightzeilen zur Lizenz-zuordnung in jedem Dokument vorhanden - -## BoM Inhalt - -- [ ] Die BoM ist vollständig, alle verwendeten Teile sind aufgelistet -- [ ] Die Bezeichnungen der Teile sind eindeutig und unmissverständlich -- [ ] Die Mengen sind korrekt -- [ ] Die Materialparameter sind spezifiziert (nice to have) -- [ ] BOM per Step (nice to have) für jeden Schritt in der Assembly Guideline eine seperate BOM beschreiben -- [ ] editierbare BOM - -### BOM Struktur (Spalten) - -- [ ] Induviduelle Teilenummern/Hyperlinks stimmen mit Assembly Guideline überein -- [ ] src files werden verlinkt (optional) -- [ ] Quantität -- [ ] Bezugsquellen werden genannt -- [ ] Bestellnummer vom jeweiligen Lieferanten -- [ ] Name des Teils (z.B.Schraube) -- [ ] spezifischer Name (z.B. M8x140mm) -- [ ] Notizen (z.B. sollte aus rostfreiem Stahl sein) -- [ ] Herkunft des Teils (z.B. Hamburg, Danzig, ) - -## Assembly Guideline - -- [ ] Werkzeuge werden gelistet -- [ ] Konsistent -- [ ] Hyperlinks vorhanden -- [ ] Bilder erklären durchführung -- [ ] Unmissverständliche Dokumentation -- [ ] Gefahrenhinweise vorhanden -- [ ] Toleranzen der Produktionsmaschienen sind angegeben -- [ ] Oberflächen Behandlungen, nacharbeiten von Teilen, zB. aus dem 3D Druck oder der Fräse - -## `okh.toml` Datei - -- [ ] Mindestens die notwendigen Felder sind ausgefüllt -- [ ] Im Root-Folder des Repositories abgespeichert - -## Formale Aspekte - -- [ ] Markdown korrekt verwendet -- [ ] REUSE/Linter Prüfung bestanden - -## Darstellung für Nutzende (kein notwendiges Kriterium) - -- [ ] Dokumentationshandbuch wurde erstellt (pdf/html) - -## Wiederholbarkeitsgüte (kein notwendiges Kriterium) - -- [ ] Replizierbar durch gleiche Workshopleitung -- [ ] Wiederholbar durch andere Workshopleitung - -## Dokumentation des Workshops - -- [ ] Existiert -- [ ] Fabrikationsschritte zeitl. beschrieben -- [ ] Raumanforderungen beschrieben -- [ ] Werkzeugmenge beschrieben -- [ ] Teilnahmevorraussetzungen beschrieben -- [ ] Workshopinfo Datenblatt abgelegt - -## Designfiles - -- [ ] CAD Files als STL verfuegbar -- [ ] CADs auch als Bild oder in PDF einsehbar -- [ ] Die Designfiles sind vollständig; -- [ ] Die Designfiles liegen als editierbare "source"-Daten vor (STL oder STEP sind keine source formate) -- [ ] Die genutzen Software Tools für die erstellten Dateien sind mit angegeben -- [ ] Dimensionen sind mit angegeben -- [ ] Alle für die Herstellung notwendigen Infos sind vorhanden -- [ ] Die Ansicht der Daten ist sinnvoll skaliert -- [ ] Teilenummer ("ID-Nummer") stimmt mit BoM und Assembly Guideline überein (konsistente Nutzung der "ID") -- [ ] Schaltkreise auf Platinen (PCB) als KiCad gesondert in Ordner `/elec` abgespeichert - -## Software und Firmware (falls vorhanden) - -- [ ] Firmware ist im Repository abgelegt, oder verlinkt, wenn sie zur Verwendung der OSH notwendig ist -- [ ] Eine Guideline für diese Firmware bzw. Software wurde erstellt - -## Ordnerstruktur - -- [ ] gemäß [Template](#OHLOOM) -- [ ] Subrepositories für Binary Files (z.B. unter `/res/assets/`) - -# OHLOOM - -[![License: CC BY-SA 4.0]( -https://img.shields.io/badge/License-CC%20BY--SA%204.0-blue.svg)]( -https://creativecommons.org/licenses/by-sa/4.0/) -[![REUSE status]( -https://api.reuse.software/badge/gitlab.com/OSEGermany/ohloom)]( -https://api.reuse.software/info/gitlab.com/OSEGermany/ohloom) -[![made-with-Markdown]( -https://img.shields.io/badge/Made%20with-Markdown-1f425f.svg)]( -http://commonmark.org) -[![made-with-OpenSCAD]( -https://img.shields.io/badge/Made%20with-OpenSCAD-orange.svg)]( -http://openscad.org/) - -**O**pen **H**ardware **Loom** -(GER: Webstuhl) - -You may want to see [the original project Wiki]( -https://wiki.opensourceecology.de/Open_Hardware-Webstuhl_%E2%80%93_OHLOOM), -though this repo practically makes the Wiki version obsolete, -as it contains improvements, -and further development will happen here. - -## Guides - -| [User Guide][UserGuideEn] | [Assembly Guide][AssemblyGuideEn] | -| :----: | :----: | -| [![][UserGuideImg]][UserGuideEn] | [![][AssemblyGuideImg]][AssemblyGuideEn] | -| [ENG][UserGuideEn] / [GER][UserGuideDe] | [ENG][AssemblyGuideEn] / [GER][AssemblyGuideDe] | - -[UserGuideImg]: Documentation/User_Guide/User_Guide.jpg -[UserGuideEn]: Documentation/User_Guide/UserGuide.md -[UserGuideDe]: Documentation/User_Guide/UserGuide_de.md -[AssemblyGuideImg]: Documentation/Assembly_Guide/Assembly_Guide.jpg -[AssemblyGuideEn]: Documentation/Assembly_Guide/AssemblyGuide.md -[AssemblyGuideDe]: Documentation/Assembly_Guide/AssemblyGuide_de.md - -## Plans for the Parts - -The 3D plans for the parts of the loom -are available as source files in the OpenSCAD format. -Alongside you will find read-only versions as generated STL files -and sometimes technical drawings as PDFs. - -You will find all these in this repository in the folders -[3DParts/](./3DParts/) and -[WoodParts/](./WoodParts/). diff --git a/mod/B_Lampenstiel/README.md b/mod/B_Lampenstiel/README.md index 3b76a55..03e4df2 100644 --- a/mod/B_Lampenstiel/README.md +++ b/mod/B_Lampenstiel/README.md @@ -10,7 +10,7 @@ Der Lampenstiel besteht aus einem Rundstab von Ø 28cm und 190 cm Länge. Für d ## Material - Kappsäge, Japansäge o.ä. -- Oberfräse mit 6-8 mm Nutfräse +- Oberfräse mit 8 mm Nutfräse - 8mm Holzbohrer - 2x 8mm Holzdübel - Klemmen, Zwingen @@ -20,7 +20,8 @@ Der Lampenstiel besteht aus einem Rundstab von Ø 28cm und 190 cm Länge. Für d 1. Kürzen des Stabes auf 190 cm 2. Sägen eines weiteren 15 cm Abschnittes. 3. Arretieren des Stabes auf einer Arbeitfläche mit Schraubzwingen o.ä. -4. Fräsen einer 6-8 mm breite Nut auf der kompletten Länge des Stabes für die Führung des Kabels. Die Tiefe an die Maße des Lampenkabels anpassen. +4. Fräsen einer 8 mm breite Nut auf der kompletten Länge des Stabes für die Führung des Kabels. Die Tiefe an die Maße des Lampenkabels anpassen. + | | | | | ----------- | ----------- | ----- |