Skip to content

Commit 437bfc8

Browse files
committed
Merge remote-tracking branch 'upstream/main' into mdev
2 parents bba57d4 + 929bb70 commit 437bfc8

File tree

11 files changed

+1982
-1956
lines changed

11 files changed

+1982
-1956
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
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
@@ -1,6 +1,6 @@
11
{
22
"name": "wled",
3-
"version": "0.14.0-b1.14",
3+
"version": "0.14.0-b1.15",
44
"description": "Tools for WLED project",
55
"main": "tools/cdata.js",
66
"directories": {

platformio.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ build_unflags = ${common.build_unflags}
437437
build_flags = ${common.build_flags} ${esp32s2.build_flags} #-D WLED_RELEASE_NAME=S2_saola
438438
lib_deps = ${esp32s2.lib_deps}
439439

440-
[env:esp32c3dev]
440+
[env:esp32c3dev] ;WLEDMM, not updated with latest change on upstream (renamed to env:esp32c3) as this looks better (@softhack, can you check?)
441441
board = esp32-c3-devkitm-1
442442
;platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.2/platform-tasmota-espressif32-2.0.2.zip
443443
;platform_packages =

0 commit comments

Comments
 (0)