leds: fix incorrect handling of RGB LEDs

shanteacontrols · Apr 27, 2021 · 0f11712 · 0f11712
1 parent 2ac70ff
commit 0f11712
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/application/io/leds/LEDs.cpp b/src/application/io/leds/LEDs.cpp
@@ -431,9 +431,9 @@ void LEDs::setColor(uint8_t ledID, color_t color, brightness_t brightness)
         uint8_t gLED = _hwa.rgbSingleComponentIndex(rgbIndex, rgbIndex_t::g);
         uint8_t bLED = _hwa.rgbSingleComponentIndex(rgbIndex, rgbIndex_t::b);
 
-        handleLED(rLED, rgbIndex_t::r, BIT_READ(static_cast<bool>(color), static_cast<uint8_t>(rgbIndex_t::r)), true);
-        handleLED(gLED, rgbIndex_t::g, BIT_READ(static_cast<bool>(color), static_cast<uint8_t>(rgbIndex_t::g)), true);
-        handleLED(bLED, rgbIndex_t::b, BIT_READ(static_cast<bool>(color), static_cast<uint8_t>(rgbIndex_t::b)), true);
+        handleLED(rLED, rgbIndex_t::r, BIT_READ(static_cast<uint8_t>(color), static_cast<uint8_t>(rgbIndex_t::r)), true);
+        handleLED(gLED, rgbIndex_t::g, BIT_READ(static_cast<uint8_t>(color), static_cast<uint8_t>(rgbIndex_t::g)), true);
+        handleLED(bLED, rgbIndex_t::b, BIT_READ(static_cast<uint8_t>(color), static_cast<uint8_t>(rgbIndex_t::b)), true);
     }
     else
     {

diff --git a/src/application/main.cpp b/src/application/main.cpp
@@ -171,8 +171,9 @@ class HWALEDs : public IO::LEDs::HWA
             break;
 
         case IO::LEDs::rgbIndex_t::g:
-            boardRGBindex = Board::io::rgbIndex_t::r;
+            boardRGBindex = Board::io::rgbIndex_t::g;
             break;
+
         case IO::LEDs::rgbIndex_t::b:
             boardRGBindex = Board::io::rgbIndex_t::b;
             break;