From 8391d946b393c05a4b68fe0bf9a02fc66b2bdc73 Mon Sep 17 00:00:00 2001 From: hoijui Date: Wed, 16 Jun 2021 07:08:34 +0200 Subject: [PATCH 01/13] Rename OKH meta-data file to adhere to the standard --- okh-ZACplus.yml => okh.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename okh-ZACplus.yml => okh.yml (100%) diff --git a/okh-ZACplus.yml b/okh.yml similarity index 100% rename from okh-ZACplus.yml rename to okh.yml From ef966a8873645f385e2a4fc4bca889166ea8e69d Mon Sep 17 00:00:00 2001 From: hoijui Date: Wed, 16 Jun 2021 07:23:52 +0200 Subject: [PATCH 02/13] Converts OKH YAML to the new TOML format --- okh.toml | 23 +++++++ okh.yml | 178 ------------------------------------------------------- 2 files changed, 23 insertions(+), 178 deletions(-) create mode 100644 okh.toml delete mode 100644 okh.yml diff --git a/okh.toml b/okh.toml new file mode 100644 index 0000000..6dbaffd --- /dev/null +++ b/okh.toml @@ -0,0 +1,23 @@ +okhv = "OKH-LOSHv1.0" +repo = "https://github.com/case06/ZACplus" +name = "ZAC+" +version = "0.9" +license = "CC-BY-SA-4.0" +licensor = "Oliver Schlüter " +readme = "README.md" +image = "https://wiki.opensourceecology.de/images/c/c1/ZACplus_Proto1.jpg" +image = "https://wiki.opensourceecology.de/images/2/2e/Zac-logo.png" +documentation-language = "de-DE" +project-stage = "prototype" +#??description = "Zink-Luft Brennstoffzelle plus Recycler" +function = "Seasonal, long-term energy storage" +#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" +#??? = "https://wiki.opensourceecology.de/Zn/O-Brennstoffzelle" +#??keywords?? = "Zink-Luft Brennstoffzelle ZAFC" +#??made: true +#??made-independently: false diff --git a/okh.yml b/okh.yml deleted file mode 100644 index 29330fe..0000000 --- a/okh.yml +++ /dev/null @@ -1,178 +0,0 @@ - -# Open know-how manifest -# according to The Open Know-How Manifest Specification Version 1.0 -# for more info, see http://openknowhow.org/ - -# The content of this manifest file is licensed under a Creative Commons Attribution 4.0 International License. -# Licenses for modification and distribution of the hardware, documentation, source-code, etc are stated separately. - -# Remove any fields that are not used. Comments (beginning with '#') may also be removed. - -# Manifest metadata - -date-created: 2019-11-15 # YYYY-MM-DD - -date-updated: 2020-02-14 - -manifest-author: - name: Oliver Schlüter # required | text - affiliation: OpenSourceEcology Germany e.V. # text - email: case06@opensourceecology.de # email address - -manifest-language: DE-Western-Europe - -documentation-language: DE-Western-Europe - -documentation-home: https://wiki.opensourceecology.de/Zn/O-Brennstoffzelle - -#manifest-is-translation: -# title: value # text | Title of the original -# manifest: value # URL - Absolute path | OKH manifest location -# web: value # URL - Absolute path | web presence location -# lang: language-region # language of original - -# documentation-is-translation: -# title: value # text | Title of the original -# manifest: value # URL - Absolute path | OKH manifest location -# web: value # URL - Absolute path | web presence location -# lang: language-region # language of original - -# Properties - -title: ZACplus # required | text | A title to identify the thing - -description: | # required | paragraph - Zink-Luft Brennstoffzelle plus Recycler - -intended-use: | # recommended | Paragraph - Saisonale Langzeit-Eenergiespeicherung - -keywords: # At least one keyword is recommended | text array - - Zink-Luft Brennstoffzelle - - ZAFC - -project-link: https://wiki.opensourceecology.de/Zn/O-Brennstoffzelle # At least project-link or documentation-home is required, otherwise recommended | absolute path URL - -health-safety-notice: | # paragraph - value - -contact: - name: Oliver Schlüter - affiliation: OpenSourceEcology Germany e.V. - email: case06@opensourceecology.de - -contributors: - - name: Oliver Schlüter - affiliation: OpenSourceEcology Germany e.V. - - name: Achmed - affiliation: OSEG, Revoneer - - name: Eckhardt - affiliation: OSEG, Revoneer - - name: Isabel - affiliation: OSEG, Revoneer - - name: Hans - affiliation: OSEG, Revoneer - - name: Thomas - affiliation: OSEG, Revoneer - - name: Jens - affiliation: OSEG, Revoneer - - name: Victoria - affiliation: OSEG, Revoneer - -image: https://wiki.opensourceecology.de/images/c/c1/ZACplus_Proto1.jpg # recommended | absolute or relative path - -version: 0.9 # text - -development-stage: Prototyp 1 # text - -made: true # boolean - true or false - -made-independently: false # boolean - true or false - -#standards-used: -# - standard-title: value # Required where used | Title of the standard used in developing the design or documentation -# publisher: value # Publisher of the standard -# reference: value # Reference indentifier of the standard (e.g. ISO 9001) -# certification: # If certification has been granted confirming compliance with the standard -# - certifier: value # Individual or organisation granting the certification. Use "Self" for self-certification -# date-awarded: value # Date certification was granted -# link: value # Link to evidence of certification (e.g. certificate). Use an an absolute path to an external resource or an absolute or relative path to evidence within the documentation. -# -#derivative-of: -# title: value # text | Title of the original -# manifest: value # URL - Absolute path | OKH manifest location -# web: value # URL - Absolute path | web presence location -# -#variant-of: -# title: value # text | Title of the original -# manifest: value # URL - Absolute path | OKH manifest location -# web: value # URL - Absolute path | web presence location -# -## License -# -license: # At least one license is required | The format should be an SPDX identifier. See https://spdx.org/licenses/hardware: CC-BY-SA 4.0 # recommended | The license under which the hardware is released - hardware: CC-BY-SA 4.0 # recommended | The license under which the documentation is released - documentation: CC-BY-SA 4.0 # recommended | The license under which the documentation is released - software: CC-BY-SA 4.0 # recommended where software is used | The license under which the software is released - -licensor: - name: Oliver Schlüter # required | text - affiliation: OpenSourceEcology Germany e.V. # text - email: case06@opensourceecology.de # email address - -## Documentation -# -#documentation-home: https://wiki.opensourceecology.de/Zn/O-Brennstoffzelle # At least one of the project-link or documentation-home fields is required | absolute path -# -#archive-download: https://git.opensourceecology.de/case/ZACplus # Absolute or relative path -# -#design-files: # recommended -# - path: https://git.opensourceecology.de/case/ZACplus # Absolute or relative path -# title: FreeCAD-files for 3d-printable parts # text -# -#schematics: # recommended where applicable -# - path: value # Absolute or relative path -# title: value # text -# -#bom: value # recommended | absolute or relative path | Direct the maker to the Bill of Materials -# -#tool-list: value # recommended | absolute or relative path | Direct the maker to a list of tools required to make the thing -# -#making-instructions: # recommended -# - path: value # Absolute or relative path -# title: value # text -# -#manufacturing-files: # recommended where applicable -# - path: value # Absolute or relative path -# title: value # text -# -#risk-assessment: # recommended -# - path: value # Absolute or relative path -# title: value # text -# -#tool-settings: # recommended where applicable -# - path: value # Absolute or relative path -# title: value # text -# -#quality-instructions: -# - path: value # Absolute or relative path -# title: value # text -# -#operating-instructions: # recommended -# - path: value # Absolute or relative path -# title: value # text -# -#maintenance-instructions: value # recommended -# - path: value # Absolute or relative path -# title: value # text -# -#disposal-instructions: value # recommended -# - path: value # Absolute or relative path -# title: value # text -# -#software: # recommended where applicable | Source code or executable software that the thing uses -# - path: value # Absolute or relative path -# title: value # text -# -## User defined Fields -## Include any custom / extended fields here From 22f93401757573b9c2dbdc62130bfeaa8e90720d Mon Sep 17 00:00:00 2001 From: hoijui Date: Wed, 16 Jun 2021 07:27:24 +0200 Subject: [PATCH 03/13] README: Fixes syntax --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 34f863d..fd205d2 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ This is the source repo for the ZAC+-Projekt on -https://wiki.opensourceecology.de/Zn/O-Brennstoffzelle + From ace67fa0e525ac817e55b00b8fa75d1b2401777a Mon Sep 17 00:00:00 2001 From: hoijui Date: Wed, 16 Jun 2021 07:27:59 +0200 Subject: [PATCH 04/13] REUSE - Adds machine redable license info --- .reuse/dep5 | 9 ++ LICENSES/CC-BY-SA-4.0.txt | 170 ++++++++++++++++++++++++++++++++++++++ README.md | 6 ++ okh.toml | 4 + 4 files changed, 189 insertions(+) create mode 100644 .reuse/dep5 create mode 100644 LICENSES/CC-BY-SA-4.0.txt diff --git a/.reuse/dep5 b/.reuse/dep5 new file mode 100644 index 0000000..cda2bd4 --- /dev/null +++ b/.reuse/dep5 @@ -0,0 +1,9 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: ZACPlus +Upstream-Contact: Oliver Schlüter +Source: https://github.com/case06/ZACplus + +Files: *.fcstd *.stl *.jpg *.png *.gcode +Copyright: Oliver Schlüter +License: CC-BY-SA-4.0 + diff --git a/LICENSES/CC-BY-SA-4.0.txt b/LICENSES/CC-BY-SA-4.0.txt new file mode 100644 index 0000000..835a683 --- /dev/null +++ b/LICENSES/CC-BY-SA-4.0.txt @@ -0,0 +1,170 @@ +Creative Commons Attribution-ShareAlike 4.0 International + + Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses. + +Considerations for licensors: Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. More considerations for licensors. + +Considerations for the public: By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. + +Although not required by our licenses, you are encouraged to respect those requests where reasonable. More considerations for the public. + +Creative Commons Attribution-ShareAlike 4.0 International Public License + +By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions. + +Section 1 – Definitions. + + a. Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License. + + c. BY-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses, approved by Creative Commons as essentially the equivalent of this Public License. + + d. Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights. + + e. Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements. + + f. Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material. + + g. License Elements means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike. + + h. Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License. + + i. Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license. + + j. Licensor means the individual(s) or entity(ies) granting rights under this Public License. + + k. Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them. + + l. Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world. + + m. You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning. + +Section 2 – Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to: + + A. reproduce and Share the Licensed Material, in whole or in part; and + + B. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions. + + 3. Term. The term of this Public License is specified in Section 6(a). + + 4. Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material. + + 5. Downstream recipients. + + A. Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License. + + B. Additional offer from the Licensor – Adapted Material. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply. + + C. No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material. + + 6. No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this Public License. + + 3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties. + +Section 3 – License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified form), You must: + + A. retain the following if it is supplied by the Licensor with the Licensed Material: + + i. identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of warranties; + + v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable; + + B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and + + C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information. + + 3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable. + + b. ShareAlike.In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply. + + 1. The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License. + + 2. You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material. + + 3. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply. + +Section 4 – Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database; + + b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section 3(b); and + + c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database. +For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights. + +Section 5 – Disclaimer of Warranties and Limitation of Liability. + + a. Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You. + + b. To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You. + + c. The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability. + +Section 6 – Term and Termination. + + a. This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or + + 2. upon express reinstatement by the Licensor. + + c. For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License. + + d. For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License. + + e. Sections 1, 5, 6, 7, and 8 survive termination of this Public License. + +Section 7 – Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License. + +Section 8 – Interpretation. + + a. For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions. + + c. No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor. + + d. Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority. + +Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/README.md b/README.md index fd205d2..c6bc98a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ + + # ZACplus [![In cooperation with Open Source Ecology Germany]( diff --git a/okh.toml b/okh.toml index 6dbaffd..ba8d993 100644 --- a/okh.toml +++ b/okh.toml @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2021 Robin Vobruba +# +# SPDX-License-Identifier: CC-BY-SA-4.0 + okhv = "OKH-LOSHv1.0" repo = "https://github.com/case06/ZACplus" name = "ZAC+" From 4efe873bc0911bcee42da852478635758f2a33ba Mon Sep 17 00:00:00 2001 From: hoijui Date: Wed, 16 Jun 2021 07:30:00 +0200 Subject: [PATCH 05/13] README: Adds badges: License, REUSE --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c6bc98a..95b7765 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,16 @@ SPDX-License-Identifier: CC-BY-SA-4.0 # ZACplus +[![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/github.com/case06/ZACplus)]( + https://api.reuse.software/info/github.com/case06/ZACplus) [![In cooperation with Open Source Ecology Germany]( https://custom-icon-badges.demolab.com/badge/-OSEG-555555.svg?logo=oseg_logo)]( https://opensourceecology.de) - - This is the source repo for the ZAC+-Projekt on From 850c010d8f3b22aefacb15036eece231fbbf5c75 Mon Sep 17 00:00:00 2001 From: Robin Vobruba Date: Sat, 3 Dec 2022 08:10:24 +0200 Subject: [PATCH 06/13] Adds REUSE header to .gitignore [minor] --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 8f9b359..e0189c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +# SPDX-FileCopyrightText: 2021 Oliver Schlüter +# +# SPDX-License-Identifier: CC-BY-SA-4.0 + # FreeCAD backup files *.fcstd1 *.Fcstd1 From 095ac4d30b7526d0e8ee444862a76cddb769ee38 Mon Sep 17 00:00:00 2001 From: Robin Vobruba Date: Sat, 3 Dec 2022 08:10:48 +0200 Subject: [PATCH 07/13] Adds REUSE licensing to a few new file-types [minor] --- .reuse/dep5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.reuse/dep5 b/.reuse/dep5 index cda2bd4..9d01947 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -3,7 +3,7 @@ Upstream-Name: ZACPlus Upstream-Contact: Oliver Schlüter Source: https://github.com/case06/ZACplus -Files: *.fcstd *.stl *.jpg *.png *.gcode +Files: *.fcstd *.stl *.jpg *.png *.gcode *.pdf *.ods *.odg *.xpm Copyright: Oliver Schlüter License: CC-BY-SA-4.0 From 63f8d8447f49fb3edda7a42407147d4e330cbc04 Mon Sep 17 00:00:00 2001 From: Robin Vobruba Date: Fri, 4 Jul 2025 11:37:26 +0200 Subject: [PATCH 08/13] README: Markdown-ify syntax --- README.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 95b7765..f02d137 100644 --- a/README.md +++ b/README.md @@ -20,10 +20,7 @@ This is the source repo for the ZAC+-Projekt on - - -

