From 41b5c8c01872874dd07e04849495ed39dc75f55f Mon Sep 17 00:00:00 2001 From: Jonathan 'theJPster' Pallant Date: Fri, 16 Aug 2024 18:06:12 +0100 Subject: [PATCH 1/2] Rationalise all the license files and copyright notices. I set the copyright to "Copyright (c) 2021-2024 The rp-rs Developers". This goes in the MIT license text, and the Apache 2.0 NOTICE file. The Apache 2.0 text has also been factory reset (the boilerplate had been incorrectly changed). Every package in this repo must contain LICENSE-MIT, LICENSE-APACHE and NOTICE, plus the standard text from the README pointing to the two license files. --- .cargo/config.toml | 4 - APACHE2.0 => LICENSE-APACHE | 5 +- MIT => LICENSE-MIT | 4 +- NOTICE | 3 + README.md | 9 +- on-target-tests/LICENSE-APACHE | 202 ++++++++++++++++++ on-target-tests/LICENSE-MIT | 19 ++ on-target-tests/NOTICE | 3 + on-target-tests/README.md | 11 + rp2040-hal-macros/Cargo.toml | 1 + rp2040-hal-macros/LICENSE-APACHE | 202 ++++++++++++++++++ rp2040-hal-macros/LICENSE-MIT | 19 ++ rp2040-hal-macros/NOTICE | 3 + rp2040-hal-macros/README.md | 22 +- rp2040-hal/LICENSE-APACHE | 202 ++++++++++++++++++ rp2040-hal/LICENSE-MIT | 19 ++ rp2040-hal/NOTICE | 3 + rp2040-hal/README.md | 10 +- rp2040-hal/examples/adc.rs | 2 +- rp2040-hal/examples/adc_fifo_dma.rs | 2 +- rp2040-hal/examples/adc_fifo_irq.rs | 2 +- rp2040-hal/examples/adc_fifo_poll.rs | 2 +- rp2040-hal/examples/alloc.rs | 2 +- rp2040-hal/examples/binary_info_demo.rs | 2 +- rp2040-hal/examples/blinky.rs | 2 +- rp2040-hal/examples/dht11.rs | 2 +- rp2040-hal/examples/dormant_sleep.rs | 2 +- rp2040-hal/examples/gpio_dyn_pin_array.rs | 2 +- rp2040-hal/examples/gpio_in_out.rs | 2 +- rp2040-hal/examples/gpio_irq_example.rs | 2 +- rp2040-hal/examples/i2c.rs | 2 +- rp2040-hal/examples/i2c_async.rs | 2 +- rp2040-hal/examples/i2c_async_cancelled.rs | 2 +- rp2040-hal/examples/lcd_display.rs | 2 +- rp2040-hal/examples/mem_to_mem_dma.rs | 2 +- rp2040-hal/examples/multicore_fifo_blink.rs | 2 +- rp2040-hal/examples/multicore_polyblink.rs | 2 +- rp2040-hal/examples/pio_dma.rs | 2 +- rp2040-hal/examples/pwm_blink.rs | 2 +- .../examples/pwm_blink_embedded_hal_1.rs | 2 +- rp2040-hal/examples/pwm_irq_input.rs | 2 +- rp2040-hal/examples/rom_funcs.rs | 2 +- rp2040-hal/examples/rosc_as_system_clock.rs | 2 +- rp2040-hal/examples/rtc_irq_example.rs | 2 +- rp2040-hal/examples/rtc_sleep_example.rs | 2 +- rp2040-hal/examples/spi.rs | 2 +- rp2040-hal/examples/spi_dma.rs | 2 +- rp2040-hal/examples/uart.rs | 2 +- rp2040-hal/examples/uart_dma.rs | 2 +- rp2040-hal/examples/vector_table.rs | 2 +- rp2040-hal/examples/watchdog.rs | 2 +- 51 files changed, 745 insertions(+), 62 deletions(-) rename APACHE2.0 => LICENSE-APACHE (99%) rename MIT => LICENSE-MIT (95%) create mode 100644 NOTICE create mode 100644 on-target-tests/LICENSE-APACHE create mode 100644 on-target-tests/LICENSE-MIT create mode 100644 on-target-tests/NOTICE create mode 100644 rp2040-hal-macros/LICENSE-APACHE create mode 100644 rp2040-hal-macros/LICENSE-MIT create mode 100644 rp2040-hal-macros/NOTICE create mode 100644 rp2040-hal/LICENSE-APACHE create mode 100644 rp2040-hal/LICENSE-MIT create mode 100644 rp2040-hal/NOTICE diff --git a/.cargo/config.toml b/.cargo/config.toml index 256fec245..e548cb625 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,13 +1,9 @@ # # Cargo Configuration for the https://github.com/rp-rs/rp-hal.git repository. # -# Copyright (c) The RP-RS Developers, 2021 -# # You might want to make a similar file in your own repository if you are # writing programs for Raspberry Silicon microcontrollers. # -# This file is MIT or Apache-2.0 as per the repository README.md file -# [build] # Set the default target to match the Cortex-M0+ in the RP2040 diff --git a/APACHE2.0 b/LICENSE-APACHE similarity index 99% rename from APACHE2.0 rename to LICENSE-APACHE index a1fc205a6..d64569567 100644 --- a/APACHE2.0 +++ b/LICENSE-APACHE @@ -1,4 +1,5 @@ -Apache License + + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -186,7 +187,7 @@ Apache License same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2021 rp-rs organization + Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/MIT b/LICENSE-MIT similarity index 95% rename from MIT rename to LICENSE-MIT index 92d4f529a..6e052e35b 100644 --- a/MIT +++ b/LICENSE-MIT @@ -1,6 +1,4 @@ -MIT License - -Copyright (c) 2021 rp-rs organization +Copyright (c) 2021-2024 The rp-rs Developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/NOTICE b/NOTICE new file mode 100644 index 000000000..790ecb167 --- /dev/null +++ b/NOTICE @@ -0,0 +1,3 @@ +Copyright (c) 2021-2024 The rp-rs Developers + +Originally published at https://github.com/rp-rs/rp-hal diff --git a/README.md b/README.md index abc479808..69179a35b 100644 --- a/README.md +++ b/README.md @@ -288,10 +288,11 @@ to intervene to uphold that code of conduct. ## License -The contents of this repository are dual-licensed under the _MIT OR Apache -2.0_ License. That means you can choose either the MIT license or the -Apache-2.0 license when you re-use this code. See `MIT` or `APACHE2.0` for more -information on each specific license. +The contents of this repository are dual-licensed under the _MIT OR Apache 2.0_ +License. That means you can choose either the MIT license or the Apache 2.0 +license when you re-use this code. See [`LICENSE-MIT`](./LICENSE-MIT) or +[`LICENSE-APACHE`](./LICENSE-APACHE) for more information on each specific +license. Our Apache 2.0 notices can be found in [`NOTICE`](./NOTICE). Any submissions to this project (e.g. as Pull Requests) must be made available under these terms. diff --git a/on-target-tests/LICENSE-APACHE b/on-target-tests/LICENSE-APACHE new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/on-target-tests/LICENSE-APACHE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/on-target-tests/LICENSE-MIT b/on-target-tests/LICENSE-MIT new file mode 100644 index 000000000..6e052e35b --- /dev/null +++ b/on-target-tests/LICENSE-MIT @@ -0,0 +1,19 @@ +Copyright (c) 2021-2024 The rp-rs Developers + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/on-target-tests/NOTICE b/on-target-tests/NOTICE new file mode 100644 index 000000000..790ecb167 --- /dev/null +++ b/on-target-tests/NOTICE @@ -0,0 +1,3 @@ +Copyright (c) 2021-2024 The rp-rs Developers + +Originally published at https://github.com/rp-rs/rp-hal diff --git a/on-target-tests/README.md b/on-target-tests/README.md index 5bddb161f..1197e2cef 100644 --- a/on-target-tests/README.md +++ b/on-target-tests/README.md @@ -35,3 +35,14 @@ Currently, the following connections are required: If you add tests that need some hardware setup, make sure that they are compatible to the existing on-target tests, so all tests can be run with a single configuration. + +## License + +The contents of this repository are dual-licensed under the _MIT OR Apache 2.0_ +License. That means you can choose either the MIT license or the Apache 2.0 +license when you re-use this code. See [`LICENSE-MIT`](./LICENSE-MIT) or +[`LICENSE-APACHE`](./LICENSE-APACHE) for more information on each specific +license. Our Apache 2.0 notices can be found in [`NOTICE`](./NOTICE). + +Any submissions to this project (e.g. as Pull Requests) must be made available +under these terms. diff --git a/rp2040-hal-macros/Cargo.toml b/rp2040-hal-macros/Cargo.toml index 7f44770f1..f95327504 100644 --- a/rp2040-hal-macros/Cargo.toml +++ b/rp2040-hal-macros/Cargo.toml @@ -6,6 +6,7 @@ readme = "README.md" version = "0.1.0" edition = "2021" repository = "https://github.com/rp-rs/rp-hal" +authors = ["The rp-rs Developers"] [lib] proc-macro = true diff --git a/rp2040-hal-macros/LICENSE-APACHE b/rp2040-hal-macros/LICENSE-APACHE new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/rp2040-hal-macros/LICENSE-APACHE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/rp2040-hal-macros/LICENSE-MIT b/rp2040-hal-macros/LICENSE-MIT new file mode 100644 index 000000000..6e052e35b --- /dev/null +++ b/rp2040-hal-macros/LICENSE-MIT @@ -0,0 +1,19 @@ +Copyright (c) 2021-2024 The rp-rs Developers + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/rp2040-hal-macros/NOTICE b/rp2040-hal-macros/NOTICE new file mode 100644 index 000000000..790ecb167 --- /dev/null +++ b/rp2040-hal-macros/NOTICE @@ -0,0 +1,3 @@ +Copyright (c) 2021-2024 The rp-rs Developers + +Originally published at https://github.com/rp-rs/rp-hal diff --git a/rp2040-hal-macros/README.md b/rp2040-hal-macros/README.md index 00c62c9c9..fe8ffbd47 100644 --- a/rp2040-hal-macros/README.md +++ b/rp2040-hal-macros/README.md @@ -10,18 +10,12 @@ Currently, it just unlocks all spinlocks before calling the entry function. # License -Licensed under either of - -- Apache License, Version 2.0 (`APACHE2.0` or - http://www.apache.org/licenses/LICENSE-2.0) - -- MIT license (`MIT` or http://opensource.org/licenses/MIT) - -at your option. - -## Contribution - -Unless you explicitly state otherwise, any contribution intentionally submitted -for inclusion in the work by you, as defined in the Apache-2.0 license, shall be -dual licensed as above, without any additional terms or conditions. +The contents of this repository are dual-licensed under the _MIT OR Apache 2.0_ +License. That means you can choose either the MIT license or the Apache 2.0 +license when you re-use this code. See [`LICENSE-MIT`](./LICENSE-MIT) or +[`LICENSE-APACHE`](./LICENSE-APACHE) for more information on each specific +license. Our Apache 2.0 notices can be found in [`NOTICE`](./NOTICE). + +Any submissions to this project (e.g. as Pull Requests) must be made available +under these terms. diff --git a/rp2040-hal/LICENSE-APACHE b/rp2040-hal/LICENSE-APACHE new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/rp2040-hal/LICENSE-APACHE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/rp2040-hal/LICENSE-MIT b/rp2040-hal/LICENSE-MIT new file mode 100644 index 000000000..6e052e35b --- /dev/null +++ b/rp2040-hal/LICENSE-MIT @@ -0,0 +1,19 @@ +Copyright (c) 2021-2024 The rp-rs Developers + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/rp2040-hal/NOTICE b/rp2040-hal/NOTICE new file mode 100644 index 000000000..790ecb167 --- /dev/null +++ b/rp2040-hal/NOTICE @@ -0,0 +1,3 @@ +Copyright (c) 2021-2024 The rp-rs Developers + +Originally published at https://github.com/rp-rs/rp-hal diff --git a/rp2040-hal/README.md b/rp2040-hal/README.md index 1419f975d..97c54f3a8 100644 --- a/rp2040-hal/README.md +++ b/rp2040-hal/README.md @@ -116,8 +116,14 @@ appreciated**. ## License -Distributed under the MIT OR Apache2.0 License. See `MIT` or `APACHE2.0` for more information. - +The contents of this repository are dual-licensed under the _MIT OR Apache 2.0_ +License. That means you can choose either the MIT license or the Apache 2.0 +license when you re-use this code. See [`LICENSE-MIT`](./LICENSE-MIT) or +[`LICENSE-APACHE`](./LICENSE-APACHE) for more information on each specific +license. Our Apache 2.0 notices can be found in [`NOTICE`](./NOTICE). + +Any submissions to this project (e.g. as Pull Requests) must be made available +under these terms. diff --git a/rp2040-hal/examples/adc.rs b/rp2040-hal/examples/adc.rs index 997933465..7dffb0c54 100644 --- a/rp2040-hal/examples/adc.rs +++ b/rp2040-hal/examples/adc.rs @@ -5,7 +5,7 @@ //! //! It may need to be adapted to your particular board layout and/or pin assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/adc_fifo_dma.rs b/rp2040-hal/examples/adc_fifo_dma.rs index b38c168ee..505b5eccc 100644 --- a/rp2040-hal/examples/adc_fifo_dma.rs +++ b/rp2040-hal/examples/adc_fifo_dma.rs @@ -5,7 +5,7 @@ //! //! It may need to be adapted to your particular board layout and/or pin assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/adc_fifo_irq.rs b/rp2040-hal/examples/adc_fifo_irq.rs index 4b6b4ba2a..ee4c90586 100644 --- a/rp2040-hal/examples/adc_fifo_irq.rs +++ b/rp2040-hal/examples/adc_fifo_irq.rs @@ -8,7 +8,7 @@ //! //! It may need to be adapted to your particular board layout and/or pin assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/adc_fifo_poll.rs b/rp2040-hal/examples/adc_fifo_poll.rs index 5f71dcbe9..1c2d04aa6 100644 --- a/rp2040-hal/examples/adc_fifo_poll.rs +++ b/rp2040-hal/examples/adc_fifo_poll.rs @@ -5,7 +5,7 @@ //! //! It may need to be adapted to your particular board layout and/or pin assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/alloc.rs b/rp2040-hal/examples/alloc.rs index c7b151323..d4c465cde 100644 --- a/rp2040-hal/examples/alloc.rs +++ b/rp2040-hal/examples/alloc.rs @@ -9,7 +9,7 @@ //! While blinkin the LED, it will continuously push to a `Vec`, which will //! eventually lead to a panic due to an out of memory condition. //! -//! See the `Cargo.toml` file for Copyright and licence details. +//! See the top-level `README.md` file for Copyright and licence details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/binary_info_demo.rs b/rp2040-hal/examples/binary_info_demo.rs index b8837aaf2..ae728bdff 100644 --- a/rp2040-hal/examples/binary_info_demo.rs +++ b/rp2040-hal/examples/binary_info_demo.rs @@ -5,7 +5,7 @@ //! //! It may need to be adapted to your particular board layout and/or pin assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/blinky.rs b/rp2040-hal/examples/blinky.rs index 32825634e..0fcc411ec 100644 --- a/rp2040-hal/examples/blinky.rs +++ b/rp2040-hal/examples/blinky.rs @@ -4,7 +4,7 @@ //! //! It may need to be adapted to your particular board layout and/or pin assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/dht11.rs b/rp2040-hal/examples/dht11.rs index b6bc64c53..0be04b13a 100644 --- a/rp2040-hal/examples/dht11.rs +++ b/rp2040-hal/examples/dht11.rs @@ -7,7 +7,7 @@ //! //! NOTE: The DHT11 driver only works reliably when compiled in release mode. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/dormant_sleep.rs b/rp2040-hal/examples/dormant_sleep.rs index ae3c709a2..f2108a232 100644 --- a/rp2040-hal/examples/dormant_sleep.rs +++ b/rp2040-hal/examples/dormant_sleep.rs @@ -12,7 +12,7 @@ //! //! It may need to be adapted to your particular board layout and/or pin assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/gpio_dyn_pin_array.rs b/rp2040-hal/examples/gpio_dyn_pin_array.rs index 09462adf4..292850a84 100644 --- a/rp2040-hal/examples/gpio_dyn_pin_array.rs +++ b/rp2040-hal/examples/gpio_dyn_pin_array.rs @@ -10,7 +10,7 @@ //! resistor on each of GPIO 2, 3, 4, 5. //! The other side of the LED + resistor pair should be connected to GND. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/gpio_in_out.rs b/rp2040-hal/examples/gpio_in_out.rs index 9dcd49a35..f95b6c640 100644 --- a/rp2040-hal/examples/gpio_in_out.rs +++ b/rp2040-hal/examples/gpio_in_out.rs @@ -4,7 +4,7 @@ //! //! It may need to be adapted to your particular board layout and/or pin assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/gpio_irq_example.rs b/rp2040-hal/examples/gpio_irq_example.rs index 2cabf3610..865255206 100644 --- a/rp2040-hal/examples/gpio_irq_example.rs +++ b/rp2040-hal/examples/gpio_irq_example.rs @@ -17,7 +17,7 @@ //! //! It may need to be adapted to your particular board layout and/or pin assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/i2c.rs b/rp2040-hal/examples/i2c.rs index 9f325bec1..e0d509bea 100644 --- a/rp2040-hal/examples/i2c.rs +++ b/rp2040-hal/examples/i2c.rs @@ -4,7 +4,7 @@ //! //! It may need to be adapted to your particular board layout and/or pin assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/i2c_async.rs b/rp2040-hal/examples/i2c_async.rs index 0e5f68d63..79c4fd1ed 100644 --- a/rp2040-hal/examples/i2c_async.rs +++ b/rp2040-hal/examples/i2c_async.rs @@ -5,7 +5,7 @@ //! //! It may need to be adapted to your particular board layout and/or pin assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/i2c_async_cancelled.rs b/rp2040-hal/examples/i2c_async_cancelled.rs index 1ac756ce4..17092aa7d 100644 --- a/rp2040-hal/examples/i2c_async_cancelled.rs +++ b/rp2040-hal/examples/i2c_async_cancelled.rs @@ -5,7 +5,7 @@ //! //! It may need to be adapted to your particular board layout and/or pin assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/lcd_display.rs b/rp2040-hal/examples/lcd_display.rs index aa295458e..aebc15b40 100644 --- a/rp2040-hal/examples/lcd_display.rs +++ b/rp2040-hal/examples/lcd_display.rs @@ -7,7 +7,7 @@ //! It drives the LCD by pushing data out of six GPIO pins. It may need to be //! adapted to your particular board layout and/or pin assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/mem_to_mem_dma.rs b/rp2040-hal/examples/mem_to_mem_dma.rs index a72940dcc..85891c49e 100644 --- a/rp2040-hal/examples/mem_to_mem_dma.rs +++ b/rp2040-hal/examples/mem_to_mem_dma.rs @@ -2,7 +2,7 @@ //! //! This application demonstrates how to use DMA to transfer data from memory to memory buffers. //! -//! See the `Cargo.toml` file for Copyright and licence details. +//! See the top-level `README.md` file for Copyright and licence details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/multicore_fifo_blink.rs b/rp2040-hal/examples/multicore_fifo_blink.rs index 1728147a7..95069b235 100644 --- a/rp2040-hal/examples/multicore_fifo_blink.rs +++ b/rp2040-hal/examples/multicore_fifo_blink.rs @@ -7,7 +7,7 @@ //! //! It may need to be adapted to your particular board layout and/or pin assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/multicore_polyblink.rs b/rp2040-hal/examples/multicore_polyblink.rs index a09edd3b2..49866749b 100644 --- a/rp2040-hal/examples/multicore_polyblink.rs +++ b/rp2040-hal/examples/multicore_polyblink.rs @@ -3,7 +3,7 @@ //! This application blinks two LEDs on GPIOs 2 and 3 at different rates (3Hz //! and 4Hz respectively.) //! -//! See the `Cargo.toml` file for Copyright and licence details. +//! See the top-level `README.md` file for Copyright and licence details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/pio_dma.rs b/rp2040-hal/examples/pio_dma.rs index 64aa33c4b..a3857e796 100644 --- a/rp2040-hal/examples/pio_dma.rs +++ b/rp2040-hal/examples/pio_dma.rs @@ -4,7 +4,7 @@ //! WORLD" in morse code. The example also tries to read the data back. If reading the data fails, //! the message will only be shown once, and then the LED remains dark. //! -//! See the `Cargo.toml` file for Copyright and licence details. +//! See the top-level `README.md` file for Copyright and licence details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/pwm_blink.rs b/rp2040-hal/examples/pwm_blink.rs index 2e5d5579b..08e56287e 100644 --- a/rp2040-hal/examples/pwm_blink.rs +++ b/rp2040-hal/examples/pwm_blink.rs @@ -5,7 +5,7 @@ //! //! It may need to be adapted to your particular board layout and/or pin assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/pwm_blink_embedded_hal_1.rs b/rp2040-hal/examples/pwm_blink_embedded_hal_1.rs index 32bb24223..81fa69dd9 100644 --- a/rp2040-hal/examples/pwm_blink_embedded_hal_1.rs +++ b/rp2040-hal/examples/pwm_blink_embedded_hal_1.rs @@ -5,7 +5,7 @@ //! //! It may need to be adapted to your particular board layout and/or pin assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/pwm_irq_input.rs b/rp2040-hal/examples/pwm_irq_input.rs index f28abf40b..89326a303 100644 --- a/rp2040-hal/examples/pwm_irq_input.rs +++ b/rp2040-hal/examples/pwm_irq_input.rs @@ -7,7 +7,7 @@ //! //! It may need to be adapted to your particular board layout and/or pin assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/rom_funcs.rs b/rp2040-hal/examples/rom_funcs.rs index 62f4200f4..e7e70c394 100644 --- a/rp2040-hal/examples/rom_funcs.rs +++ b/rp2040-hal/examples/rom_funcs.rs @@ -4,7 +4,7 @@ //! //! It may need to be adapted to your particular board layout and/or pin assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/rosc_as_system_clock.rs b/rp2040-hal/examples/rosc_as_system_clock.rs index d4c8428e7..d0c7a10ad 100644 --- a/rp2040-hal/examples/rosc_as_system_clock.rs +++ b/rp2040-hal/examples/rosc_as_system_clock.rs @@ -5,7 +5,7 @@ //! It shows setting the frequency of the ROSC to a measured known frequency, and contains //! helper functions to configure the ROSC drive strength to reach a desired target frequency. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/rtc_irq_example.rs b/rp2040-hal/examples/rtc_irq_example.rs index 26fe72d03..b83102049 100644 --- a/rp2040-hal/examples/rtc_irq_example.rs +++ b/rp2040-hal/examples/rtc_irq_example.rs @@ -4,7 +4,7 @@ //! It is also intended as a general introduction to interrupts with RP2040. //! //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/rtc_sleep_example.rs b/rp2040-hal/examples/rtc_sleep_example.rs index 559508a24..0f1305665 100644 --- a/rp2040-hal/examples/rtc_sleep_example.rs +++ b/rp2040-hal/examples/rtc_sleep_example.rs @@ -3,7 +3,7 @@ //! This application demonstrates use of RTC Interrupt to wake from deepsleep. //! It is also intended as a general introduction to interrupts and RTC with RP2040. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/spi.rs b/rp2040-hal/examples/spi.rs index dc19f3987..85b0b7445 100644 --- a/rp2040-hal/examples/spi.rs +++ b/rp2040-hal/examples/spi.rs @@ -7,7 +7,7 @@ //! It may need to be adapted to your particular board layout and/or pin //! assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/spi_dma.rs b/rp2040-hal/examples/spi_dma.rs index a18fcfc2f..8a9f59a0a 100644 --- a/rp2040-hal/examples/spi_dma.rs +++ b/rp2040-hal/examples/spi_dma.rs @@ -5,7 +5,7 @@ //! The application expects the MISO and MOSI pins to be wired together so that it is able to check //! whether the data was sent and received correctly. //! -//! See the `Cargo.toml` file for Copyright and licence details. +//! See the top-level `README.md` file for Copyright and licence details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/uart.rs b/rp2040-hal/examples/uart.rs index d345a9ed5..1eaf17211 100644 --- a/rp2040-hal/examples/uart.rs +++ b/rp2040-hal/examples/uart.rs @@ -6,7 +6,7 @@ //! It may need to be adapted to your particular board layout and/or pin //! assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/uart_dma.rs b/rp2040-hal/examples/uart_dma.rs index 87617f2ca..5f9008083 100644 --- a/rp2040-hal/examples/uart_dma.rs +++ b/rp2040-hal/examples/uart_dma.rs @@ -6,7 +6,7 @@ //! It may need to be adapted to your particular board layout and/or pin //! assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/vector_table.rs b/rp2040-hal/examples/vector_table.rs index 1669ab00f..470266f87 100644 --- a/rp2040-hal/examples/vector_table.rs +++ b/rp2040-hal/examples/vector_table.rs @@ -4,7 +4,7 @@ //! To demonstrate the extra utility of this, we also replace an entry in the Vector Table //! with a new one. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] diff --git a/rp2040-hal/examples/watchdog.rs b/rp2040-hal/examples/watchdog.rs index 4a9385862..c8112b26e 100644 --- a/rp2040-hal/examples/watchdog.rs +++ b/rp2040-hal/examples/watchdog.rs @@ -4,7 +4,7 @@ //! //! It may need to be adapted to your particular board layout and/or pin assignment. //! -//! See the `Cargo.toml` file for Copyright and license details. +//! See the top-level `README.md` file for Copyright and license details. #![no_std] #![no_main] From cb9493324cf43608903a0ecefaa2ffd7fcfe7100 Mon Sep 17 00:00:00 2001 From: Jonathan 'theJPster' Pallant Date: Fri, 16 Aug 2024 19:00:01 +0100 Subject: [PATCH 2/2] Switch to the longer contribution text. --- README.md | 5 +++-- on-target-tests/README.md | 6 ++++-- rp2040-hal-macros/README.md | 6 +++--- rp2040-hal/README.md | 6 +++--- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 69179a35b..ee8109e0b 100644 --- a/README.md +++ b/README.md @@ -294,8 +294,9 @@ license when you re-use this code. See [`LICENSE-MIT`](./LICENSE-MIT) or [`LICENSE-APACHE`](./LICENSE-APACHE) for more information on each specific license. Our Apache 2.0 notices can be found in [`NOTICE`](./NOTICE). -Any submissions to this project (e.g. as Pull Requests) must be made available -under these terms. +Unless you explicitly state otherwise, any contribution intentionally submitted +for inclusion in the work by you, as defined in the Apache-2.0 license, shall be +dual licensed as above, without any additional terms or conditions. ## Contact diff --git a/on-target-tests/README.md b/on-target-tests/README.md index 1197e2cef..51877f54d 100644 --- a/on-target-tests/README.md +++ b/on-target-tests/README.md @@ -44,5 +44,7 @@ license when you re-use this code. See [`LICENSE-MIT`](./LICENSE-MIT) or [`LICENSE-APACHE`](./LICENSE-APACHE) for more information on each specific license. Our Apache 2.0 notices can be found in [`NOTICE`](./NOTICE). -Any submissions to this project (e.g. as Pull Requests) must be made available -under these terms. +Unless you explicitly state otherwise, any contribution intentionally submitted +for inclusion in the work by you, as defined in the Apache-2.0 license, shall be +dual licensed as above, without any additional terms or conditions. + diff --git a/rp2040-hal-macros/README.md b/rp2040-hal-macros/README.md index fe8ffbd47..de3532087 100644 --- a/rp2040-hal-macros/README.md +++ b/rp2040-hal-macros/README.md @@ -16,6 +16,6 @@ license when you re-use this code. See [`LICENSE-MIT`](./LICENSE-MIT) or [`LICENSE-APACHE`](./LICENSE-APACHE) for more information on each specific license. Our Apache 2.0 notices can be found in [`NOTICE`](./NOTICE). -Any submissions to this project (e.g. as Pull Requests) must be made available -under these terms. - +Unless you explicitly state otherwise, any contribution intentionally submitted +for inclus`ion in the work by you, as defined in the Apache-2.0 license, shall be +dual licensed as above, without any additional terms or conditions. diff --git a/rp2040-hal/README.md b/rp2040-hal/README.md index 97c54f3a8..5776c665a 100644 --- a/rp2040-hal/README.md +++ b/rp2040-hal/README.md @@ -122,9 +122,9 @@ license when you re-use this code. See [`LICENSE-MIT`](./LICENSE-MIT) or [`LICENSE-APACHE`](./LICENSE-APACHE) for more information on each specific license. Our Apache 2.0 notices can be found in [`NOTICE`](./NOTICE). -Any submissions to this project (e.g. as Pull Requests) must be made available -under these terms. - +Unless you explicitly state otherwise, any contribution intentionally submitted +for inclusion in the work by you, as defined in the Apache-2.0 license, shall be +dual licensed as above, without any additional terms or conditions. ## Contact