Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scrolling text minor exhancements

Browse Source 
* scroll faster !
* add softening (=blur) option
This commit is contained in:
Frank
2025-11-20 18:08:18 +01:00
parent 4a4887aaba
commit 207b197d04
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wled00/FX.cpp
View File

@@ -6878,7 +6878,8 @@ uint16_t mode_2Dscrollingtext(void) {
if ((numberOfLetters * letterWidth) > cols) ++SEGENV.aux0 %= (numberOfLetters * letterWidth) + cols; // offset if ((numberOfLetters * letterWidth) > cols) ++SEGENV.aux0 %= (numberOfLetters * letterWidth) + cols; // offset
else SEGENV.aux0 = (cols + (numberOfLetters * letterWidth))/2; else SEGENV.aux0 = (cols + (numberOfLetters * letterWidth))/2;
SEGENV.aux1 = (SEGENV.aux1 + 1) & 0xFF; // color shift // WLEDMM changed to prevent overflow SEGENV.aux1 = (SEGENV.aux1 + 1) & 0xFF; // color shift // WLEDMM changed to prevent overflow
SEGENV.step = strip.now + map2(SEGMENT.speed, 0, 255, 10*FRAMETIME_FIXED, 2*FRAMETIME_FIXED); long minDelay = max((FRAMETIME_FIXED/2 + FRAMETIME_FIXED/4), int(FRAMETIME));
SEGENV.step = strip.now + map2(SEGMENT.speed, 0, 255, 10*FRAMETIME_FIXED, minDelay); // WLEDMM scroll faster
if (!SEGMENT.check2) { if (!SEGMENT.check2) {
for (int y = 0; y < rows; y++) for (int x = 0; x < cols; x++ ) for (int y = 0; y < rows; y++) for (int x = 0; x < cols; x++ )
SEGMENT.blendPixelColorXY(x, y, SEGCOLOR(1), 255 - (SEGMENT.custom1>>1)); SEGMENT.blendPixelColorXY(x, y, SEGCOLOR(1), 255 - (SEGMENT.custom1>>1));
@@ -6910,6 +6911,11 @@ uint16_t mode_2Dscrollingtext(void) {
col2 = SEGCOLOR(2); col2 = SEGCOLOR(2);
} }
SEGMENT.drawText((unsigned char*)text, maxLen, numberOfChars, int(cols) - int(SEGENV.aux0), yoffset, letterWidth, letterHeight, col1, col2, drawShadow); SEGMENT.drawText((unsigned char*)text, maxLen, numberOfChars, int(cols) - int(SEGENV.aux0), yoffset, letterWidth, letterHeight, col1, col2, drawShadow);
// WLEDMM add some blur
if (SEGENV.check3) {
if (SEGMENT.custom1 < 16) SEGMENT.blurRows(16); // only blur if no trail
SEGMENT.blurCols(20);
}
#endif #endif
return FRAMETIME; return FRAMETIME;

2
wled00/json.cpp
View File

@@ -145,7 +145,7 @@ bool deserializeSegment(JsonObject elem, byte it, byte presetId)
const char * name = elem["n"].as<const char*>(); const char * name = elem["n"].as<const char*>();
size_t len = 0; size_t len = 0;
if (name != nullptr) len = strlen(name); if (name != nullptr) len = strlen(name);
if (len > 0 && len < 32) { if (len > 0 && len < 32) { // ToDO: this is why long segment names silently get deleted - truncating would be better
seg.name = new(std::nothrow) char[len+1]; seg.name = new(std::nothrow) char[len+1];
if (seg.name) strlcpy(seg.name, name, len+1); if (seg.name) strlcpy(seg.name, name, len+1);
} else { } else {