Skip to content

Commit 6ad0b28

Browse files
authored
Merge branch 'mdev' into Strip_Level_Color_Adjust
2 parents 98195b4 + 972257a commit 6ad0b28

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+3417
-1951
lines changed

.github/workflows/wled-ci.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,7 @@ jobs:
5050
uses: actions/cache@v4
5151
with:
5252
path: ~/.platformio
53-
key: ${{ runner.os }}-${{ matrix.environment}}-${{ hashFiles('platformio.ini') }}
54-
restore-keys: |
55-
${{ runner.os }}-${{ matrix.environment}}
56-
53+
key: ${{ runner.os }}-${{ matrix.environment}}
5754
- name: Set up Python
5855
uses: actions/setup-python@v5
5956
with:
@@ -82,15 +79,13 @@ jobs:
8279
if: startsWith(github.ref, 'refs/tags/')
8380
steps:
8481
- uses: actions/download-artifact@v4
85-
with:
86-
name: firmware-release-*
8782
- name: List Artifacts
88-
run: find ./
83+
run: find ./ -type f -name *.bin -exec mv -v {} ./ \;
8984
- name: Create draft release
9085
uses: softprops/action-gh-release@v1
9186
with:
9287
draft: True
9388
files: |
94-
*.bin
89+
WLEDMM*.bin
9590
env:
9691
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ esp01-update.sh
1313
platformio_override.ini
1414
replace_fs.py
1515
wled-update.sh
16+
qodana.yaml
17+
compile_commands.json
1618

19+
/build/
1720
/build_output/
1821
/node_modules/
1922

Aircoookie_LICENSE

Lines changed: 0 additions & 24 deletions
This file was deleted.

LICENSE

Lines changed: 291 additions & 674 deletions
Large diffs are not rendered by default.

boards/lilygo-t7-s3.json

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"build": {
3+
"arduino":{
4+
"ldscript": "esp32s3_out.ld",
5+
"memory_type": "qio_opi",
6+
"partitions": "default_16MB.csv"
7+
},
8+
"core": "esp32",
9+
"extra_flags": [
10+
"-DARDUINO_TTGO_T7_S3",
11+
"-DBOARD_HAS_PSRAM",
12+
"-DARDUINO_USB_MODE=1"
13+
],
14+
"f_cpu": "240000000L",
15+
"f_flash": "80000000L",
16+
"flash_mode": "qio",
17+
"hwids": [
18+
[
19+
"0X303A",
20+
"0x1001"
21+
]
22+
],
23+
"mcu": "esp32s3",
24+
"variant": "esp32s3"
25+
},
26+
"connectivity": [
27+
"wifi",
28+
"bluetooth"
29+
],
30+
"debug": {
31+
"openocd_target": "esp32s3.cfg"
32+
},
33+
"frameworks": [
34+
"arduino",
35+
"espidf"
36+
],
37+
"name": "LILYGO T3-S3",
38+
"upload": {
39+
"flash_size": "16MB",
40+
"maximum_ram_size": 327680,
41+
"maximum_size": 16777216,
42+
"require_upload_port": true,
43+
"speed": 921600
44+
},
45+
"url": "https://www.aliexpress.us/item/3256804591247074.html",
46+
"vendor": "LILYGO"
47+
}

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"url": "git+https://github.com/MoonModules/WLED.git"
1717
},
1818
"author": "",
19-
"license": "GPL-3.0-or-later",
19+
"license": "EUPL-1.2",
2020
"bugs": {
2121
"url": "https://github.com/MoonModules/WLED/issues"
2222
},

platformio.ini

Lines changed: 210 additions & 42 deletions
Large diffs are not rendered by default.

readme.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ More info here: <a href="https://mm.kno.wled.ge/moonmodules/what-is-moonmodules/
2323
<a href="https://www.paypal.com/[email protected]"><img src="https://img.shields.io/badge/send%20me%20a%20small%20gift-paypal-blue.svg" alt="HTML tutorial" style="max-width: 100%;"></a>
2424
Donations will be used to buy WLED related hardware, software or drinks shared with the contributors of this repo.
2525

26+
## License
27+
WLED-MM is licensed under the [EUPL-1.2](https://joinup.ec.europa.eu/collection/eupl) or later.
28+
The official license text is [available in 23 languages](https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12).
29+
2630
## Contributing
2731
We welcome contributions to this project! See [contributing](https://github.com/MoonModules/WLED/blob/mdev/CONTRIBUTING.md) for more information.
2832
> We would like to have this repository in a polite and friendly atmosphere, so please be kind and respectful to others. For more details, look at [Code of Conduct](https://github.com/MoonModules/WLED/blob/mdev/CODE_OF_CONDUCT.md).

tools/ESP32-Chip_info.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ void my_verbose_print_reset_reason(int reason)
469469
#endif
470470

471471
/*
472-
* parts below were created by softhack007, licenced under GPL v3.0
472+
* parts below were created by softhack007, licenced under EUPL-1.2
473473
*/
474474

475475
void show_psram_info_part1(void)

0 commit comments

Comments
 (0)