`+
`| ${isMSeg?'Start X':'Start LED'} | `+
diff --git a/wled00/file.cpp b/wled00/file.cpp
index 5a82bdb3..bb853df9 100644
--- a/wled00/file.cpp
+++ b/wled00/file.cpp
@@ -214,7 +214,7 @@ bool appendObjectToFile(const char* key, JsonDocument* content, uint32_t s, uint
if (!f) return false;
if (f.size() < 3) {
- char init[10];
+ char init[12];
strcpy_P(init, PSTR("{\"0\":{}}"));
f.print(init);
}
@@ -285,7 +285,7 @@ bool appendObjectToFile(const char* key, JsonDocument* content, uint32_t s, uint
bool writeObjectToFileUsingId(const char* file, uint16_t id, JsonDocument* content)
{
- char objKey[10];
+ char objKey[12];
sprintf(objKey, "\"%d\":", id);
return writeObjectToFile(file, objKey, content);
}
@@ -360,7 +360,7 @@ bool writeObjectToFile(const char* file, const char* key, JsonDocument* content)
bool readObjectFromFileUsingId(const char* file, uint16_t id, JsonDocument* dest)
{
- char objKey[10];
+ char objKey[12];
sprintf(objKey, "\"%d\":", id);
return readObjectFromFile(file, objKey, dest);
}
diff --git a/wled00/presets.cpp b/wled00/presets.cpp
index 3e5b4142..b8d121d0 100644
--- a/wled00/presets.cpp
+++ b/wled00/presets.cpp
@@ -12,7 +12,7 @@ static volatile byte presetToApply = 0;
static volatile byte callModeToApply = 0;
static volatile byte presetToSave = 0;
static volatile int8_t saveLedmap = -1;
-static char quickLoad[9];
+static char quickLoad[12]; // WLEDMM 9->12 to prevent crashing with unicode
static char saveName[33];
static bool includeBri = true, segBounds = true, selectedOnly = false, playlistSave = false;
@@ -88,8 +88,8 @@ static void doSaveState() {
// clean up
saveLedmap = -1;
presetToSave = 0;
- saveName[0] = '\0';
- quickLoad[0] = '\0';
+ memset(saveName, '\0', sizeof(saveName));
+ memset(quickLoad,'\0', sizeof(quickLoad));
playlistSave = false;
}
@@ -306,7 +306,7 @@ void savePreset(byte index, const char* pname, JsonObject sObj)
presetToSave = index;
playlistSave = false;
- if (sObj[F("ql")].is()) strlcpy(quickLoad, sObj[F("ql")].as(), 9); // client limits QL to 2 chars, buffer for 8 bytes to allow unicode
+ if (sObj[F("ql")].is()) strlcpy(quickLoad, sObj[F("ql")].as(), sizeof(quickLoad)); // client limits QL to 2 chars, buffer for 12 bytes to allow encoded unicode
if (sObj.size()==0 || sObj["o"].isNull()) { // no "o" means not a playlist or custom API call, saving of state is async (not immediately)
includeBri = sObj["ib"].as() || sObj.size()==0 || index==255; // temporary preset needs brightness
diff --git a/wled00/wled.h b/wled00/wled.h
index 138157a7..1de5d8fd 100644
--- a/wled00/wled.h
+++ b/wled00/wled.h
@@ -176,7 +176,7 @@
#include "src/dependencies/async-mqtt-client/AsyncMqttClient.h"
#endif
-#define ARDUINOJSON_DECODE_UNICODE 0
+#define ARDUINOJSON_DECODE_UNICODE 1 // WLEDMM enable unicode support -> prevents crashes when user enters unicode strings in webUI
#include "src/dependencies/json/AsyncJson-v6.h"
#include "src/dependencies/json/ArduinoJson-v6.h"
From e63dc7e71e9cd21b7621d6cb49ec57375733d023 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Thu, 20 Nov 2025 23:49:26 +0100
Subject: [PATCH 119/170] longer segment names
* introducing WLED_MAX_SEGNAME_LEN from upstream
* default: max name length = 48
* hopefully found all places where the segment name length was hardcoded (32, 33, 34)
* some comments still refer to "32" but wtf
---
wled00/FX.cpp | 4 ++--
wled00/FX_2Dfcn.cpp | 7 +------
wled00/FX_fcn.cpp | 20 ++++++++++----------
wled00/const.h | 16 ++++++++++++++++
wled00/image_loader.cpp | 5 -----
wled00/json.cpp | 4 ++--
6 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index cfa401ec..3943b592 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -6814,8 +6814,8 @@ uint16_t mode_2Dscrollingtext(void) {
case 5: letterWidth = 5; letterHeight = 12; break;
}
const int yoffset = map(SEGMENT.intensity, 0, 255, -rows/2, rows/2) + (rows-letterHeight)/2;
- char text[33] = {'\0'}; // ToDO use WLED_MAX_SEGNAME_LEN + 1
- unsigned maxLen = (SEGMENT.name) ? min(32, (int)strlen(SEGMENT.name)) : 0; // WLEDMM make it robust against too long segment names, ToDO use WLED_MAX_SEGNAME_LEN
+ char text[WLED_MAX_SEGNAME_LEN+1] = {'\0'};
+ unsigned maxLen = (SEGMENT.name) ? min(WLED_MAX_SEGNAME_LEN, (int)strlen(SEGMENT.name)) : 0; // WLEDMM make it robust against too long segment names
#if !defined(WLED_ENABLE_FULL_FONTS)
if (SEGMENT.name) for (size_t i=0,j=0; i31 && SEGMENT.name[i]<128) text[j++] = SEGMENT.name[i]; // unicode killer
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 26417c65..28e8a311 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -842,7 +842,7 @@ void Segment::drawArc(unsigned x0, unsigned y0, int radius, uint32_t color, uint
//WLEDMM for artifx
bool Segment::jsonToPixels(char * name, uint8_t fileNr) {
if (!isActive()) return true; // segment not active, nothing to do
- char fileName[42] = { '\0' }; // we need up to 40 bytes (seg.name is 32 bytes max)
+ char fileName[WLED_MAX_SEGNAME_LEN+12] = { '\0' }; // we need up to 40 bytes (seg.name is 32 bytes max)
//WLEDMM: als support segment name ledmaps
bool isFile = false;
// strcpy_P(fileName, PSTR("/mario"));
@@ -886,11 +886,6 @@ bool Segment::jsonToPixels(char * name, uint8_t fileNr) {
#include "src/font/codepages.h"
#endif
-//upstream compatibility
-#if !defined(WLED_MAX_SEGNAME_LEN)
-#define WLED_MAX_SEGNAME_LEN 32 // ToDO: inrease default to 48
-#endif
-
// unicode-aware wrapper for drawCharacter(), to be called from mode_2Dscrollingtext()
void Segment::drawText(const unsigned char* text, size_t maxLen, int maxLetters, int16_t x, int16_t y, uint8_t w, uint8_t h, uint32_t color, uint32_t col2, bool drawShadow) {
if (!isActive()) return; // not active
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 73eea00c..71355377 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -698,7 +698,7 @@ struct ArrayAndSize {
};
class JMapC {
public:
- char previousSegmentName[50] = "";
+ char previousSegmentName[WLED_MAX_SEGNAME_LEN+12] = "";
~JMapC() {
DEBUG_PRINTLN("~JMapC");
@@ -751,7 +751,7 @@ class JMapC {
uint32_t dataSize = 0;
deletejVectorMap();
DEBUG_PRINT("New "); DEBUG_PRINTLN(SEGMENT.name);
- char jMapFileName[50] = {'\0'}; // we need at most 32 + 7 bytes
+ char jMapFileName[WLED_MAX_SEGNAME_LEN+12] = {'\0'}; // we need at most 32 + 7 bytes
strcpy(jMapFileName, "/");
strcat(jMapFileName, SEGMENT.name);
strcat(jMapFileName, ".json");
@@ -1728,22 +1728,22 @@ void WS2812FX::enumerateLedmaps() {
f = WLED_FS.open(fileName, "r");
if (f) {
f.find("\"n\":");
- char name[34] = { '\0' }; // ensure string termination
+ char name[WLED_MAX_SEGNAME_LEN+2] = { '\0' }; // ensure string termination
f.readBytesUntil('\n', name, sizeof(name)-1);
size_t len = strlen(name);
- if (len > 0 && len < 33) {
+ if (len > 0 && len < (sizeof(name)-1)) {
(void) cleanUpName(name);
len = strlen(name);
ledmapNames[i-1] = new(std::nothrow) char[len+1]; // +1 to include terminating \0
- if (ledmapNames[i-1]) strlcpy(ledmapNames[i-1], name, 33);
+ if (ledmapNames[i-1]) strlcpy(ledmapNames[i-1], name, sizeof(name));
}
if (!ledmapNames[i-1]) {
char tmp[33];
snprintf_P(tmp, 32, PSTR("ledmap%d.json"), i);
- len = strlen(tmp);
- ledmapNames[i-1] = new(std::nothrow) char[len+1];
- if (ledmapNames[i-1]) strlcpy(ledmapNames[i-1], tmp, 33);
+ size_t tmplen = strlen(tmp);
+ ledmapNames[i-1] = new(std::nothrow) char[tmplen+1];
+ if (ledmapNames[i-1]) strlcpy(ledmapNames[i-1], tmp, tmplen);
}
USER_PRINTF("enumerateLedmaps %s \"%s\"", fileName, name);
@@ -1779,7 +1779,7 @@ void WS2812FX::enumerateLedmaps() {
uint8_t segment_index = 0;
for (segment &seg : _segments) {
if (seg.name != nullptr && strlen(seg.name) > 0) {
- char fileName[33+11] = { '\0' }; // segment name is 32 chars max, so we need 43 chars in worst case
+ char fileName[WLED_MAX_SEGNAME_LEN+12] = { '\0' }; // segment name is 32 chars max, so we need 43 chars in worst case
snprintf_P(fileName, sizeof(fileName)-1, PSTR("/lm%s.json"), seg.name);
bool isFile = WLED_FS.exists(fileName);
if (isFile) ledMaps |= 1 << (10+segment_index);
@@ -2587,7 +2587,7 @@ void WS2812FX::loadCustomPalettes() {
bool WS2812FX::deserializeMap(uint8_t n) {
// 2D support creates its own ledmap (on the fly) if a ledmap.json exists it will overwrite built one.
- char fileName[42] = {'\0'}; // WLEDMM we need at least 32 + 7 bytes
+ char fileName[WLED_MAX_SEGNAME_LEN+10] = {'\0'}; // WLEDMM we need at least 32 + 7 bytes
//WLEDMM: als support segment name ledmaps
bool isFile = false;;
if (n<10) {
diff --git a/wled00/const.h b/wled00/const.h
index 388eaad6..e152bc7f 100644
--- a/wled00/const.h
+++ b/wled00/const.h
@@ -91,6 +91,22 @@
#endif
#endif
+#ifndef WLED_MAX_SEGNAME_LEN
+ #ifdef ESP8266
+ #define WLED_MAX_SEGNAME_LEN 32
+ #else
+ #define WLED_MAX_SEGNAME_LEN 48 // WLEDMM upstream uses 64, but 48 seems to be a good compromise between flexibility and memory needed
+ #endif
+#else
+ #if WLED_MAX_SEGNAME_LEN<32
+ #undef WLED_MAX_SEGNAME_LEN
+ #define WLED_MAX_SEGNAME_LEN 32
+ #else
+ #warning WLED UI does not support your modified maximum segment name length!
+ #endif
+#endif
+
+
//Usermod IDs
#define USERMOD_ID_RESERVED 0 //Unused. Might indicate no usermod present
#define USERMOD_ID_UNSPECIFIED 1 //Default value for a general user mod that does not specify a custom ID
diff --git a/wled00/image_loader.cpp b/wled00/image_loader.cpp
index bc73a8fc..72aa765f 100644
--- a/wled00/image_loader.cpp
+++ b/wled00/image_loader.cpp
@@ -5,11 +5,6 @@
#include "GifDecoder.h"
-//upstream compatibility
-#if !defined(WLED_MAX_SEGNAME_LEN)
-#define WLED_MAX_SEGNAME_LEN 32
-#endif
-
/*
* Functions to render images from filesystem to segments, used by the "Image" effect
*/
diff --git a/wled00/json.cpp b/wled00/json.cpp
index 809dd762..ee19ac0b 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -151,8 +151,8 @@ bool deserializeSegment(JsonObject elem, byte it, byte presetId)
if (name != nullptr) len = strlen(name);
if (len > 0) {
// WLEDMM: truncate segment name, instead of silently deleting
- if (len > 32) { // ToDO: use WLED_MAX_SEGNAME_LEN
- len = 32; // cut to max segment name length
+ if (len > WLED_MAX_SEGNAME_LEN) {
+ len = WLED_MAX_SEGNAME_LEN; // cut to max segment name length
#if defined(WLED_ENABLE_FULL_FONTS)
if (name[len] > 127) // UTF-8 => don't cut in the middle of a multi-byte char
len = cutUnicodeAt((unsigned char*)name, len-1) +1; // +1 to convert between index and length
From c3dce1353c4bbbdf3c314189c90f0d96fa369f4a Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 21 Nov 2025 00:01:13 +0100
Subject: [PATCH 120/170] fix font shadow code
stupid mistake ... it must still be "i>0" because its about the scanline, not the character code
---
wled00/FX_2Dfcn.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 28e8a311..8cdd1b6c 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -952,19 +952,19 @@ void Segment::drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w,
switch (font) { // font = w * h
case 24: bits = pgm_read_byte_near(&console_font_4x6[(chr * h) + i]);
- if ((i>space) && drawShadow) bits_up = pgm_read_byte_near(&console_font_4x6[(chr * h) + i -1]);
+ if ((i>0) && drawShadow) bits_up = pgm_read_byte_near(&console_font_4x6[(chr * h) + i -1]);
break; // 4x6 font
case 40: bits = pgm_read_byte_near(&console_font_5x8[(chr * h) + i]);
- if ((i>space) && drawShadow) bits_up = pgm_read_byte_near(&console_font_5x8[(chr * h) + i -1]);
+ if ((i>0) && drawShadow) bits_up = pgm_read_byte_near(&console_font_5x8[(chr * h) + i -1]);
break; // 5x8 font
case 48: bits = pgm_read_byte_near(&console_font_6x8[(chr * h) + i]);
- if ((i>space) && drawShadow) bits_up = pgm_read_byte_near(&console_font_6x8[(chr * h) + i -1]);
+ if ((i>0) && drawShadow) bits_up = pgm_read_byte_near(&console_font_6x8[(chr * h) + i -1]);
break; // 6x8 font
case 63: bits = pgm_read_byte_near(&console_font_7x9[(chr * h) + i]);
- if ((i>space) && drawShadow) bits_up = pgm_read_byte_near(&console_font_7x9[(chr * h) + i -1]);
+ if ((i>0) && drawShadow) bits_up = pgm_read_byte_near(&console_font_7x9[(chr * h) + i -1]);
break; // 7x9 font
case 60: bits = pgm_read_byte_near(&console_font_5x12[(chr * h) + i]);
- if ((i>space) && drawShadow) bits_up = pgm_read_byte_near(&console_font_5x12[(chr * h) + i -1]);
+ if ((i>0) && drawShadow) bits_up = pgm_read_byte_near(&console_font_5x12[(chr * h) + i -1]);
break; // 5x12 font
default: return;
}
From 7ef94bc6c720316b18956fdb56ede737f01042ad Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 21 Nov 2025 00:08:15 +0100
Subject: [PATCH 121/170] use strlcpy instead of strcpy
---
wled00/FX_fcn.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 71355377..341fc52b 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -819,7 +819,7 @@ class JMapC {
USER_PRINT(dataSize);
USER_PRINT(" scale ");
USER_PRINTLN(scale);
- strcpy(previousSegmentName, SEGMENT.name);
+ strlcpy(previousSegmentName, SEGMENT.name, sizeof(previousSegmentName));
}
} //updatejMapDoc
}; //class JMapC
From 415aadc6e09ca1c7983c8f7667ad70ed0d8d7b0b Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 21 Nov 2025 00:10:33 +0100
Subject: [PATCH 122/170] removing dead code
---
wled00/FX_2Dfcn.cpp | 2 --
1 file changed, 2 deletions(-)
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 8cdd1b6c..3bb6dd51 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -921,11 +921,9 @@ void Segment::drawText(const unsigned char* text, size_t maxLen, int maxLetters,
void Segment::drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, uint32_t color, uint32_t col2, bool drawShadow) {
if (!isActive()) return; // not active
#if !defined(WLED_ENABLE_FULL_FONTS)
- constexpr int space = 0; // font index of " " (space)
if (chr < 32 || chr > 126) return; // legacy mode - only ASCII 32-126 supported
chr -= 32; // align with font table entries
#else
- constexpr int space = 31; // font index of " "
// ToDO: clamp to actual font limits
if (chr < 1 || chr > 254) return; // sanity check // ToDO needs improvements
chr = chr -1; // all fonts start at 1 // ToDO needs improvements
From c36e493b47d09895c172d49c5e27bb995dcf0052 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 21 Nov 2025 00:16:25 +0100
Subject: [PATCH 123/170] Fix strlcpy destination size parameters
---
wled00/FX_fcn.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 341fc52b..d307b5b8 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -1736,14 +1736,14 @@ void WS2812FX::enumerateLedmaps() {
(void) cleanUpName(name);
len = strlen(name);
ledmapNames[i-1] = new(std::nothrow) char[len+1]; // +1 to include terminating \0
- if (ledmapNames[i-1]) strlcpy(ledmapNames[i-1], name, sizeof(name));
+ if (ledmapNames[i-1]) strlcpy(ledmapNames[i-1], name, len+1);
}
if (!ledmapNames[i-1]) {
char tmp[33];
snprintf_P(tmp, 32, PSTR("ledmap%d.json"), i);
size_t tmplen = strlen(tmp);
ledmapNames[i-1] = new(std::nothrow) char[tmplen+1];
- if (ledmapNames[i-1]) strlcpy(ledmapNames[i-1], tmp, tmplen);
+ if (ledmapNames[i-1]) strlcpy(ledmapNames[i-1], tmp, tmplen+1);
}
USER_PRINTF("enumerateLedmaps %s \"%s\"", fileName, name);
From 053551d61deb8be4250dd31e64a3742e974b6e5e Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 21 Nov 2025 00:36:09 +0100
Subject: [PATCH 124/170] scrolling text blur moved to where it should be
accidentally put it into the "full font" ifdef
---
wled00/FX.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 3943b592..5bbdc8cf 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -6911,12 +6911,13 @@ uint16_t mode_2Dscrollingtext(void) {
col2 = SEGCOLOR(2);
}
SEGMENT.drawText((unsigned char*)text, maxLen, numberOfChars, int(cols) - int(SEGENV.aux0), yoffset, letterWidth, letterHeight, col1, col2, drawShadow);
+#endif
+
// WLEDMM add some blur
- if (SEGENV.check3) {
+ if (SEGMENT.check3) {
if (SEGMENT.custom1 < 16) SEGMENT.blurRows(16); // only blur if no trail
SEGMENT.blurCols(20);
}
-#endif
return FRAMETIME;
}
From aea83a352f1c677244ab0e36fefb1f7e3a034456 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 21 Nov 2025 00:55:03 +0100
Subject: [PATCH 125/170] bugfix: incomplete time/date in full font mode
maxLen = numberOfChars
---
wled00/FX.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 5bbdc8cf..564f2bd7 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -6910,6 +6910,7 @@ uint16_t mode_2Dscrollingtext(void) {
col1 = SEGCOLOR(0);
col2 = SEGCOLOR(2);
}
+ maxLen = numberOfChars; // Ensure maxLen reflects the actual rendered text, not the original SEGMENT.name // ToDO remove double parameter
SEGMENT.drawText((unsigned char*)text, maxLen, numberOfChars, int(cols) - int(SEGENV.aux0), yoffset, letterWidth, letterHeight, col1, col2, drawShadow);
#endif
From 527acefdea0bf79e6e73454a19bcad4adc9f6646 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 21 Nov 2025 02:52:01 +0100
Subject: [PATCH 126/170] improvement for UTF-8 safe string trucation of
segment name
did I mention already that this is complicated stuff? oh yes, it is.
---
wled00/json.cpp | 8 ++++++--
wled00/src/font/unicodetool.cpp | 15 ++++++++++-----
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/wled00/json.cpp b/wled00/json.cpp
index ee19ac0b..d288eed2 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -154,8 +154,12 @@ bool deserializeSegment(JsonObject elem, byte it, byte presetId)
if (len > WLED_MAX_SEGNAME_LEN) {
len = WLED_MAX_SEGNAME_LEN; // cut to max segment name length
#if defined(WLED_ENABLE_FULL_FONTS)
- if (name[len] > 127) // UTF-8 => don't cut in the middle of a multi-byte char
- len = cutUnicodeAt((unsigned char*)name, len-1) +1; // +1 to convert between index and length
+ // UTF-8: don't cut in the middle of a multi-byte char
+ // the "or" condition is need because we have to look at both:
+ // * name[len-1] - the character that would be included (at the cut boundary)
+ // * name[len] - the character that would be excluded (after the cut)
+ if ((name[len] > 127) || (name[len-1] > 127))
+ len = cutUnicodeAt((unsigned char*)name, len-1) +1; // find a safe cut // +1 to convert between index and length
#endif
USER_PRINTF("Segment name too long (%d chars), truncated to \"%.*s\"\n", strlen(name), (int)len, name);
}
diff --git a/wled00/src/font/unicodetool.cpp b/wled00/src/font/unicodetool.cpp
index 86416a86..80312bfa 100644
--- a/wled00/src/font/unicodetool.cpp
+++ b/wled00/src/font/unicodetool.cpp
@@ -86,12 +86,17 @@ size_t strlenUC(const unsigned char* utf8) {
// returns the next (lesser) string index that is safe for cutting an UTF-8 string
// Important: calling code is responsible to provide a string with at least _where_ chars
size_t cutUnicodeAt(const unsigned char* utf8, size_t where) {
- if (utf8[where] <= 127) return where; // ASCII
- size_t loopMin = max(0, int(where)-4); // max 4 characters backwards
- size_t whereStart = where;
- while ((isValidContinuation(utf8[where])) && (where > loopMin)) where--; // UTF-8: back until we find a non-continuation char
+ if (where == 0 || utf8[where] <= 127) return where; // ASCII or start -> OK to cut off
- if ((utf8[where] > 127) && isValidContinuation(utf8[whereStart])) where = max(0, int(where)-1); // most likely a UTF-8 lead byte -> go back one step
+ size_t loopMin = max(0, int(where)-5); // max 5 characters backwards (UTF-8 max is 4 bytes)
+ // Back up while we see continuation bytes (10xxxxxx)
+ while ((isValidContinuation(utf8[where])) && (where > loopMin))
+ where--;
+
+ // After the loop, utf8[where] is either ASCII or a UTF-8 lead byte
+ // If it's a lead byte (> 127), we're at the start of a multi-byte sequence.
+ // Go back one more position to exclude the entire sequence.
+ if (utf8[where] > 127) where = max(0, int(where)-1);
return where;
}
From d047ee0984816d1b8017abd95b205db2991baaed Mon Sep 17 00:00:00 2001
From: Will Tatam
Date: Fri, 21 Nov 2025 08:39:50 +0000
Subject: [PATCH 127/170] Add deviceId
---
wled00/fcn_declare.h | 3 +-
wled00/json.cpp | 1 +
wled00/util.cpp | 99 +++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 101 insertions(+), 2 deletions(-)
diff --git a/wled00/fcn_declare.h b/wled00/fcn_declare.h
index 1a9247a2..17a950ac 100644
--- a/wled00/fcn_declare.h
+++ b/wled00/fcn_declare.h
@@ -400,7 +400,8 @@ uint8_t extractModeSlider(uint8_t mode, uint8_t slider, char *dest, uint8_t maxL
int16_t extractModeDefaults(uint8_t mode, const char *segVar);
void checkSettingsPIN(const char *pin);
uint16_t __attribute__((pure)) crc16(const unsigned char* data_p, size_t length); // WLEDMM: added attribute pure
-
+String computeSHA1(const String& input);
+String getDeviceId();
uint16_t beatsin88_t(accum88 beats_per_minute_88, uint16_t lowest = 0, uint16_t highest = 65535, uint32_t timebase = 0, uint16_t phase_offset = 0);
uint16_t beatsin16_t(accum88 beats_per_minute, uint16_t lowest = 0, uint16_t highest = 65535, uint32_t timebase = 0, uint16_t phase_offset = 0);
uint8_t beatsin8_t(accum88 beats_per_minute, uint8_t lowest = 0, uint8_t highest = 255, uint32_t timebase = 0, uint8_t phase_offset = 0);
diff --git a/wled00/json.cpp b/wled00/json.cpp
index c51deefa..45c15837 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -913,6 +913,7 @@ void serializeInfo(JsonObject root)
//root[F("cn")] = F(WLED_CODENAME); //WLEDMM removed
root[F("release")] = FPSTR(releaseString);
root[F("rel")] = FPSTR(releaseString); //WLEDMM to add bin name
+ root[F("deviceId")] = getDeviceId();
JsonObject leds = root.createNestedObject("leds");
leds[F("count")] = strip.getLengthTotal();
diff --git a/wled00/util.cpp b/wled00/util.cpp
index c31b20b6..9bd7c6a2 100644
--- a/wled00/util.cpp
+++ b/wled00/util.cpp
@@ -1,7 +1,13 @@
#include "wled.h"
#include "fcn_declare.h"
#include "const.h"
-
+#ifdef ESP8266
+#include "user_interface.h" // for bootloop detection
+#include // for SHA1 on ESP8266
+#else
+#include "mbedtls/sha1.h" // for SHA1 on ESP32
+#include "esp_efuse.h"
+#endif
//helper to get int value at a position in string
int getNumVal(const String* req, uint16_t pos)
@@ -668,3 +674,94 @@ int32_t hw_random(int32_t lowerlimit, int32_t upperlimit) {
uint32_t diff = upperlimit - lowerlimit;
return hw_random(diff) + lowerlimit;
}
+
+// Platform-agnostic SHA1 computation from String input
+String computeSHA1(const String& input) {
+ #ifdef ESP8266
+ return sha1(input); // ESP8266 has built-in sha1() function
+ #else
+ // ESP32: Compute SHA1 hash using mbedtls
+ unsigned char shaResult[20]; // SHA1 produces 20 bytes
+ mbedtls_sha1_context ctx;
+
+ mbedtls_sha1_init(&ctx);
+ mbedtls_sha1_starts_ret(&ctx);
+ mbedtls_sha1_update_ret(&ctx, (const unsigned char*)input.c_str(), input.length());
+ mbedtls_sha1_finish_ret(&ctx, shaResult);
+ mbedtls_sha1_free(&ctx);
+
+ // Convert to hexadecimal string
+ char hexString[41];
+ for (int i = 0; i < 20; i++) {
+ sprintf(&hexString[i*2], "%02x", shaResult[i]);
+ }
+ hexString[40] = '\0';
+
+ return String(hexString);
+ #endif
+}
+
+#ifdef ESP32
+static String dump_raw_block(esp_efuse_block_t block)
+{
+ const int WORDS = 8; // ESP32: 8×32-bit words per block i.e. 256bits
+ uint32_t buf[WORDS] = {0};
+
+ const esp_efuse_desc_t d = {
+ .efuse_block = block,
+ .bit_start = 0,
+ .bit_count = WORDS * 32
+ };
+ const esp_efuse_desc_t* field[2] = { &d, NULL };
+
+ esp_err_t err = esp_efuse_read_field_blob(field, buf, WORDS * 32);
+ if (err != ESP_OK) {
+ return "";
+ }
+
+ String result = "";
+ for (const unsigned int i : buf) {
+ char line[32];
+ sprintf(line, "0x%08X", i);
+ result += line;
+ }
+ return result;
+}
+#endif
+
+
+// Generate a device ID based on SHA1 hash of MAC address salted with "WLED"
+// Returns: original SHA1 + last 2 chars of double-hashed SHA1 (42 chars total)
+String getDeviceId() {
+ static String cachedDeviceId = "";
+ if (cachedDeviceId.length() > 0) return cachedDeviceId;
+
+ uint8_t mac[6];
+ WiFi.macAddress(mac);
+ char macStr[18];
+ sprintf(macStr, "%02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+
+ // The device string is deterministic as it needs to be consistent for the same device, even after a full flash erase
+ // MAC is salted with other consistent device info to avoid rainbow table attacks.
+ // If the MAC address is known by malicious actors, they could precompute SHA1 hashes to impersonate devices,
+ // but as WLED developers are just looking at statistics and not authenticating devices, this is acceptable.
+ // If the usage data was exfiltrated, you could not easily determine the MAC from the device ID without brute forcing SHA1
+#ifdef ESP8266
+ String deviceString = String(macStr) + "WLED" + ESP.getFlashChipId();
+#else
+ String deviceString = String(macStr) + "WLED" + ESP.getChipModel() + ESP.getChipRevision();
+ deviceString += dump_raw_block(EFUSE_BLK0);
+ deviceString += dump_raw_block(EFUSE_BLK1);
+ deviceString += dump_raw_block(EFUSE_BLK2);
+ deviceString += dump_raw_block(EFUSE_BLK3);
+#endif
+ String firstHash = computeSHA1(deviceString);
+
+ // Second hash: SHA1 of the first hash
+ String secondHash = computeSHA1(firstHash);
+
+ // Concatenate first hash + last 2 chars of second hash
+ cachedDeviceId = firstHash + secondHash.substring(38);
+
+ return cachedDeviceId;
+}
\ No newline at end of file
From 213cd185b51c97f9550436d11eabd5abe5e55881 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 21 Nov 2025 13:48:38 +0100
Subject: [PATCH 128/170] explanations for CP437 translations, some cleanups,
bugfix for drawString
* explanation for CP437 glyph groups
* translation for MonnModules symbol
* "smiley" replacement for 4-bytes and overlong unicode codes
* always compile unicodetool.cpp (codepage translation still depends on WLED_ENABLE_UNICODE)
* bugfix: DrawString now skips over glyphs that would be rejected by DrawCharacter
* minor cleanup
---
wled00/FX_2Dfcn.cpp | 10 +++---
wled00/src/font/codepage437.cpp | 56 +++++++++++++++++++++++----------
wled00/src/font/codepages.h | 8 +++--
wled00/src/font/unicodetool.cpp | 19 ++++++-----
4 files changed, 63 insertions(+), 30 deletions(-)
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 3bb6dd51..b1f48980 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -897,19 +897,21 @@ void Segment::drawText(const unsigned char* text, size_t maxLen, int maxLetters,
if (utf16_index < WLED_MAX_SEGNAME_LEN) {
decoded_text[utf16_index] = unicodeToWchar16(now, maxLen); // UTF-8 decode into decoded_text
decoded_text[utf16_index] = wchar16ToCodepage437(decoded_text[utf16_index]); // decoded_text to CP437 (in-place conversion)
- // toDo: ensure that decoded_text[i] is between console_font_YxZ_first and console_font_YxZ_last
- // if (chr < 32 || chr > 126) --> clamp chr
- // chr -= 32; // align with font table entries
- utf16_index++;
+ if ((decoded_text[utf16_index] >= 1) && ((decoded_text[utf16_index] <= 254))) utf16_index++; // don't advance on NUL or codes not suppoted in DrawCharacter
}
}
decoded_text[utf16_index] = 0; // NUL terminate string
size_t textLength = min(utf16_index, size_t(maxLetters));
+
#else
const unsigned char* decoded_text = text; // fallback
size_t textLength = min(strnlen((char*)text, maxLen), size_t(maxLetters));
#endif
+ // toDo: ensure that decoded_text[i] is between console_font_YxZ_first and console_font_YxZ_last
+ // if (chr < 32 || chr > 126) --> clamp chr
+ // chr -= 32; // align with font table entries
+
// pass characters to drawCharacter()
for (int i = 0; i < textLength; i++) {
SEGMENT.drawCharacter((unsigned char) decoded_text[i], x + w*i, y, w, h, color, col2, drawShadow);
diff --git a/wled00/src/font/codepage437.cpp b/wled00/src/font/codepage437.cpp
index 99ef6b0e..767c992a 100644
--- a/wled00/src/font/codepage437.cpp
+++ b/wled00/src/font/codepage437.cpp
@@ -1,5 +1,12 @@
#if defined(WLED_ENABLE_FULL_FONTS)
+/*
+ @title WLED(-MM) - unicode to CP437 conversion
+ @repo https://github.com/MoonModules/WLED-MM, https://github.com/wled/WLED
+ @Copyright © 2025 Github WLED and WLED-MM Commit Authors (see "git blame" for details)
+ @license Licensed under the EUPL-1.2 or later
+*/
+
#include "codepages.h"
#include
@@ -9,11 +16,18 @@ constexpr uint8_t CP437_UNKNOWN = 250; // small middle dot · // not sure if we
// based on a table from https://en.wikipedia.org/wiki/Code_page_437#Character_set
uint16_t wchar16ToCodepage437(uint16_t wideChar) {
- // codes up to 126 are same as ASCII
- if (wideChar < 127) return wideChar;
+ // unicode codes 0 up to 127 are same as ASCII -> pass through
+ if ((wideChar < 0x7F) && (wideChar != 0x08)) return wideChar; // excludes 127 = DEL and 8 = BS, so we can map them
switch (wideChar) {
- // characters 1 - 31
+ // original IBM PC would interpret codes 0x07, 0x08, 0x0A, and 0x0D as BEL, BS, LF, and CR, respectively.
+ // we don't implement any special handling at the moment
+ case 0x0008: return 0x08; break; // Backspace: pass through (could be handled differently in future)
+
+ // unicode codes mapped to characters 1 - 31
+ // unicode 0 = C string terminator -> already passed through, never map it !!
+ // 1 to 31 (0x01 to 0x1F) are "assorted dingbats" (complementary and decorative characters).
+ // The isolated character 127 (7Fhex) also belongs to this group.
case 0x263A: return 0x01; break; // ☺︎
case 0x263B: return 0x02; break; // ☻
case 0x2665: return 0x03; break; // ♥︎
@@ -46,8 +60,13 @@ uint16_t wchar16ToCodepage437(uint16_t wideChar) {
case 0x25B2: return 0x1E; break; // ▲
case 0x25BC: return 0x1F; break; // ▼
- // characters 127 - 254
- case 0x2302: return 0x7F; break; // ⌂ (aka DEL)
+ // unicode codes 32 to 126 (0x20 to 0x7E) are the standard ASCII printable characters -> already passed through
+
+ // unicode codes mapped to characters 127 - 254
+ // code 127 DEL -> small arrow back. We don't implement legacy "rubout" or "backspace" for composing letters or for bold printing
+ case 0x007F: return 0x1B; break; // ←
+ case 0x2302: return 0x7F; break; // ⌂
+ // 128 to 175 (0x80 to 0xAF) are a selection of international text characters
case 0x00C7: return 0x80; break; // Ç
case 0x00FC: return 0x81; break; // ü
case 0x00E9: return 0x82; break; // é
@@ -96,6 +115,7 @@ uint16_t wchar16ToCodepage437(uint16_t wideChar) {
case 0x00A1: return 0xAD; break; // ¡
case 0x00AB: return 0xAE; break; // «
case 0x00BB: return 0xAF; break; // »
+ // 176 to 223 (0xB0 to 0xDF) are box drawing and block characters
case 0x2591: return 0xB0; break; // ░
case 0x2592: return 0xB1; break; // ▒
case 0x2593: return 0xB2; break; // ▓
@@ -144,6 +164,7 @@ uint16_t wchar16ToCodepage437(uint16_t wideChar) {
case 0x258C: return 0xDD; break; // ▌
case 0x2590: return 0xDE; break; // ▐
case 0x2580: return 0xDF; break; // ▀
+ // 224 to 235 (0xE0 to 0xEB) are math symbols part 1 - Greek letters commonly used in physics
case 0x03B1: return 0xE0; break; // α
case 0x00DF: return 0xE1; break; // ß
case 0x0393: return 0xE2; break; // Γ
@@ -156,6 +177,7 @@ uint16_t wchar16ToCodepage437(uint16_t wideChar) {
case 0x0398: return 0xE9; break; // Θ
case 0x03A9: return 0xEA; break; // Ω
case 0x03B4: return 0xEB; break; // δ
+ // 236 to 254 (0xEC to 0xFE) are other common physics and math symbols
case 0x221E: return 0xEC; break; // ∞
case 0x03C6: return 0xED; break; // φ
case 0x03B5: return 0xEE; break; // ε
@@ -174,14 +196,16 @@ uint16_t wchar16ToCodepage437(uint16_t wideChar) {
case 0x221A: return 0xFB; break; // √
case 0x207F: return 0xFC; break; // ⁿ
case 0x00B2: return 0xFD; break; // ²
- case 0x25A0: return 0xFE; break; // ■
+ case 0x25A0: return 0xFE; break; // ■ geometric shapes
+ // 255 (0xFF) is "non breakable space" (NBSP)
+ case 0x00A0: return 32; break; // NBSP -> normal "space"
- // special mappings for very similar characters
- case 0x00A6: return 0x7C; break; // broken bar -> bar
- case 0x266C: return 14; break; // musical notes
- case 0x0394: return 127; break; // greek capital delta Δ
+ // special mappings for very similar unicode characters
+ case 0x00A6: return 0x7C; break; // ¦ broken bar -> | bar
+ case 0x266C: return 14; break; // musical note ♬ -> ♫
+ case 0x0394: return 127; break; // greek capital delta Δ -> ⌂
case 0x23AE: return 179; break; // integral extension ⎮
- case 0x03B2: return 225; break; // greek small beta β => sz umlaut ß
+ case 0x03B2: return 225; break; // greek small beta β -> sz umlaut ß
case 0x03A0: return 227; break; // greek capital PI Π
case 0x220F: return 227; break; // math product ∏
case 0x2211: return 228; break; // math sum ∑
@@ -194,13 +218,13 @@ uint16_t wchar16ToCodepage437(uint16_t wideChar) {
case 0x2300: return 237; break; // diameter ⌀
case 0x00D8: return 237; break; // 0 strikethrough Ø
case 0x00F8: return 237; break; // 0 strikethrough small ø
- case 0x02DA: return 0xF8; break; // small circle (up) ˚
- case 0x2208: return 238; break; // element-of ∈
case 0x017F: return 244; break; // long S ſ
+ case 0x02DA: return 0xF8; break; // small circle (up) ˚
- case 0x00A0: return 32; break; // NBSP => blank
- case 0x20AC: return 238; break; // Euro €
- case 0x2713: return 251; break; // check mark ✓
+ case 0x2208: return 238; break; // element-of ∈ -> ε
+ case 0x20AC: return 238; break; // Euro € -> ε
+ case 0x2713: return 251; break; // check mark ✓ -> √
+ case 0x263E: return 0x01; break; // ☾ last quarter moon (Moonmodules) -> ☺︎ face
// everything else: unknown
//default: return 32; // blank
diff --git a/wled00/src/font/codepages.h b/wled00/src/font/codepages.h
index bc0c7538..dbb9e4eb 100644
--- a/wled00/src/font/codepages.h
+++ b/wled00/src/font/codepages.h
@@ -8,9 +8,11 @@
#undef WLED_ENABLE_FULL_FONTS
#endif
-//constexpr uint16_t UNKNOWN_CODE = 0x2219; // ∙ multiplication dot
-constexpr uint16_t UNKNOWN_CODE = 0x00B7; // · middle dot
-constexpr uint16_t BAD_CODE = 0x2022; // • bigger dot
+// visual replacements when decoding fails
+//constexpr uint16_t UNKNOWN_CODE = 0x2219; // ∙ multiplication dot (try this if you don't like the middle dot)
+constexpr uint16_t UNKNOWN_CODE = 0x00B7; // · middle dot = unknown code (generic error)
+constexpr uint16_t BAD_CODE = 0x2022; // • bigger dot = cannot decode (unicode malformed)
+constexpr uint16_t EXT_CODE = 0x263B; // ☻ smiling face = extended code (unicode not supported)
// UTF‑8 → reduced UTF‑16 decoding
// translates the next unicode UTF-8 item into a 2-byte "code point"
diff --git a/wled00/src/font/unicodetool.cpp b/wled00/src/font/unicodetool.cpp
index 80312bfa..ff96ab99 100644
--- a/wled00/src/font/unicodetool.cpp
+++ b/wled00/src/font/unicodetool.cpp
@@ -1,4 +1,9 @@
-#if defined(WLED_ENABLE_FULL_FONTS)
+/*
+ @title WLED(-MM) - unicode helper functions
+ @repo https://github.com/MoonModules/WLED-MM, https://github.com/wled/WLED
+ @Copyright © 2025 Github WLED and WLED-MM Commit Authors (see "git blame" for details)
+ @license Licensed under the EUPL-1.2 or later
+*/
#include "codepages.h"
#include
@@ -35,13 +40,15 @@ uint16_t unicodeToWchar16(const unsigned char* utf8, size_t maxLen) {
if (length < 3 || !isValidContinuation(utf8[1]) || !isValidContinuation(utf8[2])) return BAD_CODE; // malformed
codepoint = ((ch0 & 0b00001111) << 12) | ((utf8[1] & 0b00111111) << 6) | (utf8[2] & 0b00111111);
if (codepoint < 0x800) return UNKNOWN_CODE; // Reject overlong encodings (must be >= 0x800)
- if (codepoint >= 0xD800 && codepoint <= 0xDFFF) return UNKNOWN_CODE; // Reject UTF-16 surrogate pairs (U+D800..U+DFFF)
- if (codepoint >= 0x010000) codepoint = UNKNOWN_CODE; // result exceeds uint16_t => "unknown"
+ if (codepoint >= 0xD800 && codepoint <= 0xDFFF) return EXT_CODE; // Reject UTF-16 surrogate pairs (U+D800..U+DFFF)
+ if (codepoint >= 0x010000) codepoint = EXT_CODE; // result exceeds uint16_t (should not happen with well-formed UTF-8)
return uint16_t(codepoint);
}
}
- // 4-byte sequence or invalid lead byte - since we only support up to 0xFFFF, return error marker
- return BAD_CODE; // unsupported/invalid
+
+ // since we only support up to 0xFFFF, return error marker
+ if ((ch0 & 0b11111000) == 0b11110000) return EXT_CODE; // unsupported 4-byte sequence
+ else return BAD_CODE; // other unsupported/invalid
}
// returns a pointer to the next unicode item - can be used to "advance" conversion after unicodeToWchar16()
@@ -99,5 +106,3 @@ size_t cutUnicodeAt(const unsigned char* utf8, size_t where) {
if (utf8[where] > 127) where = max(0, int(where)-1);
return where;
}
-
-#endif
From e6676372d80eb6068bad42aaa1652dfe80913c9b Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 21 Nov 2025 17:04:08 +0100
Subject: [PATCH 129/170] refactor / cleanup font selection logic
* centralize font selection logic into getFontInfo()
* removed unneeded parameter "numberOfChars" from drawText()
* new file: wled_fonts.hpp to centralize font management logic (inline)
* only compile wchar16ToCodepage437 when WLED_ENABLE_FULL_FONTS
* minor cleanup
---
wled00/FX.cpp | 18 +++----
wled00/FX.h | 2 +-
wled00/FX_2Dfcn.cpp | 58 ++++++++++------------
wled00/src/font/codepage437.cpp | 4 +-
wled00/src/font/codepages.h | 20 ++++++--
wled00/wled_fonts.hpp | 87 +++++++++++++++++++++++++++++++++
6 files changed, 142 insertions(+), 47 deletions(-)
create mode 100644 wled00/wled_fonts.hpp
diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 564f2bd7..5a543b6c 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -6817,7 +6817,7 @@ uint16_t mode_2Dscrollingtext(void) {
char text[WLED_MAX_SEGNAME_LEN+1] = {'\0'};
unsigned maxLen = (SEGMENT.name) ? min(WLED_MAX_SEGNAME_LEN, (int)strlen(SEGMENT.name)) : 0; // WLEDMM make it robust against too long segment names
-#if !defined(WLED_ENABLE_FULL_FONTS)
+#if !defined(WLED_ENABLE_FULL_FONTS) || defined(ESP8266)
if (SEGMENT.name) for (size_t i=0,j=0; i31 && SEGMENT.name[i]<128) text[j++] = SEGMENT.name[i]; // unicode killer
#else
if (SEGMENT.name) for (size_t i=0,j=0; i drawText() will fall back to just forwarding each char to drawCharacter()
void wu_pixel(uint32_t x, uint32_t y, CRGB c);
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index b1f48980..5a6146ac 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -877,41 +877,35 @@ bool Segment::jsonToPixels(char * name, uint8_t fileNr) {
return true;
}
-#include "src/font/console_font_4x6.h"
-#include "src/font/console_font_5x8.h"
-#include "src/font/console_font_5x12.h"
-#include "src/font/console_font_6x8.h"
-#include "src/font/console_font_7x9.h"
+#include "wled_fonts.hpp"
#if defined(WLED_ENABLE_FULL_FONTS)
#include "src/font/codepages.h"
#endif
// unicode-aware wrapper for drawCharacter(), to be called from mode_2Dscrollingtext()
-void Segment::drawText(const unsigned char* text, size_t maxLen, int maxLetters, int16_t x, int16_t y, uint8_t w, uint8_t h, uint32_t color, uint32_t col2, bool drawShadow) {
+void Segment::drawText(const unsigned char* text, size_t maxLen, int16_t x, int16_t y, uint8_t w, uint8_t h, uint32_t color, uint32_t col2, bool drawShadow) {
if (!isActive()) return; // not active
- // ToDO: find font _first/_last, based on width / height
+ //size_t maxLetters = WLED_MAX_SEGNAME_LEN;
+ const size_t numberOfChars = strlen((const char *) text); // size in bytes // toDo check if this is duplicate -> maxLen
+
#if defined(WLED_ENABLE_FULL_FONTS)
+ FontInfo_t font = getFontInfo(w, h); // use central font selection legic
uint16_t decoded_text[WLED_MAX_SEGNAME_LEN+1] = { 0 }; // UTF-16 converted text. Cannot be longer than WLED_MAX_SEGNAME_LEN
size_t utf16_index = 0;
for(const unsigned char* now = text; now != nullptr && now[0] != '\0'; now = nextUnicode(now, maxLen)) {
if (utf16_index < WLED_MAX_SEGNAME_LEN) {
decoded_text[utf16_index] = unicodeToWchar16(now, maxLen); // UTF-8 decode into decoded_text
decoded_text[utf16_index] = wchar16ToCodepage437(decoded_text[utf16_index]); // decoded_text to CP437 (in-place conversion)
- if ((decoded_text[utf16_index] >= 1) && ((decoded_text[utf16_index] <= 254))) utf16_index++; // don't advance on NUL or codes not suppoted in DrawCharacter
+ if ((decoded_text[utf16_index] >= font.firstChar) && ((decoded_text[utf16_index] <= font.lastChar))) // don't advance on NUL, or on codes not suppoted in DrawCharacter
+ utf16_index++;
}
}
decoded_text[utf16_index] = 0; // NUL terminate string
- size_t textLength = min(utf16_index, size_t(maxLetters));
-
+ size_t textLength = min(utf16_index, numberOfChars);
#else
const unsigned char* decoded_text = text; // fallback
- size_t textLength = min(strnlen((char*)text, maxLen), size_t(maxLetters));
+ size_t textLength = min(strnlen((char*)text, maxLen), numberOfChars);
#endif
-
- // toDo: ensure that decoded_text[i] is between console_font_YxZ_first and console_font_YxZ_last
- // if (chr < 32 || chr > 126) --> clamp chr
- // chr -= 32; // align with font table entries
-
// pass characters to drawCharacter()
for (int i = 0; i < textLength; i++) {
SEGMENT.drawCharacter((unsigned char) decoded_text[i], x + w*i, y, w, h, color, col2, drawShadow);
@@ -922,18 +916,12 @@ void Segment::drawText(const unsigned char* text, size_t maxLen, int maxLetters,
// only supports: 4x6=24, 5x8=40, 5x12=60, 6x8=48 and 7x9=63 fonts ATM
void Segment::drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w, uint8_t h, uint32_t color, uint32_t col2, bool drawShadow) {
if (!isActive()) return; // not active
-#if !defined(WLED_ENABLE_FULL_FONTS)
- if (chr < 32 || chr > 126) return; // legacy mode - only ASCII 32-126 supported
- chr -= 32; // align with font table entries
-#else
- // ToDO: clamp to actual font limits
- if (chr < 1 || chr > 254) return; // sanity check // ToDO needs improvements
- chr = chr -1; // all fonts start at 1 // ToDO needs improvements
-#endif
-
const uint16_t cols = virtualWidth();
const uint16_t rows = virtualHeight();
- const int font = w*h;
+ FontInfo_t font = getFontInfo(w, h); // use central font selection logic
+ if (!font.isProgMem || font.width_bytes > 1) return; // do nothing for not (yet) supported font features: width_bytes > 1, !isProgMem
+ if (chr < font.firstChar || chr > font.lastChar) return; // do nothing when out of limits
+ chr = chr - font.firstChar; // adjust chr to point to the first allowed character byte
CRGB col = CRGB(color);
CRGBPalette16 grad = CRGBPalette16(col, (col2 != BLACK) ? CRGB(col2) : col);
@@ -941,16 +929,21 @@ void Segment::drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w,
//if (w<5 || w>6 || h!=8) return;
if (drawShadow) w++; // one more column for shadow on right side
- for (int i = 0; i= rows) break; // drawing off-screen
uint8_t bits = 0;
uint8_t bits_up = 0; // WLEDMM this is the previous line: font[(chr * h) + i -1]
- // ToDO: move font selection logic into separate function
-
- switch (font) { // font = w * h
+#if 1
+ // new code - experimental
+ bits = pgm_read_byte_near(&font.raw[(chr * h) + i]);
+ if ((i>0) && drawShadow) bits_up = pgm_read_byte_near(&font.raw[(chr * h) + i -1]);
+#else
+ // legacy code, will be deleted after some tests
+ int pixels = w*h;
+ switch (pixels) { // font = w * h
case 24: bits = pgm_read_byte_near(&console_font_4x6[(chr * h) + i]);
if ((i>0) && drawShadow) bits_up = pgm_read_byte_near(&console_font_4x6[(chr * h) + i -1]);
break; // 4x6 font
@@ -968,17 +961,18 @@ void Segment::drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w,
break; // 5x12 font
default: return;
}
+#endif
if (col2 != BLACK) col = ColorFromPalette(grad, (i+1)*255/h, 255, NOBLEND);
uint32_t fgCol = uint32_t(col) & 0x00FFFFFF; // WLEDMM cache color value
- for (int j = 0; j 0 && x0 < cols"
if ((bits>>(j+(8-w))) & 0x01) { // bit set & drawing on-screen
setPixelColorXY(x0, y0, fgCol);
} else {
if (drawShadow) {
- // WLEDMM
+ // WLEDMM
if ((j < (w-1)) && (bits>>(j+(8-w) +1)) & 0x01) setPixelColorXY(x0, y0, bgCol); // blank when pixel to the right is set
else if ((j > 0) && (bits>>(j+(8-w) -1)) & 0x01) setPixelColorXY(x0, y0, bgCol);// blank when pixel to the left is set
else if ((bits_up>>(j+(8-w))) & 0x01) setPixelColorXY(x0, y0, bgCol); // blank when pixel above is set
diff --git a/wled00/src/font/codepage437.cpp b/wled00/src/font/codepage437.cpp
index 767c992a..ebdb8891 100644
--- a/wled00/src/font/codepage437.cpp
+++ b/wled00/src/font/codepage437.cpp
@@ -1,5 +1,3 @@
-#if defined(WLED_ENABLE_FULL_FONTS)
-
/*
@title WLED(-MM) - unicode to CP437 conversion
@repo https://github.com/MoonModules/WLED-MM, https://github.com/wled/WLED
@@ -7,6 +5,8 @@
@license Licensed under the EUPL-1.2 or later
*/
+#if defined(WLED_ENABLE_FULL_FONTS)
+
#include "codepages.h"
#include
diff --git a/wled00/src/font/codepages.h b/wled00/src/font/codepages.h
index dbb9e4eb..04317050 100644
--- a/wled00/src/font/codepages.h
+++ b/wled00/src/font/codepages.h
@@ -8,7 +8,7 @@
#undef WLED_ENABLE_FULL_FONTS
#endif
-// visual replacements when decoding fails
+// UTF-16 visual replacements when decoding fails
//constexpr uint16_t UNKNOWN_CODE = 0x2219; // ∙ multiplication dot (try this if you don't like the middle dot)
constexpr uint16_t UNKNOWN_CODE = 0x00B7; // · middle dot = unknown code (generic error)
constexpr uint16_t BAD_CODE = 0x2022; // • bigger dot = cannot decode (unicode malformed)
@@ -19,6 +19,11 @@ constexpr uint16_t EXT_CODE = 0x263B; // ☻ smiling face = extended cod
// return "•" in case of input errors, and for unsupported/invalid UTF-8
uint16_t unicodeToWchar16(const unsigned char* utf8, size_t maxLen); // unicodetool.cpp
+#if defined(WLED_ENABLE_FULL_FONTS)
+// translates unicode 2-byte (UTF-16) "code point" into corresponding character in codepage 437 (IBM PC aka PC-8)
+uint16_t wchar16ToCodepage437(uint16_t wideChar); // codepage437.cpp
+#endif
+
// returns a pointer to the next unicode item - can be used to "advance" conversion after unicodeToWchar16()
// return nullptr at end of input
const unsigned char* nextUnicode(const unsigned char* utf8, size_t maxLen); // unicodetool.cpp
@@ -30,7 +35,16 @@ size_t strlenUC(const unsigned char* utf8);
// Important: calling code is responsible to provide a string with at least _where_ chars
size_t cutUnicodeAt(const unsigned char* utf8, size_t where);
-// translates unicode 2-byte (UTF-16) "code point" into corresponding character in codepage 437 (IBM PC aka PC-8)
-uint16_t wchar16ToCodepage437(uint16_t wideChar); // codepage437.cpp
+
+// special utility function for @troyhacks ;-)
+// removes all unicode letter from a C style char[] - conversion is in-place, to avoid heap fragging
+// doesn't work on PROGMEM strings, unless you strdup() them into RAM before calling this function
+inline void killUnicode(unsigned char* utf8) {
+ if (utf8 == nullptr) return;
+ size_t clean_index = 0;
+ for (size_t i=0; utf8[i] != '\0'; i++)
+ if ((utf8[i] > 0) && (utf8[i] < 128)) utf8[clean_index++] = utf8[i]; // only keep pure ASCII; unicode extended chars start at 128
+ utf8[clean_index] = '\0'; // ensure proper string termination
+}
#endif
diff --git a/wled00/wled_fonts.hpp b/wled00/wled_fonts.hpp
new file mode 100644
index 00000000..909e1e65
--- /dev/null
+++ b/wled00/wled_fonts.hpp
@@ -0,0 +1,87 @@
+#pragma once
+#ifndef WLED_FONTS_H
+#define WLED_FONTS_H
+#include // needed to get uint16_t definition
+#include // helps for code analysis with clang
+
+// always disable unicode for 8266 builds - not enough program space
+#if !defined(ARDUINO_ARCH_ESP32) && defined(WLED_ENABLE_FULL_FONTS)
+#undef WLED_ENABLE_FULL_FONTS
+#endif
+
+
+// pull in all fonts
+#include "src/font/console_font_4x6.h"
+#include "src/font/console_font_5x8.h"
+#include "src/font/console_font_5x12.h"
+#include "src/font/console_font_6x8.h"
+#include "src/font/console_font_7x9.h"
+
+
+// fontInfo struct returned by getFontInfo
+typedef struct {
+ unsigned firstChar; // first supported glyph (32 for standard "reduced" fonts)
+ unsigned lastChar; // last supported glyph (126 for standard "reduced" fonts)
+ unsigned width_bytes; // single letter width in bytes (default:1)
+ // unsigned height_bytes; // future support
+ bool isProgMem; // raw data points into ProgMem => 8266 needs pgm_read_byte_near()
+ const unsigned char* raw; // array of bytes with raw pixeldata (typicially lives in PROGMEM)
+ // note: we only support monospaced fonts
+} FontInfo_t;
+
+// logic for font selection based on width and height
+inline FontInfo_t getFontInfo(unsigned width, unsigned height) {
+ static FontInfo_t font = {0}; // not sure if this needs to be static - just wanted to be sure that the function return value is not in the stack area (use-after-free).
+
+ unsigned pixels = width * height;
+ switch (pixels) {
+ // WLED standard fonts (PROGMEM)
+ case 24: // 4x6 font
+ font.raw = console_font_4x6;
+ font.isProgMem = true;
+ font.firstChar = console_font_4x6_first;
+ font.lastChar = console_font_4x6_last;
+ font.width_bytes= 1;
+ break;
+ case 40: // 5x8 font
+ font.raw = console_font_5x8;
+ font.isProgMem = true;
+ font.firstChar = console_font_5x8_first;
+ font.lastChar = console_font_5x8_last;
+ font.width_bytes= 1;
+ break;
+ case 48: // 6x8 font
+ font.raw = console_font_6x8;
+ font.isProgMem = true;
+ font.firstChar = console_font_6x8_first;
+ font.lastChar = console_font_6x8_last;
+ font.width_bytes= 1;
+ break;
+ case 63: // 7x9 font
+ font.raw = console_font_7x9;
+ font.isProgMem = true;
+ font.firstChar = console_font_7x9_first;
+ font.lastChar = console_font_7x9_last;
+ font.width_bytes= 1;
+ break;
+ case 60: // 5x12 font
+ font.raw = console_font_5x12;
+ font.isProgMem = true;
+ font.firstChar = console_font_5x12_first;
+ font.lastChar = console_font_5x12_last;
+ font.width_bytes= 1;
+ break;
+
+ // you can add any custom fonts here
+
+ default: // no font
+ font.raw = nullptr;
+ font.isProgMem = false;
+ font.firstChar = 1;
+ font.lastChar = 1;
+ font.width_bytes= 1;
+ }
+ return font;
+}
+
+#endif
From e38c2b32c83de11b0640b363da90d59d1024c8a9 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 21 Nov 2025 17:26:04 +0100
Subject: [PATCH 130/170] finishing touches
* replace strlen with strnlen
* avoid static variable in getFontInfo
* remove legacy code in drawCharacter (new code works well)
it works for me, let's ship it ;-)
---
wled00/FX_2Dfcn.cpp | 30 +++++-------------------------
wled00/wled_fonts.hpp | 2 +-
2 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index 5a6146ac..f58ba016 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -886,7 +886,7 @@ bool Segment::jsonToPixels(char * name, uint8_t fileNr) {
void Segment::drawText(const unsigned char* text, size_t maxLen, int16_t x, int16_t y, uint8_t w, uint8_t h, uint32_t color, uint32_t col2, bool drawShadow) {
if (!isActive()) return; // not active
//size_t maxLetters = WLED_MAX_SEGNAME_LEN;
- const size_t numberOfChars = strlen((const char *) text); // size in bytes // toDo check if this is duplicate -> maxLen
+ const size_t numberOfChars = strnlen((const char *) text, maxLen); // size in bytes // toDo check if this is needed - duplicate of maxLen?
#if defined(WLED_ENABLE_FULL_FONTS)
FontInfo_t font = getFontInfo(w, h); // use central font selection legic
@@ -936,32 +936,12 @@ void Segment::drawCharacter(unsigned char chr, int16_t x, int16_t y, uint8_t w,
uint8_t bits = 0;
uint8_t bits_up = 0; // WLEDMM this is the previous line: font[(chr * h) + i -1]
-#if 1
- // new code - experimental
+ // for wide fonts, we can add a loop here :for(offset=0, offset < font.width_bytes; offset++) {}
+
+ // get 8 pixels (byte) from raw font data
bits = pgm_read_byte_near(&font.raw[(chr * h) + i]);
if ((i>0) && drawShadow) bits_up = pgm_read_byte_near(&font.raw[(chr * h) + i -1]);
-#else
- // legacy code, will be deleted after some tests
- int pixels = w*h;
- switch (pixels) { // font = w * h
- case 24: bits = pgm_read_byte_near(&console_font_4x6[(chr * h) + i]);
- if ((i>0) && drawShadow) bits_up = pgm_read_byte_near(&console_font_4x6[(chr * h) + i -1]);
- break; // 4x6 font
- case 40: bits = pgm_read_byte_near(&console_font_5x8[(chr * h) + i]);
- if ((i>0) && drawShadow) bits_up = pgm_read_byte_near(&console_font_5x8[(chr * h) + i -1]);
- break; // 5x8 font
- case 48: bits = pgm_read_byte_near(&console_font_6x8[(chr * h) + i]);
- if ((i>0) && drawShadow) bits_up = pgm_read_byte_near(&console_font_6x8[(chr * h) + i -1]);
- break; // 6x8 font
- case 63: bits = pgm_read_byte_near(&console_font_7x9[(chr * h) + i]);
- if ((i>0) && drawShadow) bits_up = pgm_read_byte_near(&console_font_7x9[(chr * h) + i -1]);
- break; // 7x9 font
- case 60: bits = pgm_read_byte_near(&console_font_5x12[(chr * h) + i]);
- if ((i>0) && drawShadow) bits_up = pgm_read_byte_near(&console_font_5x12[(chr * h) + i -1]);
- break; // 5x12 font
- default: return;
- }
-#endif
+
if (col2 != BLACK) col = ColorFromPalette(grad, (i+1)*255/h, 255, NOBLEND);
uint32_t fgCol = uint32_t(col) & 0x00FFFFFF; // WLEDMM cache color value
diff --git a/wled00/wled_fonts.hpp b/wled00/wled_fonts.hpp
index 909e1e65..f1ffa8d3 100644
--- a/wled00/wled_fonts.hpp
+++ b/wled00/wled_fonts.hpp
@@ -31,7 +31,7 @@ typedef struct {
// logic for font selection based on width and height
inline FontInfo_t getFontInfo(unsigned width, unsigned height) {
- static FontInfo_t font = {0}; // not sure if this needs to be static - just wanted to be sure that the function return value is not in the stack area (use-after-free).
+ FontInfo_t font = {0}; // will be returned by value
unsigned pixels = width * height;
switch (pixels) {
From ec97f4903f580961c2347eb45394dc6342a51128 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 22 Nov 2025 16:30:16 +0100
Subject: [PATCH 131/170] don't include any font when building with
WLED_DISABLE_2D
saves up to 12Kb program space in flash
---
wled00/wled_fonts.hpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/wled00/wled_fonts.hpp b/wled00/wled_fonts.hpp
index f1ffa8d3..13d9059d 100644
--- a/wled00/wled_fonts.hpp
+++ b/wled00/wled_fonts.hpp
@@ -9,6 +9,7 @@
#undef WLED_ENABLE_FULL_FONTS
#endif
+#if !defined(WLED_DISABLE_2D) // don't include any font in 1D-only builds - saves up to 12Kb of flash
// pull in all fonts
#include "src/font/console_font_4x6.h"
@@ -17,6 +18,7 @@
#include "src/font/console_font_6x8.h"
#include "src/font/console_font_7x9.h"
+#endif
// fontInfo struct returned by getFontInfo
typedef struct {
@@ -35,6 +37,7 @@ inline FontInfo_t getFontInfo(unsigned width, unsigned height) {
unsigned pixels = width * height;
switch (pixels) {
+#if !defined(WLED_DISABLE_2D) // no fonts in 1D-only builds
// WLED standard fonts (PROGMEM)
case 24: // 4x6 font
font.raw = console_font_4x6;
@@ -74,6 +77,7 @@ inline FontInfo_t getFontInfo(unsigned width, unsigned height) {
// you can add any custom fonts here
+#endif
default: // no font
font.raw = nullptr;
font.isProgMem = false;
From d8e07d160997919259c150072a4a1f1868d55cd3 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sat, 22 Nov 2025 18:06:02 +0100
Subject: [PATCH 132/170] partition files for use with ADAFRUIT boards
these partition files preserve the special "UF2" bootloader that is necessary for adafruit -S2 and -S3 boards.
---
tools/partitions-16MB_spiffs-tinyuf2.csv | 10 ++++++++++
1 file changed, 10 insertions(+)
create mode 100644 tools/partitions-16MB_spiffs-tinyuf2.csv
diff --git a/tools/partitions-16MB_spiffs-tinyuf2.csv b/tools/partitions-16MB_spiffs-tinyuf2.csv
new file mode 100644
index 00000000..238710e9
--- /dev/null
+++ b/tools/partitions-16MB_spiffs-tinyuf2.csv
@@ -0,0 +1,10 @@
+# ESP-IDF Partition Table
+# Name, Type, SubType, Offset, Size, Flags
+# bootloader.bin,, 0x1000, 32K
+# partition table,, 0x8000, 4K
+nvs, data, nvs, 0x9000, 20K,
+otadata, data, ota, 0xe000, 8K,
+ota_0, app, ota_0, 0x10000, 2048K,
+ota_1, app, ota_1, 0x210000, 2048K,
+uf2, app, factory,0x410000, 256K,
+spiffs, data, spiffs, 0x450000, 11968K,
From f4d890c584d60fce30a2e781b0db71da7dcd41f3 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 23 Nov 2025 00:53:38 +0100
Subject: [PATCH 133/170] adding "-D SR_DMTYPE=254" to classic esp32 builds
with HUB75 support
on classic esp32, the HUB75 driver uses the I2S unit. Set AR default to "receive only", to prevent driver conflicts.
---
platformio.ini | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/platformio.ini b/platformio.ini
index e6f61d37..ec1e44fe 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -1618,6 +1618,7 @@ build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags}
; -D SR_DEBUG
; -D MIC_LOGGER
${common_mm.HUB75_build_flags}
+ -D SR_DMTYPE=254 ;; HUB75 driver needs the I2S unit - set AR default mode to 'Network Receive Only' to prevent driver conflicts.
-D WLED_DISABLE_PARTICLESYSTEM1D ;; exceeds flash size limit
lib_deps = ${esp32_4MB_V4_S_base.esp32_lib_deps}
${common_mm.HUB75_lib_deps}
@@ -1642,6 +1643,7 @@ build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags}
; -D SR_DEBUG
; -D MIC_LOGGER
${common_mm.HUB75_build_flags}
+ -D SR_DMTYPE=254 ;; HUB75 driver needs the I2S unit - set AR default mode to 'Network Receive Only' to prevent driver conflicts.
-D WLED_USE_ETHERNET
-D WLED_DISABLE_ESPNOW ;; ESP-NOW requires wifi, may crash with ethernet only
lib_deps = ${esp32_4MB_V4_S_base.esp32_lib_deps}
@@ -1684,7 +1686,8 @@ build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags}
;; -D SR_DEBUG
-D WLED_BOOTUPDELAY=350
${common_mm.HUB75_build_flags}
- -DESP32_FORUM_PINOUT
+ -DESP32_FORUM_PINOUT
+ -D SR_DMTYPE=254 ;; HUB75 driver needs the I2S unit - set AR default mode to 'Network Receive Only' to prevent driver conflicts.
${common_mm.animartrix_build_flags}
;;-DARDUINO_EVENT_RUNNING_CORE=0 ;; assign Wifi to core0, to have more CPU on core#1 (arduino loop)
;;-DARDUINO_RUNNING_CORE=1 ;; should be default, but does not hurt
@@ -1747,6 +1750,7 @@ build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags}
-D JSON_BUFFER_SIZE=18432 -D MIN_HEAP_SIZE=6144
-D MAX_SEGMENT_DATA=40960 ;; default 32767
${common_mm.HUB75_build_flags}
+ -D SR_DMTYPE=254 ;; HUB75 driver needs the I2S unit - set AR default mode to 'Network Receive Only' to prevent driver conflicts.
${common_mm.animartrix_build_flags}
lib_deps = ${esp32_4MB_V4_S_base.esp32_lib_deps}
${common_mm.HUB75_lib_deps}
@@ -1773,6 +1777,7 @@ build_flags = ${esp32_4MB_V4_M_base.esp32_build_flags}
-D FLD_PIN_SCL=-1 -D FLD_PIN_SDA=-1 ; use global!
-D HW_PIN_SCL=22 -D HW_PIN_SDA=21
${common_mm.HUB75_build_flags}
+ -D SR_DMTYPE=254 ;; HUB75 driver needs the I2S unit - set AR default mode to 'Network Receive Only' to prevent driver conflicts.
${common_mm.animartrix_build_flags}
lib_deps = ${esp32_4MB_V4_M_base.esp32_lib_deps}
${common_mm.HUB75_lib_deps}
@@ -1835,6 +1840,7 @@ build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags}
; -D SR_DEBUG
; -D MIC_LOGGER
${common_mm.HUB75_build_flags}
+ -D SR_DMTYPE=254 ;; HUB75 driver needs the I2S unit - set AR default mode to 'Network Receive Only' to prevent driver conflicts.
lib_deps = ${esp32_4MB_V4_S_base.esp32_lib_deps}
${common_mm.HUB75_lib_deps}
lib_ignore =
@@ -1886,6 +1892,7 @@ build_flags = ${esp32_4MB_V4_S_base.esp32_build_flags}
; -D SR_DEBUG
; -D MIC_LOGGER
${common_mm.HUB75_build_flags}
+ -D SR_DMTYPE=254 ;; HUB75 driver needs the I2S unit - set AR default mode to 'Network Receive Only' to prevent driver conflicts.
lib_deps = ${esp32_4MB_V4_S_base.esp32_lib_deps}
${common_mm.HUB75_lib_deps}
lib_ignore =
From 086ae216c86fe14c5fadba4311c5ace63ba9ff3e Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 23 Nov 2025 01:09:52 +0100
Subject: [PATCH 134/170] partitions file for boards with 32MB flash, buildenv
for WROOM-2 32MB
---
platformio.ini | 15 ++++++++++++++-
tools/WLED_ESP32_32MB.csv | 7 +++++++
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 tools/WLED_ESP32_32MB.csv
diff --git a/platformio.ini b/platformio.ini
index ec1e44fe..2b4ebd8b 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -2127,7 +2127,7 @@ board_upload.maximum_size =16777216
;; MM for ESP32-S3 WROOM-2, a.k.a. ESP32-S3 DevKitC-1 v1.1
-;; with >= 16MB FLASH and >= 8MB PSRAM (memory_type: opi_opi)
+;; with 16MB FLASH and >= 8MB PSRAM (memory_type: opi_opi)
;; includes HUB75 and AnimArtix
[env:esp32S3_WROOM-2_M]
extends = env:esp32S3_8MB_PSRAM_M
@@ -2161,6 +2161,19 @@ lib_deps = ${esp32s3.lib_deps} ${common_mm.lib_deps_S} ${common_mm.lib_deps_V4_
${common_mm.HUB75_lib_deps}
${common_mm.animartrix_lib_deps}
+;; MM for ESP32-S3 WROOM-2 with 32MB flash and PSRAM
+[env:esp32S3_WROOM-2_M_32MB]
+extends = env:esp32S3_WROOM-2_M
+board_build.partitions = tools/WLED_ESP32_32MB.csv
+board_upload.flash_size = 32MB
+board_upload.maximum_size = 33554432
+;; replace WLED_RELEASE_NAME, keep everything else
+build_unflags = ${env:esp32S3_WROOM-2_M.build_unflags}
+ -D WLED_RELEASE_NAME=esp32S3_WROOM-2_M
+build_flags = ${env:esp32S3_WROOM-2_M.build_flags}
+ -D WLED_RELEASE_NAME=esp32S3_WROOM-2_M_32MB
+
+
;; MM for esp32-s3 zero/supermini and lolin S3 mini boards - fastpath, optimize for speed
[env:esp32S3_4MB_PSRAM_S]
extends = env:esp32S3_8MB_S
diff --git a/tools/WLED_ESP32_32MB.csv b/tools/WLED_ESP32_32MB.csv
new file mode 100644
index 00000000..2aa06e6f
--- /dev/null
+++ b/tools/WLED_ESP32_32MB.csv
@@ -0,0 +1,7 @@
+# Name, Type, SubType, Offset, Size, Flags
+nvs, data, nvs, 0x9000, 0x5000,
+otadata, data, ota, 0xe000, 0x2000,
+app0, app, ota_0, 0x10000, 0x300000,
+app1, app, ota_1, 0x310000,0x300000,
+spiffs, data, spiffs, 0x610000,0x19E0000,
+coredump, data, coredump,,64K
From 424416d51a92e4c80dd11191e81957cecf896787 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 23 Nov 2025 02:28:47 +0100
Subject: [PATCH 135/170] hotfix: Disable deviceId retrieval to avoid crashes
Temporarily disable deviceID retrieval to prevent crashes on some ESP32 boards. This prevents the DeviceID from being added to /json/info, until we find a solution that does not crash my esp32.
---
wled00/json.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/wled00/json.cpp b/wled00/json.cpp
index 8b40f9e9..fae351f0 100644
--- a/wled00/json.cpp
+++ b/wled00/json.cpp
@@ -938,7 +938,8 @@ void serializeInfo(JsonObject root)
//root[F("cn")] = F(WLED_CODENAME); //WLEDMM removed
root[F("release")] = FPSTR(releaseString);
root[F("rel")] = FPSTR(releaseString); //WLEDMM to add bin name
- root[F("deviceId")] = getDeviceId();
+
+ // root[F("deviceId")] = getDeviceId(); // temporarily disabled, as getDeviceId() causes a crash on some esp32 boards.
JsonObject leds = root.createNestedObject("leds");
leds[F("count")] = strip.getLengthTotal();
From e0c7d254bbfea1a7679aed0a10d135ba373f0bd2 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Sun, 23 Nov 2025 17:18:10 +0100
Subject: [PATCH 136/170] fix outdated URLs
Aircoookie Wiki => mm.kno.wled.ge
MoonModules/WLED => MoonModules/WLED-MM
Aircoookie/WLED => wled/WLED
2024 => 2025
---
CHANGELOG.md | 2 +-
package.json | 6 +++---
tools/cdata.js | 3 +++
usermods/audioreactive/audio_reactive.h | 6 +++---
usermods/audioreactive/audio_source.h | 6 +++---
.../usermod_v2_auto_playlist.h | 6 +++---
wled00/FX.cpp | 8 ++++----
wled00/data/index.js | 2 +-
wled00/data/settings_dmx.htm | 2 +-
wled00/data/settings_sec.htm | 10 +++++-----
wled00/data/settings_um.htm | 2 +-
wled00/data/simple.js | 2 +-
wled00/data/update.htm | 4 ++--
13 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6369804d..fc4d034d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## [WLED upstream](https://github.com/Aircoookie/WLED/tree/0_14_1) changelog
+## [WLED upstream](https://github.com/wled/WLED/tree/0_14_1) changelog
#### Build 2403290
- WLED 0.14.3 release
diff --git a/package.json b/package.json
index 0e0d78d7..9487b088 100644
--- a/package.json
+++ b/package.json
@@ -13,14 +13,14 @@
},
"repository": {
"type": "git",
- "url": "git+https://github.com/MoonModules/WLED.git"
+ "url": "git+https://github.com/MoonModules/WLED-MM.git"
},
"author": "",
"license": "EUPL-1.2",
"bugs": {
- "url": "https://github.com/MoonModules/WLED/issues"
+ "url": "https://github.com/MoonModules/WLED-MM/issues"
},
- "homepage": "https://github.com/MoonModules/WLED#readme",
+ "homepage": "https://github.com/MoonModules/WLED-MM#readme",
"dependencies": {
"clean-css": "^4.2.3",
"html-minifier-terser": "^5.1.1",
diff --git a/tools/cdata.js b/tools/cdata.js
index 561d390e..f8bd7610 100644
--- a/tools/cdata.js
+++ b/tools/cdata.js
@@ -63,7 +63,10 @@ function adoptVersionAndRepo(html) {
// Replace we
html = strReplace(html, "https://github.com/atuline/WLED", repoUrl);
html = strReplace(html, "https://github.com/Aircoookie/WLED", repoUrl);
+ html = strReplace(html, "https://github.com/wled-dev/WLED", repoUrl);
+ html = strReplace(html, "https://github.com/wled/WLED", repoUrl);
html = strReplace(html, "https://github.com/MoonModules/WLED", repoUrl); //WLEDMM
+ html = strReplace(html, "https://github.com/MoonModules/WLED-MM", repoUrl); //WLEDMM
}
let version = packageJson.version;
if (version) {
diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h
index 9a9a4e7d..731f96c5 100644
--- a/usermods/audioreactive/audio_reactive.h
+++ b/usermods/audioreactive/audio_reactive.h
@@ -3,9 +3,9 @@
/*
@title MoonModules WLED - audioreactive usermod
@file audio_reactive.h
- @repo https://github.com/MoonModules/WLED, submit changes to this file as PRs to MoonModules/WLED
- @Authors https://github.com/MoonModules/WLED/commits/mdev/
- @Copyright © 2024 Github MoonModules Commit Authors (contact moonmodules@icloud.com for details)
+ @repo https://github.com/MoonModules/WLED-MM, submit changes to this file as PRs to MoonModules/WLED-MM
+ @Authors https://github.com/MoonModules/WLED-MM/commits/mdev/
+ @Copyright © 2024,2025 Github MoonModules Commit Authors (contact moonmodules@icloud.com for details)
@license Licensed under the EUPL-1.2 or later
*/
diff --git a/usermods/audioreactive/audio_source.h b/usermods/audioreactive/audio_source.h
index c4de4e33..6d31e029 100644
--- a/usermods/audioreactive/audio_source.h
+++ b/usermods/audioreactive/audio_source.h
@@ -3,9 +3,9 @@
/*
@title MoonModules WLED - audioreactive usermod
@file audio_source.h
- @repo https://github.com/MoonModules/WLED, submit changes to this file as PRs to MoonModules/WLED
- @Authors https://github.com/MoonModules/WLED/commits/mdev/
- @Copyright © 2024 Github MoonModules Commit Authors (contact moonmodules@icloud.com for details)
+ @repo https://github.com/MoonModules/WLED-MM, submit changes to this file as PRs to MoonModules/WLED-MM
+ @Authors https://github.com/MoonModules/WLED-MM/commits/mdev/
+ @Copyright © 2024,2025 Github MoonModules Commit Authors (contact moonmodules@icloud.com for details)
@license Licensed under the EUPL-1.2 or later
*/
diff --git a/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h b/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h
index 15a55e27..1e608ad3 100644
--- a/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h
+++ b/usermods/usermod_v2_auto_playlist/usermod_v2_auto_playlist.h
@@ -3,9 +3,9 @@
/*
@title MoonModules WLED - auto-playlist usermod
@file usermod_v2_auto_playlist.h
- @repo https://github.com/MoonModules/WLED, submit changes to this file as PRs to MoonModules/WLED
- @Authors https://github.com/MoonModules/WLED/commits/mdev/
- @Copyright © 2024 Github MoonModules Commit Authors (contact moonmodules@icloud.com for details)
+ @repo https://github.com/MoonModules/WLED-MM, submit changes to this file as PRs to MoonModules/WLED-MM
+ @Authors https://github.com/MoonModules/WLED-MM/commits/mdev/
+ @Copyright © 2024,2025 Github MoonModules Commit Authors (contact moonmodules@icloud.com for details)
@license Licensed under the EUPL-1.2 or later
*/
diff --git a/wled00/FX.cpp b/wled00/FX.cpp
index 5a543b6c..a900eb1a 100644
--- a/wled00/FX.cpp
+++ b/wled00/FX.cpp
@@ -8854,8 +8854,8 @@ static const char _data_FX_MODE_2DWAVINGCELL[] PROGMEM = "Waving Cell@!,,Amplitu
/*
@title MoonModules WLED - GEQ 3D Effect
@file included in FX.cpp
- @repo https://github.com/MoonModules/WLED, submit changes to this file as PRs to MoonModules/WLED
- @Authors https://github.com/MoonModules/WLED/commits/mdev/
+ @repo https://github.com/MoonModules/WLED-MM, submit changes to this file as PRs to MoonModules/WLED-MM
+ @Authors https://github.com/MoonModules/WLED-MM/commits/mdev/
@Copyright © 2024 Github MoonModules Commit Authors (contact moonmodules@icloud.com for details)
@license Licensed under the EUPL-1.2 or later
*/
@@ -9001,8 +9001,8 @@ static const char _data_FX_MODE_GEQLASER[] PROGMEM = "GEQ 3D ☾@Speed,Front Fil
/*
@title MoonModules WLED - Painbrush Effect
@file included in FX.cpp
- @repo https://github.com/MoonModules/WLED, submit changes to this file as PRs to MoonModules/WLED
- @Authors https://github.com/MoonModules/WLED/commits/mdev/
+ @repo https://github.com/MoonModules/WLED-MM, submit changes to this file as PRs to MoonModules/WLED-MM
+ @Authors https://github.com/MoonModules/WLED-MM/commits/mdev/
@Copyright © 2024 Github MoonModules Commit Authors (contact moonmodules@icloud.com for details)
@license GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007
diff --git a/wled00/data/index.js b/wled00/data/index.js
index a1b564ec..15ee1a91 100644
--- a/wled00/data/index.js
+++ b/wled00/data/index.js
@@ -3224,7 +3224,7 @@ setInterval(()=>{
gId('heartMM').style.color = `hsl(${hc}, 100%, 50%)`;
}, 910);
-function openGH() { window.open("https://github.com/Aircoookie/WLED/wiki"); }
+function openGH() { window.open("https://mm.kno.wled.ge/"); }
var cnfr = false;
function cnfReset()
diff --git a/wled00/data/settings_dmx.htm b/wled00/data/settings_dmx.htm
index 30a62fe5..17fba354 100644
--- a/wled00/data/settings_dmx.htm
+++ b/wled00/data/settings_dmx.htm
@@ -7,7 +7,7 @@
-MoonModules/WLED is a fork of [Aircoookie/WLED](https://github.com/Aircoookie/WLED) which contains latest merge of v0.14 of WLED with [additional features](https://mm.kno.wled.ge/moonmodules/what-is-moonmodules/).
+MoonModules/WLED is a fork of [wled/WLED](https://github.com/wled/WLED) which contains latest merge of v0.14 of WLED with [additional features](https://mm.kno.wled.ge/moonmodules/what-is-moonmodules/).
This fork is created by members of the [Atuline/WLED](https://github.com/atuline/WLED) team to make development against v0.14 possible while still preserving [Atuline/WLED v0.13.x](https://github.com/atuline/WLED/tree/dev) as a stable and supported version. The Atuline/WLED fork is also called WLED SR (Sound Reactive).
From d856749bea3de2dfaab9a6ebf5ebddf7a83fbc80 Mon Sep 17 00:00:00 2001
From: Damian Schneider