From bc403440bac6d8f3d074153d2d8a2f5c838efe2e Mon Sep 17 00:00:00 2001 From: cschwinne Date: Wed, 17 Nov 2021 01:18:19 +0100 Subject: [PATCH] 0.13.0-b5 --- CHANGELOG.md | 14 ++++++++++++++ package-lock.json | 2 +- package.json | 2 +- platformio.ini | 11 +++++++++-- wled00/const.h | 8 ++++++-- wled00/html_other.h | 2 +- wled00/html_settings.h | 2 +- wled00/improv.cpp | 2 +- wled00/json.cpp | 4 ++-- wled00/wled.h | 4 ++-- 10 files changed, 38 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f92f5d7..5582843d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,20 @@ ### Builds after release 0.12.0 +#### Build 2111160 + +- Version bump to 0.13.0-b5 "Toki" +- Improv Serial support (PR #2334) +- Button improvements (PR #2284) +- Added two time zones (PR #2264, 2311) +- JSON in/decrementing support for brightness and presets +- Fixed no gamma correction for JSON individual LED control +- Preset cycle bugfix +- Removed ledCount +- LED settings buffer bugfix +- Network pin conflict bugfix +- Changed default ESP32 partition layout to 4M, 1M FS + #### Build 2110110 - Version bump to 0.13.0-b4 "Toki" diff --git a/package-lock.json b/package-lock.json index 48dc9a4a..cb50fcb5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "wled", - "version": "0.13.0-b4", + "version": "0.13.0-b5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index be29449f..65e38d83 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wled", - "version": "0.13.0-b4", + "version": "0.13.0-b5", "description": "Tools for WLED project", "main": "tools/cdata.js", "directories": { diff --git a/platformio.ini b/platformio.ini index 0a64a94c..52142fc7 100644 --- a/platformio.ini +++ b/platformio.ini @@ -207,6 +207,8 @@ build_flags = -g -DCONFIG_LITTLEFS_FOR_IDF_3_2 -D CONFIG_ASYNC_TCP_USE_WDT=0 +default_partitions = tools/WLED_ESP32_4MB_1MB_FS.csv + lib_deps = ${env.lib_deps} makuna/NeoPixelBus @ 2.6.7 @@ -288,18 +290,20 @@ lib_deps = ${esp8266.lib_deps} [env:esp32dev] board = esp32dev -platform = espressif32@2.0 +platform = espressif32@3.3.2 build_unflags = ${common.build_unflags} build_flags = ${common.build_flags_esp32} -D WLED_RELEASE_NAME=ESP32 #-D WLED_DISABLE_BROWNOUT_DET lib_deps = ${esp32.lib_deps} +#board_build.partitions = ${esp32.default_partitions} [env:esp32_eth] board = esp32-poe -platform = espressif32@2.0 +platform = espressif32@3.3.2 upload_speed = 921600 build_unflags = ${common.build_unflags} build_flags = ${common.build_flags_esp32} -D WLED_RELEASE_NAME=ESP32_Ethernet -D RLYPIN=-1 -D WLED_USE_ETHERNET -D BTNPIN=-1 lib_deps = ${esp32.lib_deps} +#board_build.partitions = ${esp32.default_partitions} [env:esp32s2_saola] board = esp32dev @@ -406,6 +410,7 @@ build_flags = ${common.build_flags_esp32} lib_deps = ${esp32.lib_deps} OneWire@~2.3.5 olikraus/U8g2 @ ^2.28.8 +board_build.partitions = ${esp32.default_partitions} [env:m5atom] board = esp32dev @@ -413,6 +418,7 @@ build_unflags = ${common.build_unflags} build_flags = ${common.build_flags_esp32} -D LEDPIN=27 -D BTNPIN=39 lib_deps = ${esp32.lib_deps} platform = espressif32@3.2 +board_build.partitions = ${esp32.default_partitions} [env:sp501e] board = esp_wroom_02 @@ -498,3 +504,4 @@ monitor_filters = esp32_exception_decoder lib_deps = ${esp32.lib_deps} TFT_eSPI @ ^2.3.70 +board_build.partitions = ${esp32.default_partitions} diff --git a/wled00/const.h b/wled00/const.h index 62d12e55..37afca7f 100644 --- a/wled00/const.h +++ b/wled00/const.h @@ -272,9 +272,13 @@ #endif #ifdef WLED_USE_ETHERNET -#define E131_MAX_UNIVERSE_COUNT 20 + #define E131_MAX_UNIVERSE_COUNT 20 #else -#define E131_MAX_UNIVERSE_COUNT 10 + #ifdef ESP8266 + #define E131_MAX_UNIVERSE_COUNT 9 + #else + #define E131_MAX_UNIVERSE_COUNT 12 + #endif #endif #define ABL_MILLIAMPS_DEFAULT 850 // auto lower brightness to stay close to milliampere limit diff --git a/wled00/html_other.h b/wled00/html_other.h index 397ac1af..1561b63d 100644 --- a/wled00/html_other.h +++ b/wled00/html_other.h @@ -42,7 +42,7 @@ function B(){window.history.back()}function U(){document.getElementById("uf").st .bt{background:#333;color:#fff;font-family:Verdana,sans-serif;border:.3ch solid #333;display:inline-block;font-size:20px;margin:8px;margin-top:12px}input[type=file]{font-size:16px}body{font-family:Verdana,sans-serif;text-align:center;background:#222;color:#fff;line-height:200%}#msg{display:none}

