diff --git a/LICENSE b/LICENSE deleted file mode 100644 index da1b6af..0000000 --- a/LICENSE +++ /dev/null @@ -1,9 +0,0 @@ -Copyright 2022 Julian Scheffers -Copyright 2022 Jeroen Domburg -Copyright 2022 Renze Nicolai - -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. \ No newline at end of file diff --git a/README.md b/README.md index a05c0fe..0836a45 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,15 @@ # MCH2022 template app This repository contains a template app for the MCH2022 badge. +It is intended to be used as the basis for developing your own native ESP32 +apps. See [Getting Started](https://badge.team/docs/badges/mch2022/software-development/esp_idf_getting_started/) ## License -The source code contained in this repository is licensed under terms of the MIT license, more information can be found in the LICENSE file. +The source code contained in the main folder of this example is public domain / CC0 licensed, use it as you please. -Source code included as submodules is licensed separately, please check the following table for details. +Source code included as submodules is licensed separately, please check the +following table for details. | Submodule | License | Author | |-----------------------------|-----------------------------------|--------------------------------------------------------| @@ -20,7 +23,7 @@ Source code included as submodules is licensed separately, please check the foll | components/sdcard | MIT | Nicolai Electronics | | components/spi-ice40 | MIT | Nicolai Electronics | | components/spi-ili9341 | MIT | Nicolai Electronics | -| components/ws2812 | MIT | Unlicense / Public domain | +| components/ws2812 | Unlicense / Public domain | None | ## How to make ```sh diff --git a/components/appfs b/components/appfs index 1a46f7d..f934409 160000 --- a/components/appfs +++ b/components/appfs @@ -1 +1 @@ -Subproject commit 1a46f7d750cf6b8e68873a0e85776a8508f297fb +Subproject commit f9344090484ccf5861688555e900c49b144db59e diff --git a/components/mch2022-rp2040 b/components/mch2022-rp2040 index b04727d..073a70b 160000 --- a/components/mch2022-rp2040 +++ b/components/mch2022-rp2040 @@ -1 +1 @@ -Subproject commit b04727dffbc79c90ac705ab620e60f8daf2c13a0 +Subproject commit 073a70b0175f3b08164dff5a6adb178e6d3caacc diff --git a/components/pax-graphics b/components/pax-graphics index ef61caf..8027acb 160000 --- a/components/pax-graphics +++ b/components/pax-graphics @@ -1 +1 @@ -Subproject commit ef61caff38ac1c238ad1fb907174255a19fa4809 +Subproject commit 8027acbe5e49b009e71baf66aff2aaf5ee64d7bd diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 8115b63..0af217f 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -1,6 +1,11 @@ +# This example code is in the Public Domain (or CC0 licensed, at your option.) +# Unless required by applicable law or agreed to in writing, this +# software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR +# CONDITIONS OF ANY KIND, either express or implied. + idf_component_register( SRCS "main.c" INCLUDE_DIRS "." "include" -) \ No newline at end of file +) diff --git a/main/include/main.h b/main/include/main.h index 2455949..91f33fe 100644 --- a/main/include/main.h +++ b/main/include/main.h @@ -1,3 +1,9 @@ +/* + * This example code is in the Public Domain (or CC0 licensed, at your option.) + * Unless required by applicable law or agreed to in writing, this + * software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. + */ #pragma once diff --git a/main/main.c b/main/main.c index a48c957..2278b16 100644 --- a/main/main.c +++ b/main/main.c @@ -1,5 +1,9 @@ - -// This file contains a simple hello world app which you can base you own apps on. +/* + * This example code is in the Public Domain (or CC0 licensed, at your option.) + * Unless required by applicable law or agreed to in writing, this + * software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR + * CONDITIONS OF ANY KIND, either express or implied. + */ #include "main.h" diff --git a/main/my_image.png b/main/my_image.png deleted file mode 100644 index be52bdb..0000000 Binary files a/main/my_image.png and /dev/null differ