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

allow gamma corrected preview without gamma corrected LEDs

Browse Source
This commit is contained in:
Frank
2023-08-05 00:06:58 +02:00
parent f010adfe24
commit 8e678ffa5e
4 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wled00/colors.cpp
View File

@@ -358,8 +358,9 @@ static void calcInvGammaTable(float gamma)
} }
} }
uint8_t unGamma8(uint8_t value) { uint8_t unGamma8(uint8_t value) {
if (!gammaCorrectCol || (value == 0) || (value == 255)) return value; //if (!gammaCorrectCol || (value == 0) || (value == 255)) return value;
if ((gammaCorrectVal <= 1.0f) || (gammaCorrectVal > 3.0f)) return value; if ((value == 0) || (value == 255)) return value;
if ((gammaCorrectVal < 0.999f) || (gammaCorrectVal > 3.0f)) return value;
if (gammaTinv[255] == 0) calcInvGammaTable(gammaCorrectVal); if (gammaTinv[255] == 0) calcInvGammaTable(gammaCorrectVal);
return gammaTinv[value]; return gammaTinv[value];
} }

16
wled00/json.cpp
View File

@@ -1440,9 +1440,19 @@ bool serveLiveLeds(AsyncWebServerRequest* request, uint32_t wsClient)
for (size_t i= 0; i < used; i += n) for (size_t i= 0; i < used; i += n)
{ {
uint32_t c = strip.getPixelColor(i); uint32_t c = strip.getPixelColor(i);
uint8_t r = qadd8(W(c), R(c)); //add white channel to RGB channels as a simple RGBW -> RGB map // WLEDMM begin: live leds with color gamma correction
uint8_t g = qadd8(W(c), G(c)); uint8_t w = W(c); // not sure why, but it looks better if always using "white" without corrections
uint8_t b = qadd8(W(c), B(c)); uint8_t r,g,b;
if (gammaCorrectPreview) {
r = qadd8(w, unGamma8(R(c))); //R, add white channel to RGB channels as a simple RGBW -> RGB map
g = qadd8(w, unGamma8(G(c))); //G
b = qadd8(w, unGamma8(B(c))); //B
} else {
// WLEDMM end
r = qadd8(w, R(c)); //add white channel to RGB channels as a simple RGBW -> RGB map
g = qadd8(w, G(c));
b = qadd8(w, B(c));
}
olen += sprintf(obuf + olen, "\"%06X\",", RGBW32(r,g,b,0)); olen += sprintf(obuf + olen, "\"%06X\",", RGBW32(r,g,b,0));
} }
olen -= 1; olen -= 1;

2
wled00/wled.h
View File

@@ -8,7 +8,7 @@
*/ */
// version code in format yymmddb (b = daily build) // version code in format yymmddb (b = daily build)
#define VERSION 2308040 #define VERSION 2308041
//uncomment this if you have a "my_config.h" file you'd like to use //uncomment this if you have a "my_config.h" file you'd like to use
//#define WLED_USE_MY_CONFIG //#define WLED_USE_MY_CONFIG

2
wled00/ws.cpp
View File

@@ -240,7 +240,7 @@ static bool sendLiveLedsWs(uint32_t wsClient) // WLEDMM added "static"
//WLEDMM: no skipLines //WLEDMM: no skipLines
uint32_t c = restoreColorLossy(strip.getPixelColor(i), stripBrightness); // WLEDMM full bright preview - does _not_ recover ABL reductions uint32_t c = restoreColorLossy(strip.getPixelColor(i), stripBrightness); // WLEDMM full bright preview - does _not_ recover ABL reductions
// WLEDMM begin: preview with color gamma correction // WLEDMM begin: preview with color gamma correction
if (gammaCorrectPreview && gammaCorrectCol) { if (gammaCorrectPreview) {
uint8_t w = W(c); // not sure why, but it looks better if using "white" without corrections uint8_t w = W(c); // not sure why, but it looks better if using "white" without corrections
buffer[pos++] = qadd8(w, unGamma8(R(c))); //R, add white channel to RGB channels as a simple RGBW -> RGB map buffer[pos++] = qadd8(w, unGamma8(R(c))); //R, add white channel to RGB channels as a simple RGBW -> RGB map
buffer[pos++] = qadd8(w, unGamma8(G(c))); //G buffer[pos++] = qadd8(w, unGamma8(G(c))); //G