ZACplus V.1.0

- - - +[![ZACplus V.1.0]( +https://raw.githubusercontent.com/case06/ZACplus/master/doc/bom_src/images/toppic.jpg)]( +https://raw.githubusercontent.com/case06/ZACplus/master/doc/bom_src/images/toppic.jpg) From 92602f936a6f5483dabd984cbed0a8e6f2169948 Mon Sep 17 00:00:00 2001 From: Robin Vobruba Date: Fri, 4 Jul 2025 11:37:45 +0200 Subject: [PATCH 09/13] README: Use SPDX name of license --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f02d137..10e06b4 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ SPDX-License-Identifier: CC-BY-SA-4.0 # ZACplus -[![License: CC BY-SA 4.0]( - https://img.shields.io/badge/License-CC%20BY--SA%204.0-blue.svg)]( +[![License: CC-BY-SA-4.0]( + https://img.shields.io/badge/License-CC--BY--SA--4.0-blue.svg)]( https://creativecommons.org/licenses/by-sa/4.0/) [![REUSE status]( https://api.reuse.software/badge/github.com/case06/ZACplus)]( From be5b3fea1c54dbd0a9f8f5522ff64b960d67623d Mon Sep 17 00:00:00 2001 From: Robin Vobruba Date: Fri, 4 Jul 2025 11:38:12 +0200 Subject: [PATCH 10/13] git-ignore: Cleanup --- .gitignore | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index e0189c0..5390fb4 100644 --- a/.gitignore +++ b/.gitignore @@ -11,18 +11,8 @@ # 3D printer instructions (hardware specific) *.gcode - - # Temporary libreoffice-files .\~lock* -.\~lock*\# - -# Backs for older files -doc/bom_src/backs/* -doc/bom_src/backs -bom_src/backs +# Backup dirs for older files (recursive) backs -backs/ - - From 2cb97f0f29a49cb176ab800452608f5fd2e4b2d6 Mon Sep 17 00:00:00 2001 From: Robin Vobruba Date: Fri, 4 Jul 2025 11:38:44 +0200 Subject: [PATCH 11/13] git-ignore: Add output directories --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 5390fb4..41afa00 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,11 @@ # # SPDX-License-Identifier: CC-BY-SA-4.0 +# Output/generated directories +/public +/target +/build + # FreeCAD backup files *.fcstd1 *.Fcstd1 From b473f0e214321f75c5db14fb81b67da29a863d19 Mon Sep 17 00:00:00 2001 From: Robin Vobruba Date: Fri, 4 Jul 2025 11:39:00 +0200 Subject: [PATCH 12/13] okh: Update manifest to OKH 2.4 --- okh.toml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/okh.toml b/okh.toml index ba8d993..4f31352 100644 --- a/okh.toml +++ b/okh.toml @@ -1,26 +1,29 @@ -# SPDX-FileCopyrightText: 2021 Robin Vobruba +# SPDX-FileCopyrightText: 2021 - 2025 Robin Vobruba # # SPDX-License-Identifier: CC-BY-SA-4.0 -okhv = "OKH-LOSHv1.0" +okhv = "2.4" repo = "https://github.com/case06/ZACplus" name = "ZAC+" version = "0.9" license = "CC-BY-SA-4.0" licensor = "Oliver Schlüter " readme = "README.md" -image = "https://wiki.opensourceecology.de/images/c/c1/ZACplus_Proto1.jpg" -image = "https://wiki.opensourceecology.de/images/2/2e/Zac-logo.png" +image = [ + "https://wiki.opensourceecology.de/images/c/c1/ZACplus_Proto1.jpg", + "https://wiki.opensourceecology.de/images/2/2e/Zac-logo.png" +] documentation-language = "de-DE" -project-stage = "prototype" -#??description = "Zink-Luft Brennstoffzelle plus Recycler" +technology-readiness-level = "OTRL-1" +documentation-readiness-level = "ODRL-2" +#function[DE] = "Zink-Luft Brennstoffzelle plus Recycler" function = "Seasonal, long-term energy storage" -#patent-class = "D03D 35/00" +#cpc-patent-class = "D03D 35/00" #tsdc-id = "ASM-MEC" -#simplified-bom = "sBoM.csv" +#bom = "sBoM.csv" #functional-metadata = "400mm fabric width" #production-metadata = [ "3D printed", "wood" ] -#source = "/Documentation/Assembly_Guide/AssemblyGuide.md" +#source = "Documentation/Assembly_Guide/AssemblyGuide.md" #??? = "https://wiki.opensourceecology.de/Zn/O-Brennstoffzelle" #??keywords?? = "Zink-Luft Brennstoffzelle ZAFC" #??made: true From 306002b153b718afb98d761a83477920c134ce47 Mon Sep 17 00:00:00 2001 From: Robin Vobruba Date: Fri, 4 Jul 2025 11:40:45 +0200 Subject: [PATCH 13/13] REUSE: convert from dep5 to REUSE.toml --- .reuse/dep5 | 9 --------- REUSE.toml | 10 ++++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 .reuse/dep5 create mode 100644 REUSE.toml diff --git a/.reuse/dep5 b/.reuse/dep5 deleted file mode 100644 index 9d01947..0000000 --- a/.reuse/dep5 +++ /dev/null @@ -1,9 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: ZACPlus -Upstream-Contact: Oliver Schlüter -Source: https://github.com/case06/ZACplus - -Files: *.fcstd *.stl *.jpg *.png *.gcode *.pdf *.ods *.odg *.xpm -Copyright: Oliver Schlüter -License: CC-BY-SA-4.0 - diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 0000000..1c9b2b9 --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,10 @@ +version = 1 +SPDX-PackageName = "ZACPlus" +SPDX-PackageSupplier = "Oliver Schlüter " +SPDX-PackageDownloadLocation = "https://github.com/case06/ZACplus" + +[[annotations]] +path = ["**.fcstd", "**.stl", "**.jpg", "**.png", "**.gcode", "**.pdf", "**.ods", "**.odg", "**.xpm"] +precedence = "aggregate" +SPDX-FileCopyrightText = "Oliver Schlüter " +SPDX-License-Identifier = "CC-BY-SA-4.0"