diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee274083..66f05c5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
### Builds after release 0.12.0
+#### Build 2107100
+
+- Version bump to 0.13.0-b2 "Toki"
+- Accept hex color strings in individual LED API
+- Fixed transition property not applying unless power/bri/color changed next
+- Moved transition field below segments (temporarily)
+- Reduced unneeded websockets pushes
+
#### Build 2107091
- Fixed presets using wrong call mode (e.g. causing buttons to send UDP under direct change type)
diff --git a/package-lock.json b/package-lock.json
index 918b5313..617b3aa5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "wled",
- "version": "0.13.0-bl1",
+ "version": "0.13.0-bl2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index d36ffb38..c5dd0113 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wled",
- "version": "0.13.0-bl1",
+ "version": "0.13.0-bl2",
"description": "Tools for WLED project",
"main": "tools/cdata.js",
"directories": {
diff --git a/pio-scripts/output_bins.py b/pio-scripts/output_bins.py
index 5f9268fb..01223e93 100644
--- a/pio-scripts/output_bins.py
+++ b/pio-scripts/output_bins.py
@@ -32,7 +32,7 @@ def bin_rename_copy(source, target, env):
release_name = _get_cpp_define_value(env, "WLED_RELEASE_NAME")
- if release_name and os.getenv("WLED_RELEASE"):
+ if release_name:
_create_dirs(["release"])
version = _get_cpp_define_value(env, "WLED_VERSION")
release_file = "{}release{}WLED_{}_{}.bin".format(OUTPUT_DIR, os.path.sep, version, release_name)
diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp
index 09392bf7..930a4206 100644
--- a/wled00/cfg.cpp
+++ b/wled00/cfg.cpp
@@ -263,7 +263,7 @@ bool deserializeConfig(JsonObject doc, bool fromFS) {
JsonObject if_sync_recv = if_sync["recv"];
CJSON(receiveNotificationBrightness, if_sync_recv["bri"]);
CJSON(receiveNotificationColor, if_sync_recv["col"]);
- CJSON(receiveNotificationEffects, if_sync_recv[F("fx")]);
+ CJSON(receiveNotificationEffects, if_sync_recv["fx"]);
//! following line might be a problem if called after boot
receiveNotifications = (receiveNotificationBrightness || receiveNotificationColor || receiveNotificationEffects);
diff --git a/wled00/data/index.css b/wled00/data/index.css
index d87e0158..49476834 100644
--- a/wled00/data/index.css
+++ b/wled00/data/index.css
@@ -643,6 +643,12 @@ input[type=range]::-moz-range-thumb {
-webkit-backface-visibility: hidden;
-webkit-transform:translate3d(0,0,0);
}
+#tt {
+ text-align: center;
+}
+.cl {
+ width: 42px;
+}
.sel-pl {
width: 165px;
background-position: 141px 16px;
diff --git a/wled00/data/index.htm b/wled00/data/index.htm
index 0679cb24..7c592e68 100644
--- a/wled00/data/index.htm
+++ b/wled00/data/index.htm
@@ -172,6 +172,7 @@
+ Transition: s
@@ -181,8 +182,7 @@
Loading...
-
- Transition s
+
diff --git a/wled00/data/index.js b/wled00/data/index.js
index e8da44e4..e0f03f50 100644
--- a/wled00/data/index.js
+++ b/wled00/data/index.js
@@ -1200,6 +1200,11 @@ function requestJson(command, rinfo = true)
{
command.v = true; // force complete /json/si API response
command.time = Math.floor(Date.now() / 1000);
+ var t = d.getElementById('tt');
+ if (t.validity.valid) {
+ var tn = parseInt(t.value*10);
+ if (tn != tr) command.transition = tn;
+ }
req = JSON.stringify(command);
if (req.length > 1000) useWs = false; //do not send very long requests over websocket
}
@@ -1242,7 +1247,6 @@ function togglePower()
{
isOn = !isOn;
var obj = {"on": isOn};
- obj.transition = parseInt(gId('tt').value*10);
requestJson(obj, false);
}
@@ -1639,7 +1643,6 @@ function setPalette(paletteId = null)
function setBri()
{
var obj = {"bri": parseInt(gId('sliderBri').value)};
- obj.transition = parseInt(gId('tt').value*10);
requestJson(obj, false);
}
@@ -1855,7 +1858,6 @@ function setColor(sr)
}
updateHex();
updateRgb();
- obj.transition = parseInt(gId('tt').value*10);
requestJson(obj, false);
}
diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h
index 9ac49664..06f80cfc 100644
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@@ -179,7 +179,7 @@ void _drawOverlayCronixie();
//playlist.cpp
void shufflePlaylist();
void unloadPlaylist();
-void loadPlaylist(JsonObject playlistObject, byte presetId = 0);
+int16_t loadPlaylist(JsonObject playlistObject, byte presetId = 0);
void handlePlaylist();
//presets.cpp
diff --git a/wled00/html_other.h b/wled00/html_other.h
index 6fc2620c..3d84852f 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