Merge pull request #246 from dbambus/main

Fix for Colorization of Letters
ESPWortuhr · Apr 29, 2023 · a4c88f8 · a4c88f8
2 parents 3cabc6b + 6794e84
commit a4c88f8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/include/Animation.hpp b/include/Animation.hpp
@@ -332,7 +332,8 @@ void Animation::copy2Stripe(RgbfColor **source) {
         for (uint8_t col = 0; col < maxCols; col++) {
             led.setPixel(usedUhrType->getFrontMatrixIndex(row + rowStart,
                                                           col + colStart),
-                         Color{source[row][col]});
+                         Color{RgbColor(source[row][col].R, source[row][col].G,
+                                        source[row][col].B)});
         }
     }
     set_minutes();

diff --git a/include/led.h b/include/led.h
@@ -54,7 +54,7 @@ class Led {
     //------------------------------------------------------------------------------
     // Pixel get Functions
     //------------------------------------------------------------------------------
-    HsbColor getPixel(uint16_t i);
+    RgbColor getPixel(uint16_t i);
 
     //------------------------------------------------------------------------------
     // Pixel Clear Functions

diff --git a/include/led.hpp b/include/led.hpp
@@ -290,10 +290,9 @@ void Led::set(bool changed) {
 // Pixel get Functions
 //------------------------------------------------------------------------------
 
-HsbColor Led::getPixel(uint16_t i) {
+RgbColor Led::getPixel(uint16_t i) {
     if (G.Colortype == Grbw) {
-        RgbwColor rgbw = strip_RGBW->GetPixelColor(i);
-        return HsbColor(rgbw.R / 255.f, rgbw.G / 255.f, rgbw.B / 255.f);
+        return RgbColor(strip_RGBW->GetPixelColor(i));
     }
     return strip_RGB->GetPixelColor(i);
 }