WLED Software Update

-Installed version: 0.13.0-b4
Download the latest binary: Download the latest binary:


Incorrect configuration may require a factory reset or re-flashing of your ESP.
For security reasons, passwords are not backed up.

About

WLED - version 0.13.0-b4


Contributors, dependencies and special thanks
A huge thank you to everyone who helped me create WLED!

diff --git a/wled00/improv.cpp b/wled00/improv.cpp index cf31cc03..56ee9e0a 100644 --- a/wled00/improv.cpp +++ b/wled00/improv.cpp @@ -189,7 +189,7 @@ void sendImprovInfoResponse() { out[11] = 4; //Firmware len ("WLED") out[12] = 'W'; out[13] = 'L'; out[14] = 'E'; out[15] = 'D'; uint8_t lengthSum = 17; - uint8_t vlen = sprintf_P(out+lengthSum,PSTR("0.13.0-b4/%i"),VERSION); + uint8_t vlen = sprintf_P(out+lengthSum,PSTR("0.13.0-b5/%i"),VERSION); out[16] = vlen; lengthSum += vlen; uint8_t hlen = 7; #ifdef ESP8266 diff --git a/wled00/json.cpp b/wled00/json.cpp index 72cb4be0..4ac81fe7 100644 --- a/wled00/json.cpp +++ b/wled00/json.cpp @@ -501,7 +501,7 @@ void serializeInfo(JsonObject root) leds[F("fps")] = strip.getFps(); leds[F("maxpwr")] = (strip.currentMilliamps)? strip.ablMilliampsMax : 0; leds[F("maxseg")] = strip.getMaxSegments(); - leds[F("seglock")] = false; //will be used in the future to prevent modifications to segment config + //leds[F("seglock")] = false; //might be used in the future to prevent modifications to segment config root[F("str")] = syncToggleReceive; @@ -563,7 +563,7 @@ void serializeInfo(JsonObject root) root[F("resetReason0")] = (int)rtc_get_reset_reason(0); root[F("resetReason1")] = (int)rtc_get_reset_reason(1); #endif - root[F("lwip")] = 0; + root[F("lwip")] = 0; //deprecated #else root[F("arch")] = "esp8266"; root[F("core")] = ESP.getCoreVersion(); diff --git a/wled00/wled.h b/wled00/wled.h index 331bcfea..d173ff27 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -3,12 +3,12 @@ /* Main sketch, global variable declarations @title WLED project sketch - @version 0.13.0-b4 + @version 0.13.0-b5 @author Christian Schwinne */ // version code in format yymmddb (b = daily build) -#define VERSION 2110110 +#define VERSION 2111170 //uncomment this if you have a "my_config.h" file you'd like to use //#define WLED_USE_MY_CONFIG