From fd80638960ca613d567022b9e41598ddcf7e61a0 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 21 Oct 2023 19:36:06 +0100 Subject: [PATCH 1/5] Apply gamma correction --- .../usermod_v2_animartrix.h | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h index b93d3dffb5..0026fff1d4 100644 --- a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h +++ b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h @@ -104,13 +104,40 @@ class ANIMartRIXMod:public ANIMartRIX { setSpeedFactor(speedFactor); } void setPixelColor(int x, int y, rgb pixel) { - SEGMENT.setPixelColorXY(x, y, CRGB(pixel.red, pixel.green, pixel.blue)); + SEGMENT.setPixelColorXY(x, y, CRGB( + pgm_read_byte(&gamma8[pixel.red]), + pgm_read_byte(&gamma8[pixel.green]), + pgm_read_byte(&gamma8[pixel.blue]) + )); } void setPixelColor(int index, rgb pixel) { - SEGMENT.setPixelColor(index, CRGB(pixel.red, pixel.green, pixel.blue)); + SEGMENT.setPixelColor(index, CRGB( + pgm_read_byte(&gamma8[pixel.red]), + pgm_read_byte(&gamma8[pixel.green]), + pgm_read_byte(&gamma8[pixel.blue]) + )); } // Add any extra custom effects not part of the ANIMartRIX libary here + + private: + const uint8_t PROGMEM gamma8[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, + 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, + 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, + 10, 10, 11, 11, 11, 12, 12, 13, 13, 13, 14, 14, 15, 15, 16, 16, + 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 24, 24, 25, + 25, 26, 27, 27, 28, 29, 29, 30, 31, 32, 32, 33, 34, 35, 35, 36, + 37, 38, 39, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 50, + 51, 52, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 66, 67, 68, + 69, 70, 72, 73, 74, 75, 77, 78, 79, 81, 82, 83, 85, 86, 87, 89, + 90, 92, 93, 95, 96, 98, 99,101,102,104,105,107,109,110,112,114, + 115,117,119,120,122,124,126,127,129,131,133,135,137,138,140,142, + 144,146,148,150,152,154,156,158,160,162,164,167,169,171,173,175, + 177,180,182,184,186,189,191,193,196,198,200,203,205,208,210,213, + 215,218,220,223,225,228,231,233,236,239,241,244,247,249,252,255 }; }; ANIMartRIXMod anim; From a9663e09db63dfd317ef787b6cb44f0135b6f193 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 21 Oct 2023 19:56:10 +0100 Subject: [PATCH 2/5] Move gamma table outside of class --- .../usermod_v2_animartrix.h | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h index 0026fff1d4..3ebad53792 100644 --- a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h +++ b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h @@ -87,6 +87,23 @@ static const char _data_FX_mode_Waves[] PROGMEM = "Y💡Waves ☾@Speed;;1;2"; static const char _data_FX_mode_Chasing_Spirals[] PROGMEM = "Y💡Chasing_Spirals ☾@Speed;;1;2"; static const char _data_FX_mode_Rotating_Blob[] PROGMEM = "Y💡Rotating_Blob ☾@Speed;;1;2"; +const uint8_t PROGMEM gamma8[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, + 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, + 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, + 10, 10, 11, 11, 11, 12, 12, 13, 13, 13, 14, 14, 15, 15, 16, 16, + 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 24, 24, 25, + 25, 26, 27, 27, 28, 29, 29, 30, 31, 32, 32, 33, 34, 35, 35, 36, + 37, 38, 39, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 50, + 51, 52, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 66, 67, 68, + 69, 70, 72, 73, 74, 75, 77, 78, 79, 81, 82, 83, 85, 86, 87, 89, + 90, 92, 93, 95, 96, 98, 99,101,102,104,105,107,109,110,112,114, + 115,117,119,120,122,124,126,127,129,131,133,135,137,138,140,142, + 144,146,148,150,152,154,156,158,160,162,164,167,169,171,173,175, + 177,180,182,184,186,189,191,193,196,198,200,203,205,208,210,213, + 215,218,220,223,225,228,231,233,236,239,241,244,247,249,252,255 }; class ANIMartRIXMod:public ANIMartRIX { public: @@ -120,24 +137,6 @@ class ANIMartRIXMod:public ANIMartRIX { // Add any extra custom effects not part of the ANIMartRIX libary here - private: - const uint8_t PROGMEM gamma8[] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, - 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, - 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, - 10, 10, 11, 11, 11, 12, 12, 13, 13, 13, 14, 14, 15, 15, 16, 16, - 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 24, 24, 25, - 25, 26, 27, 27, 28, 29, 29, 30, 31, 32, 32, 33, 34, 35, 35, 36, - 37, 38, 39, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 50, - 51, 52, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 66, 67, 68, - 69, 70, 72, 73, 74, 75, 77, 78, 79, 81, 82, 83, 85, 86, 87, 89, - 90, 92, 93, 95, 96, 98, 99,101,102,104,105,107,109,110,112,114, - 115,117,119,120,122,124,126,127,129,131,133,135,137,138,140,142, - 144,146,148,150,152,154,156,158,160,162,164,167,169,171,173,175, - 177,180,182,184,186,189,191,193,196,198,200,203,205,208,210,213, - 215,218,220,223,225,228,231,233,236,239,241,244,247,249,252,255 }; }; ANIMartRIXMod anim; From 501c6749bc493fcded9eb4a8548a4e70623225f3 Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 21 Oct 2023 20:00:07 +0100 Subject: [PATCH 3/5] Use share gamma table --- .../usermod_v2_animartrix.h | 31 +++++-------------- 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h index 3ebad53792..c1bca063e5 100644 --- a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h +++ b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h @@ -87,24 +87,6 @@ static const char _data_FX_mode_Waves[] PROGMEM = "Y💡Waves ☾@Speed;;1;2"; static const char _data_FX_mode_Chasing_Spirals[] PROGMEM = "Y💡Chasing_Spirals ☾@Speed;;1;2"; static const char _data_FX_mode_Rotating_Blob[] PROGMEM = "Y💡Rotating_Blob ☾@Speed;;1;2"; -const uint8_t PROGMEM gamma8[] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, - 2, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5, 5, 5, - 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 9, 9, 9, 10, - 10, 10, 11, 11, 11, 12, 12, 13, 13, 13, 14, 14, 15, 15, 16, 16, - 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 24, 24, 25, - 25, 26, 27, 27, 28, 29, 29, 30, 31, 32, 32, 33, 34, 35, 35, 36, - 37, 38, 39, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 50, - 51, 52, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 66, 67, 68, - 69, 70, 72, 73, 74, 75, 77, 78, 79, 81, 82, 83, 85, 86, 87, 89, - 90, 92, 93, 95, 96, 98, 99,101,102,104,105,107,109,110,112,114, - 115,117,119,120,122,124,126,127,129,131,133,135,137,138,140,142, - 144,146,148,150,152,154,156,158,160,162,164,167,169,171,173,175, - 177,180,182,184,186,189,191,193,196,198,200,203,205,208,210,213, - 215,218,220,223,225,228,231,233,236,239,241,244,247,249,252,255 }; - class ANIMartRIXMod:public ANIMartRIX { public: void initEffect() { @@ -122,21 +104,22 @@ class ANIMartRIXMod:public ANIMartRIX { } void setPixelColor(int x, int y, rgb pixel) { SEGMENT.setPixelColorXY(x, y, CRGB( - pgm_read_byte(&gamma8[pixel.red]), - pgm_read_byte(&gamma8[pixel.green]), - pgm_read_byte(&gamma8[pixel.blue]) + pgm_read_byte(&gamma8[(uint8_t) pixel.red]), + pgm_read_byte(&gamma8[(uint8_t) pixel.green]), + pgm_read_byte(&gamma8[(uint8_t) pixel.blue]) )); } void setPixelColor(int index, rgb pixel) { SEGMENT.setPixelColor(index, CRGB( - pgm_read_byte(&gamma8[pixel.red]), - pgm_read_byte(&gamma8[pixel.green]), - pgm_read_byte(&gamma8[pixel.blue]) + pgm_read_byte(&gamma8[(uint8_t) pixel.red]), + pgm_read_byte(&gamma8[(uint8_t) pixel.green]), + pgm_read_byte(&gamma8[(uint8_t) pixel.blue]) )); } // Add any extra custom effects not part of the ANIMartRIX libary here + private: }; ANIMartRIXMod anim; From 4f1e0c371a62d57e9ae19b6e06366ea50226e25a Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 21 Oct 2023 20:16:48 +0100 Subject: [PATCH 4/5] Use share gamma8 method --- .../usermod_v2_animartrix.h | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h index c1bca063e5..1abed2f139 100644 --- a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h +++ b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h @@ -103,18 +103,18 @@ class ANIMartRIXMod:public ANIMartRIX { setSpeedFactor(speedFactor); } void setPixelColor(int x, int y, rgb pixel) { - SEGMENT.setPixelColorXY(x, y, CRGB( - pgm_read_byte(&gamma8[(uint8_t) pixel.red]), - pgm_read_byte(&gamma8[(uint8_t) pixel.green]), - pgm_read_byte(&gamma8[(uint8_t) pixel.blue]) - )); + SEGMENT.setPixelColorXY(x, y, applyGamma(pixel)); } + + CRGB applyGamma(rgb pixel) { + uint8_t r = (uint8_t) pixel.red; + uint8_t g = (uint8_t) pixel.green; + uint8_t b = (uint8_t) pixel.blue; + return CRGB(gamma8(r), gamma8(g), gamma8(b)); + } + void setPixelColor(int index, rgb pixel) { - SEGMENT.setPixelColor(index, CRGB( - pgm_read_byte(&gamma8[(uint8_t) pixel.red]), - pgm_read_byte(&gamma8[(uint8_t) pixel.green]), - pgm_read_byte(&gamma8[(uint8_t) pixel.blue]) - )); + SEGMENT.setPixelColor(index, applyGamma(pixel)); } // Add any extra custom effects not part of the ANIMartRIX libary here From 47131500ad17f8eebc424312112d8cbc35678c2f Mon Sep 17 00:00:00 2001 From: Will Tatam Date: Sat, 21 Oct 2023 21:34:17 +0100 Subject: [PATCH 5/5] Add gamma correction config option --- .../usermod_v2_animartrix.h | 51 +++++++++++++++++-- 1 file changed, 46 insertions(+), 5 deletions(-) diff --git a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h index 1abed2f139..4ecf4ff630 100644 --- a/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h +++ b/usermods/usermod_v2_animartrix/usermod_v2_animartrix.h @@ -107,19 +107,29 @@ class ANIMartRIXMod:public ANIMartRIX { } CRGB applyGamma(rgb pixel) { - uint8_t r = (uint8_t) pixel.red; - uint8_t g = (uint8_t) pixel.green; - uint8_t b = (uint8_t) pixel.blue; - return CRGB(gamma8(r), gamma8(g), gamma8(b)); + if(enableGamma) { + uint8_t r = (uint8_t) pixel.red; + uint8_t g = (uint8_t) pixel.green; + uint8_t b = (uint8_t) pixel.blue; + return CRGB(gamma8(r), gamma8(g), gamma8(b)); + } + else { + return CRGB(pixel.red, pixel.green, pixel.blue); + } } void setPixelColor(int index, rgb pixel) { SEGMENT.setPixelColor(index, applyGamma(pixel)); } + void setEnableGamma(bool state) { + this->enableGamma = state; + } // Add any extra custom effects not part of the ANIMartRIX libary here private: + + bool enableGamma = true; }; ANIMartRIXMod anim; @@ -390,7 +400,9 @@ class AnimartrixUsermod : public Usermod { public: - AnimartrixUsermod(const char *name, bool enabled):Usermod(name, enabled) {} //WLEDMM + AnimartrixUsermod(const char *name, bool enabled):Usermod(name, enabled) { + anim.setEnableGamma(enableGamma); + } //WLEDMM void setup() { @@ -474,13 +486,42 @@ class AnimartrixUsermod : public Usermod { String uiDomString = F("Animartrix requires the Creative Commons Attribution License CC BY-NC 3.0"); infoArr.add(uiDomString); + infoArr.add("Gamma Correction : " + enableGamma); } + + void addToConfig(JsonObject& root) { + JsonObject top = root.createNestedObject(FPSTR(_name)); // usermodname + top[FPSTR("enabled")] = enabled; + top[FPSTR("enableGamma")] = enableGamma; + } + + bool readFromConfig(JsonObject& root) { + JsonObject top = root[FPSTR(_name)]; + if (top.isNull()) { + DEBUG_PRINT(FPSTR(_name)); + DEBUG_PRINTLN(F(": No config found. (Using defaults.)")); + return false; + } + + enabled = top[FPSTR("enabled")] | enabled; + enableGamma = top[FPSTR("enableGamma")] | enableGamma; + DEBUG_PRINT(FPSTR(_name)); + DEBUG_PRINTLN(F(" config (re)loaded.")); + + anim.setEnableGamma(enableGamma); + + return true; + } + + uint16_t getId() { return USERMOD_ID_ANIMARTRIX; } + private: + bool enableGamma; };