Skip to content

Commit 30df677

Browse files
authored
Merge pull request wled#1807 from Aircoookie/dev
Pull dev branch into master. 0.12 release soon!
2 parents bbe3e80 + 4a20f43 commit 30df677

Some content is hidden

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

63 files changed

+6690
-3307
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
/wled00/Release
88
/wled00/extLibs
99
/platformio_override.ini
10-
/wled00/my_config.h
10+
/wled00/my_config.h
1111
/build_output
1212
.DS_Store
1313
.gitignore
1414
.clang-format
1515
node_modules
16+
.idea

CHANGELOG.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,52 @@
22

33
### Development versions after 0.11.1 release
44

5+
#### Build 2103130
6+
7+
- Added options for Auto Node discovery
8+
- Optimized strings (no string both F() and raw)
9+
10+
#### Build 2103090
11+
12+
- Added Auto Node discovery (PR #1683)
13+
- Added tooltips to quick color selectors for accessibility
14+
15+
#### Build 2103060
16+
17+
- Auto start field population in bus config
18+
19+
#### Build 2103050
20+
21+
- Fixed incorrect over-memory indication in LED settings on ESP32
22+
23+
#### Build 2103041
24+
25+
- Added destructor for BusPwm (fixes #1789)
26+
27+
#### Build 2103040
28+
29+
- Fixed relay mode inverted when upgrading from 0.11.0
30+
- Fixed no more than 2 pins per bus configurable in UI
31+
- Changed to non-linear IR brightness steps (PR #1742)
32+
- Fixed various warnings (PR #1744)
33+
- Added UDP DNRGBW Mode (PR #1704)
34+
- Added dynamic LED mapping with ledmap.json file (PR #1738)
35+
- Added support for QuinLED-ESP32-Ethernet board
36+
- Added support for WESP32 ethernet board (PR #1764)
37+
- Added Caching for main UI (PR #1704)
38+
- Added Tetrix mode (PR #1729)
39+
- Added memory check on Bus creation
40+
41+
#### Build 2102050
42+
43+
- Version bump to 0.12.0-a0 "Hikari"
44+
- Added FPS indication in info
45+
- Bumped max outputs from 7 to 10 busses for ESP32
46+
47+
#### Build 2101310
48+
49+
- First alpha configurable multipin
50+
551
#### Build 2101130
652

753
- Added color transitions for all segments and slots and for segment brightness

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.11.1",
3+
"version": "0.12.0-a0",
44
"description": "Tools for WLED project",
55
"main": "tools/cdata.js",
66
"directories": {
File renamed without changes.

platformio.ini

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
default_envs = travis_esp8266, travis_esp32
1313

1414
# Release binaries
15-
; default_envs = nodemcuv2, esp01_1m_full, esp32dev, custom_WS2801, custom_APA102, custom_LEDPIN_16, custom_LEDPIN_4, custom_LEDPIN_3, custom32_LEDPIN_16, custom32_APA102
15+
; default_envs = nodemcuv2, esp01_1m_full, esp32dev
1616

1717
# Single binaries (uncomment your board)
1818
; default_envs = nodemcuv2
@@ -95,16 +95,6 @@ debug_flags = -D DEBUG=1 -D WLED_DEBUG -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT
9595
# This reduces the OTA size with ~45KB, so it's especially useful on low memory boards (512k/1m).
9696
# ------------------------------------------------------------------------------
9797
build_flags =
98-
-Wno-switch
99-
-Wno-deprecated-declarations
100-
-Wno-write-strings
101-
-Wno-unused-variable
102-
-Wno-unused-value
103-
-Wno-sign-compare
104-
-Wno-unused-but-set-variable
105-
-Wno-return-type
106-
-Wno-sequence-point
107-
-Wno-narrowing
10898
-DMQTT_MAX_PACKET_SIZE=1024
10999
-DSECURE_CLIENT=SECURE_CLIENT_BEARSSL
110100
-DBEARSSL_SSL_BASIC
@@ -121,9 +111,6 @@ build_flags =
121111
; -D USERMOD_SENSORSTOMQTT
122112

123113
build_unflags =
124-
-Wall
125-
-Wreorder
126-
-Wdeprecated-declarations
127114

128115
# enables all features for travis CI
129116
build_flags_all_features =
@@ -159,15 +146,15 @@ build_flags =
159146
-DMIMETYPE_MINIMAL
160147

161148
[esp32]
162-
build_flags = -w -g
149+
build_flags = -g
163150
-DARDUINO_ARCH_ESP32
164151
-DCONFIG_LITTLEFS_FOR_IDF_3_2
165152

166153
[scripts_defaults]
167-
extra_scripts = pio/name-firmware.py
168-
pio/gzip-firmware.py
169-
pio/strip-floats.py
170-
pio/user_config_copy.py
154+
extra_scripts = pio-scripts/name-firmware.py
155+
pio-scripts/gzip-firmware.py
156+
pio-scripts/strip-floats.py
157+
pio-scripts/user_config_copy.py
171158

172159
# ------------------------------------------------------------------------------
173160
# COMMON SETTINGS:
@@ -197,7 +184,7 @@ lib_deps =
197184
AsyncTCP @ 1.0.3
198185
IRremoteESP8266 @ 2.7.3
199186
https://github.com/lorol/LITTLEFS.git
200-
https://github.com/Aircoookie/ESPAsyncWebServer.git @ ~2.0.0
187+
https://github.com/Aircoookie/ESPAsyncWebServer.git @ ~2.0.2
201188
#For use of the TTGO T-Display ESP32 Module with integrated TFT display uncomment the following line
202189
#TFT_eSPI
203190
#For use SSD1306 OLED display uncomment following

tools/cdata.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,14 @@ const char PAGE_dmxmap[] PROGMEM = R"=====()=====";
398398
method: "plaintext",
399399
filter: "html-minify",
400400
},
401+
{
402+
file: "liveviewws.htm",
403+
name: "PAGE_liveviewws",
404+
prepend: "=====(",
405+
append: ")=====",
406+
method: "plaintext",
407+
filter: "html-minify",
408+
},
401409
{
402410
file: "404.htm",
403411
name: "PAGE_404",

0 commit comments

Comments
 (0)