From b5232886d992090bafd719cc74643afa505c1018 Mon Sep 17 00:00:00 2001 From: cschwinne Date: Thu, 10 Dec 2020 17:57:38 +0100 Subject: [PATCH] Fixed preset cycle default duration rounded down to nearest 10sec interval (fixes #1458) Enabled E1.31/DDP/Art-Net in AP mode --- CHANGELOG.md | 5 +++++ wled00/cfg.cpp | 4 ++-- wled00/wled.cpp | 1 + wled00/wled.h | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d207972c..a5d6f924 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ### Development versions after 0.11.0 release +#### Build 2012101 + +- Fixed preset cycle default duration rounded down to nearest 10sec interval (#1458) +- Enabled E1.31/DDP/Art-Net in AP mode + #### Build 2012100 - Fixed multi-segment preset cycle diff --git a/wled00/cfg.cpp b/wled00/cfg.cpp index 33ce4fe9..7f79fddb 100644 --- a/wled00/cfg.cpp +++ b/wled00/cfg.cpp @@ -162,7 +162,7 @@ void deserializeConfig() { CJSON(presetCycleMax, def_cy[F("range")][1]); tdd = def_cy[F("dur")] | -1; - if (tdd >= 0) presetCycleTime = tdd * 100; + if (tdd > 0) presetCycleTime = tdd; JsonObject interfaces = doc["if"]; @@ -482,7 +482,7 @@ void serializeConfig() { JsonArray def_cy_range = def_cy.createNestedArray("range"); def_cy_range.add(presetCycleMin); def_cy_range.add(presetCycleMax); - def_cy[F("dur")] = presetCycleTime / 100; + def_cy[F("dur")] = presetCycleTime; } JsonObject interfaces = doc.createNestedObject("if"); diff --git a/wled00/wled.cpp b/wled00/wled.cpp index d879fdc0..b552daad 100644 --- a/wled00/wled.cpp +++ b/wled00/wled.cpp @@ -377,6 +377,7 @@ void WLED::initAP(bool resetAP) if (udpPort2 > 0 && udpPort2 != ntpLocalPort && udpPort2 != udpPort && udpPort2 != udpRgbPort) { udp2Connected = notifier2Udp.begin(udpPort2); } + e131.begin(false, e131Port, e131Universe, E131_MAX_UNIVERSE_COUNT); dnsServer.setErrorReplyCode(DNSReplyCode::NoError); dnsServer.start(53, "*", WiFi.softAPIP()); diff --git a/wled00/wled.h b/wled00/wled.h index 15285032..e858c9ba 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -8,7 +8,7 @@ */ // version code in format yymmddb (b = daily build) -#define VERSION 2012100 +#define VERSION 2012101 //uncomment this if you have a "my_config.h" file you'd like to use //#define WLED_USE_MY_CONFIG