Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SR 0.13.4 release updates, part1 #271

Merged
merged 11 commits into from
Jul 25, 2023
Merged

SR 0.13.4 release updates, part1 #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ff6b2f5
Update platformio.ini
softhack007 Jun 25, 2023
bb99486
preserve Aircoookie LICENSE
softhack007 Jul 24, 2023
e42a58f
Create GPLv3 LICENSE
softhack007 Jul 24, 2023
bb05e2f
Update package.json
softhack007 Jul 24, 2023
ee2ea85
Update package-lock.json
softhack007 Jul 24, 2023
8f13c69
Update Aircoookie_LICENSE
softhack007 Jul 24, 2023
05fb7e4
Typo
softhack007 Jul 24, 2023
abbe153
Merge pull request #270 from softhack007/dev
softhack007 Jul 25, 2023
c59e48e
Merge branch 'master' into dev
softhack007 Jul 25, 2023
823ea00
post merge
softhack007 Jul 25, 2023
33e0479
Update readme.md
softhack007 Jul 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions Aircoookie_LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
The license below is valid for the code that is common with upstream (AC WLED 0.13.3) from https://github.com/Aircoookie/WLED.
Additions and changes that are exclusive to this fork (WLED-SR) are under GPLv3 license, see LICENSE.

MIT License

Copyright (c) 2016 Christian Schwinne

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.
695 changes: 674 additions & 21 deletions LICENSE
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"url": "git+https://github.com/atuline/WLED.git"
},
"author": "",
"license": "ISC",
"license": "GPL-3.0-or-later",
"bugs": {
"url": "https://github.com/atuline/WLED/issues"
},
Expand Down
1 change: 1 addition & 0 deletions platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ default_envs =
esp32_pico_4MB_S
wemos_shield_esp32_4MB_M
wemos_shield_esp32_16MB_M
soundReactive_m5StickC_Plus

# WLED sound-reactive binaries
; default_envs = soundReactive_lolin_d32
Expand Down
4 changes: 3 additions & 1 deletion readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,11 @@ See [here](https://kno.wled.ge/basics/compatible-hardware)!

## ✌️ Other

Licensed under the MIT license
WLED-SR is based on WLED 0.13.3
Credits [here](https://kno.wled.ge/about/contributors/)!

WLED-SR specific changes and enhancements require the GPLv3 license.

Join the Discord server to discuss everything about WLED!

<a href="https://discord.gg/KuqP7NE"><img src="https://discordapp.com/api/guilds/473448917040758787/widget.png?style=banner2" width="25%"></a>
Expand Down
2 changes: 1 addition & 1 deletion wled00/wled.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

// version code in format yymmddb (b = daily build)
#define VERSION 2306251 // WLEDSR specific version
#define VERSION 2307251 // WLEDSR specific version
#define SR_VERSION_NAME "0.13.4-beta" // WLEDSR version name --> some files need manual updating: package.json, package-lock.json, improv.cpp

#define AC_VERSION 2208222 // AC WLED base version; last updated by PR #239 -> Merge AC-0.13.3 into dev
Expand Down
Loading