Skip to content

Commit 7bc59c6

Browse files
committed
Merge branch '0_15' into FXparticleSystem
2 parents 7bcfcb4 + 6dcd959 commit 7bc59c6

File tree

86 files changed

+785
-341
lines changed

Some content is hidden

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

86 files changed

+785
-341
lines changed

CHANGELOG.md

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
## WLED changelog
22

3+
#### Build 2402060
4+
- WLED version 0.15.0-b1
5+
- Harmonic Random Cycle palette (#3729 by @dedehai)
6+
- Multi PIR sensor usermod (added support for attaching multiple PIR sensors)
7+
- Removed obsolete (and nonfunctional) usermods
8+
39
#### Build 2309120 till build 2402010
410
- WLED version 0.15.0-a0
511
- Multi-WiFi support. Add up to 3 (or more via cusom compile) WiFis to connect to
@@ -84,6 +90,33 @@
8490
- send UDP/WS on segment change
8591
- pop_back() when removing last segment
8692

93+
#### Build 2401141
94+
- Official release of WLED 0.14.1
95+
- Fix for #3566, #3665, #3672
96+
- Sorting of palettes in custom palette editor (#3674 by @WoodyLetsCode)
97+
98+
#### Build 2401060
99+
- Version bump: 0.14.1-b3
100+
- Global JSON buffer guarding (#3648 by @willmmiles, resolves #3641, #3312, #3367, #3637, #3646, #3447)
101+
- Fix for #3632
102+
- Custom palette editor mobile UI enhancement (#3617 by @imeszaros)
103+
- changelog update
104+
105+
#### Build 2312290
106+
- Fix for #3622, #3613, #3609
107+
- Various tweaks and fixes
108+
- changelog update
109+
110+
#### Build 2312230
111+
- Version bump: 0.14.1-b2
112+
- Fix for Pixel Magic button
113+
- Fix for #2922 (option to force WiFi PHY mode to G on ESP8266)
114+
- Fix for #3601, #3400 (incorrect sunrise/sunset, #3612 by @softhack007)
115+
116+
#### Build 2312180
117+
- Bugfixes (#3593, #3490, #3573, #3517, #3561, #3555, #3541, #3536, #3515, #3522, #3533, #3508)
118+
- Various other internal cleanups and optimisations
119+
87120
#### Build 2311160
88121
- Version bump: 0.14.1-b1
89122
- Bugfixes (#3526, #3502, #3496, #3484, #3487, #3445, #3466, #3296, #3382, #3312)
@@ -516,7 +549,7 @@
516549

517550
- Added application level pong websockets reply (#2139)
518551
- Use AsyncTCP 1.0.3 as it mitigates the flickering issue from 0.13.0-b2
519-
- Fixed transition manually updated in preset overriden by field value
552+
- Fixed transition manually updated in preset overridden by field value
520553

521554
#### Build 2108050
522555

@@ -1045,7 +1078,7 @@
10451078

10461079
#### Build 2011040
10471080

1048-
- Inversed Rain direction (fixes #1147)
1081+
- Inverted Rain direction (fixes #1147)
10491082

10501083
#### Build 2011010
10511084

@@ -1256,7 +1289,7 @@
12561289

12571290
- Added module info page to web UI
12581291
- Added realtime override functionality to web UI
1259-
- Added individial segment power and brightness to web UI
1292+
- Added individual segment power and brightness to web UI
12601293
- Added feature to one-click select single segment only by tapping segment name
12611294
- Removed palette jumping to default if color is changed
12621295

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
@@ -1,6 +1,6 @@
11
{
22
"name": "wled",
3-
"version": "0.15.0-a0",
3+
"version": "0.15.0-b1",
44
"description": "Tools for WLED project",
55
"main": "tools/cdata.js",
66
"directories": {

readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ A fast and feature-rich implementation of an ESP8266/ESP32 webserver to control
2626
- Up to 250 user presets to save and load colors/effects easily, supports cycling through them.
2727
- Presets can be used to automatically execute API calls
2828
- Nightlight function (gradually dims down)
29-
- Full OTA software updatability (HTTP + ArduinoOTA), password protectable
29+
- Full OTA software updateability (HTTP + ArduinoOTA), password protectable
3030
- Configurable analog clock (Cronixie, 7-segment and EleksTube IPS clock support via usermods)
3131
- Configurable Auto Brightness limit for safe operation
3232
- Filesystem-based config for easier backup of presets and settings

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ starlette==0.23.1
5252
# via platformio
5353
tabulate==0.9.0
5454
# via platformio
55-
urllib3==1.26.15
55+
urllib3==1.26.18
5656
# via requests
5757
uvicorn==0.20.0
5858
# via platformio

usermods/Animated_Staircase/Animated_Staircase.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class Animated_Staircase : public Usermod {
133133
* received within this time, an object is detected
134134
* and the function will return true.
135135
*
136-
* The speed of sound is 343 meters per second at 20 degress Celcius.
136+
* The speed of sound is 343 meters per second at 20 degrees Celsius.
137137
* Since the sound has to travel back and forth, the detection
138138
* distance for the sensor in cm is (0.0343 * maxTimeUs) / 2.
139139
*
@@ -259,7 +259,7 @@ class Animated_Staircase : public Usermod {
259259
}
260260
}
261261

262-
// send sesnor values to JSON API
262+
// send sensor values to JSON API
263263
void writeSensorsToJson(JsonObject& staircase) {
264264
staircase[F("top-sensor")] = topSensorRead;
265265
staircase[F("bottom-sensor")] = bottomSensorRead;
@@ -309,7 +309,7 @@ class Animated_Staircase : public Usermod {
309309
seg.setOption(SEG_OPTION_ON, true);
310310
}
311311
strip.trigger(); // force strip update
312-
stateChanged = true; // inform external dvices/UI of change
312+
stateChanged = true; // inform external devices/UI of change
313313
colorUpdated(CALL_MODE_DIRECT_CHANGE);
314314
DEBUG_PRINTLN(F("Animated Staircase disabled."));
315315
}
@@ -492,7 +492,7 @@ class Animated_Staircase : public Usermod {
492492
bottomEchoPin = top[FPSTR(_bottomEcho_pin)] | bottomEchoPin;
493493

494494
topMaxDist = top[FPSTR(_topEchoCm)] | topMaxDist;
495-
topMaxDist = min(150,max(30,(int)topMaxDist)); // max distnace ~1.5m (a lag of 9ms may be expected)
495+
topMaxDist = min(150,max(30,(int)topMaxDist)); // max distance ~1.5m (a lag of 9ms may be expected)
496496
bottomMaxDist = top[FPSTR(_bottomEchoCm)] | bottomMaxDist;
497497
bottomMaxDist = min(150,max(30,(int)bottomMaxDist)); // max distance ~1.5m (a lag of 9ms may be expected)
498498

usermods/Animated_Staircase/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The Animated Staircase can be controlled by the WLED API. Change settings such a
1111
speed, on/off time and distance by sending an HTTP request, see below.
1212

1313
## WLED integration
14-
To include this usermod in your WLED setup, you have to be able to [compile WLED from source](https://github.com/Aircoookie/WLED/wiki/Compiling-WLED).
14+
To include this usermod in your WLED setup, you have to be able to [compile WLED from source](https://kno.wled.ge/advanced/compiling-wled/).
1515

1616
Before compiling, you have to make the following modifications:
1717

@@ -38,7 +38,7 @@ Maximum distance for ultrasonic sensor can be configured as the time needed for
3838
You _may_ need to use 10k pull-down resistors on the selected PIR pins, depending on the sensor.
3939

4040
## WLED configuration
41-
1. In the WLED UI, confgure a segment for each step. The lowest step of the stairs is the
41+
1. In the WLED UI, configure a segment for each step. The lowest step of the stairs is the
4242
lowest segment id.
4343
2. Save your segments into a preset.
4444
3. Ideally, add the preset in the config > LED setup menu to the "apply
@@ -91,7 +91,7 @@ To enable the usermod again, use `"enabled":true`.
9191
Alternatively you can use _Usermod_ Settings page where you can change other parameters as well.
9292

9393
### Changing animation parameters and detection range of the ultrasonic HC-SR04 sensor
94-
Using _Usermod_ Settings page you can define different usermod parameters, includng sensor pins, delay between segment activation etc.
94+
Using _Usermod_ Settings page you can define different usermod parameters, including sensor pins, delay between segment activation etc.
9595

9696
When an ultrasonic sensor is enabled you can enter maximum detection distance in centimeters separately for top and bottom sensors.
9797

usermods/BH1750_v2/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The luminance is displayed in both the Info section of the web UI, as well as pu
99
- This must be added under `lib_deps` in your `platformio.ini` (or `platformio_override.ini`).
1010
- Data is published over MQTT - make sure you've enabled the MQTT sync interface.
1111

12-
## Compiliation
12+
## Compilation
1313

1414
To enable, compile with `USERMOD_BH1750` defined (e.g. in `platformio_override.ini`)
1515
```ini

usermods/BH1750_v2/usermod_bh1750.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#define USERMOD_BH1750_FIRST_MEASUREMENT_AT 10000
2626
#endif
2727

28-
// only report if differance grater than offset value
28+
// only report if difference grater than offset value
2929
#ifndef USERMOD_BH1750_OFFSET_VALUE
3030
#define USERMOD_BH1750_OFFSET_VALUE 1
3131
#endif
@@ -98,8 +98,8 @@ class Usermod_BH1750 : public Usermod
9898
JsonObject device = doc.createNestedObject(F("device")); // attach the sensor to the same device
9999
device[F("name")] = serverDescription;
100100
device[F("identifiers")] = "wled-sensor-" + String(mqttClientID);
101-
device[F("manufacturer")] = F("WLED");
102-
device[F("model")] = F("FOSS");
101+
device[F("manufacturer")] = F(WLED_BRAND);
102+
device[F("model")] = F(WLED_PRODUCT_NAME);
103103
device[F("sw_version")] = versionString;
104104

105105
String temp;

usermods/BME280_v2/usermod_bme280.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class UsermodBME280 : public Usermod
3131

3232
// set the default pins based on the architecture, these get overridden by Usermod menu settings
3333
#ifdef ESP8266
34-
//uint8_t RST_PIN = 16; // Uncoment for Heltec WiFi-Kit-8
34+
//uint8_t RST_PIN = 16; // Un-comment for Heltec WiFi-Kit-8
3535
#endif
3636
bool initDone = false;
3737

@@ -78,7 +78,7 @@ class UsermodBME280 : public Usermod
7878
static const char _name[];
7979
static const char _enabled[];
8080

81-
// Read the BME280/BMP280 Sensor (which one runs depends on whether Celsius or Farenheit being set in Usermod Menu)
81+
// Read the BME280/BMP280 Sensor (which one runs depends on whether Celsius or Fahrenheit being set in Usermod Menu)
8282
void UpdateBME280Data(int SensorType)
8383
{
8484
float _temperature, _humidity, _pressure;
@@ -160,8 +160,8 @@ class UsermodBME280 : public Usermod
160160
JsonObject device = doc.createNestedObject(F("device")); // attach the sensor to the same device
161161
device[F("name")] = serverDescription;
162162
device[F("identifiers")] = "wled-sensor-" + String(mqttClientID);
163-
device[F("manufacturer")] = F("WLED");
164-
device[F("model")] = F("FOSS");
163+
device[F("manufacturer")] = F(WLED_BRAND);
164+
device[F("model")] = F(WLED_PRODUCT_NAME);
165165
device[F("sw_version")] = versionString;
166166

167167
String temp;

0 commit comments

Comments
 (0)