[Silabs] Add Support for RGB led in Thread build (part 1) (project-chip#41926)

jepenven-silabs · web-flow · commit f160475848e6 · 2025-11-21T16:13:07.000Z
* Add Support for RGB led in Thread build

* fix comments
diff --git a/examples/lighting-app/silabs/src/LightingManager.cpp b/examples/lighting-app/silabs/src/LightingManager.cpp
@@ -366,8 +366,8 @@ bool LightingManager::InitiateLightCtrlAction(int32_t aActor, Action_t aAction,
 
         if (aAttributeId == ColorControl::Attributes::CurrentX::Id)
         {
-            VerifyOrReturnValue(colorData.xy.y != *reinterpret_cast<uint16_t *>(value), action_initiated);
-            colorData.xy.y   = *reinterpret_cast<uint16_t *>(value);
+            VerifyOrReturnValue(colorData.xy.x != *reinterpret_cast<uint16_t *>(value), action_initiated);
+            colorData.xy.x   = *reinterpret_cast<uint16_t *>(value);
             action_initiated = true;
         }
         else if (aAttributeId == ColorControl::Attributes::CurrentY::Id)
@@ -385,13 +385,15 @@ bool LightingManager::InitiateLightCtrlAction(int32_t aActor, Action_t aAction,
         {
             VerifyOrReturnValue(colorData.hsv.h != *value, action_initiated);
             colorData.hsv.h  = *value;
+            mCurrentHue      = *value;
             action_initiated = true;
         }
         else if (aAttributeId == ColorControl::Attributes::CurrentSaturation::Id)
         {
             VerifyOrReturnValue(colorData.hsv.s != *value, action_initiated);
-            colorData.hsv.s  = *value;
-            action_initiated = true;
+            colorData.hsv.s    = *value;
+            mCurrentSaturation = *value;
+            action_initiated   = true;
         }
         break;
 
diff --git a/examples/platform/silabs/LEDWidget.cpp b/examples/platform/silabs/LEDWidget.cpp
@@ -38,6 +38,7 @@ void LEDWidget::Init(const uint8_t led)
     mBlinkOffTimeMS   = 0;
     mLed              = led;
     mLedStatus        = false;
+    mLevel            = 0;
     Set(false);
 }
 
diff --git a/examples/platform/silabs/LEDWidget.h b/examples/platform/silabs/LEDWidget.h
@@ -37,10 +37,10 @@ class LEDWidget
     uint8_t GetLevel();
 
 private:
-    uint8_t mLed;
-    uint8_t mLevel;
-    bool mLedStatus;
-    uint64_t mLastChangeTimeMS;
-    uint32_t mBlinkOnTimeMS;
-    uint32_t mBlinkOffTimeMS;
+    uint8_t mLed               = 0;
+    uint8_t mLevel             = 0;
+    bool mLedStatus            = false;
+    uint64_t mLastChangeTimeMS = 0;
+    uint32_t mBlinkOnTimeMS    = 0;
+    uint32_t mBlinkOffTimeMS   = 0;
 };
diff --git a/examples/platform/silabs/efr32/BUILD.gn b/examples/platform/silabs/efr32/BUILD.gn
@@ -185,8 +185,8 @@ source_set("efr32-common") {
   }
 
   if (sl_enable_rgb_led) {
-    sources += [ "${silabs_common_plat_dir}/led/RGBLEDWidget.cpp" ]
-    include_dirs = [ "${silabs_common_plat_dir}/rgb_led" ]
+    sources += [ "${silabs_common_plat_dir}/rgb_led/RGBLEDWidget.cpp" ]
+    include_dirs += [ "${silabs_common_plat_dir}/rgb_led" ]
   }
 
   if (chip_build_libshell) {
diff --git a/examples/platform/silabs/rgb_led/RGBLEDWidget.cpp b/examples/platform/silabs/rgb_led/RGBLEDWidget.cpp
@@ -36,7 +36,7 @@ void RGBLEDWidget::SetColor(uint8_t red, uint8_t green, uint8_t blue)
 {
     if (GetPlatform().GetRGBLedState(GetLED()))
     {
-        ChipLogProgress(Zcl, "SetColor : %u|%u|%u", red, green, blue);
+        ChipLogProgress(Zcl, "SetColor : R:%u|G:%u|B:%u", red, green, blue);
         GetPlatform().SetLedColor(GetLED(), red, green, blue);
     }
 }
@@ -54,16 +54,77 @@ void RGBLEDWidget::GetColor(uint16_t & r, uint16_t & g, uint16_t & b)
 
     ChipLogProgress(Zcl, "RGB Values: R=%u G=%u B=%u", r, g, b);
 }
-
+/**
+ * @brief Convert Data model hue and saturation to RGB and set the color
+ *        As per spec, hue range from 0 to 254 and saturation from 0 to 254
+ *        Since the equation expects hue in 0-360 and saturation in percentage, we scale them accordingly
+ *
+ * @param hue
+ * @param saturation
+ */
 void RGBLEDWidget::SetColorFromHSV(uint8_t hue, uint8_t saturation)
 {
-    RGBLEDWidget::HsvColor_t hsv;
-    hsv.h = hue;
-    hsv.s = saturation;
-    hsv.v = GetLevel();
-    ChipLogProgress(Zcl, "SetColorFromHSV : %u|%u", hsv.h, hsv.s);
-    RGBLEDWidget::RgbColor_t rgb = RGBLEDWidget::HsvToRgb(hsv);
-    SetColor(rgb.r, rgb.g, rgb.b);
+    ChipLogDetail(Zcl, "SetColorFromHSV : H:%u|S:%u|V:%u", hue, saturation, GetLevel());
+    // Per spec max value for each attribute is 254
+    float h = (hue * 360.0f) / 254.0f, s = (saturation / 254.0f), v = (GetLevel() / 254.0f);
+    float hh, p, q, t, ff, r, g, b;
+    long i;
+
+    ChipLogDetail(Zcl, "HUE Values: H=%u S=%u V=%u", static_cast<uint8_t>(h), static_cast<uint8_t>(s * 100.0),
+                  static_cast<uint8_t>(v * 100.0));
+
+    if (s <= 0.0)
+    { // Achromatic (grey)
+        SetColor(static_cast<uint8_t>(v * 255), static_cast<uint8_t>(v * 255), static_cast<uint8_t>(v * 255));
+        return;
+    }
+
+    hh = h;
+    if (hh >= 360.0)
+        hh = 0.0;
+    hh /= 60.0;
+    i  = (long) hh;
+    ff = hh - i;
+    p  = v * (1.0 - s);
+    q  = v * (1.0 - (s * ff));
+    t  = v * (1.0 - (s * (1.0 - ff)));
+
+    switch (i)
+    {
+    case 0:
+        r = v;
+        g = t;
+        b = p;
+        break;
+    case 1:
+        r = q;
+        g = v;
+        b = p;
+        break;
+    case 2:
+        r = p;
+        g = v;
+        b = t;
+        break;
+    case 3:
+        r = p;
+        g = q;
+        b = v;
+        break;
+    case 4:
+        r = t;
+        g = p;
+        b = v;
+        break;
+    case 5:
+    default:
+        r = v;
+        g = p;
+        b = q;
+        break;
+    }
+
+    SetColor(static_cast<uint8_t>(r * 255), static_cast<uint8_t>(g * 255), static_cast<uint8_t>(b * 255));
 }
 
 void RGBLEDWidget::SetColorFromXY(uint16_t currentX, uint16_t currentY)
@@ -214,55 +275,6 @@ RgbColor_t RGBLEDWidget::ConvertXYZToRGB(float X, float Y, float Z)
     return rgb;
 }
 
-// Calculate the P value for HSV to RGB conversion
-uint8_t RGBLEDWidget::CalculateP(uint8_t v, uint8_t s)
-{
-    // RGB value when the hue is at its minimum for the current region.
-    return (v * (kMaxColorValue - s)) >> 8;
-}
-
-// Calculate the Q value for HSV to RGB conversion
-uint8_t RGBLEDWidget::CalculateQ(uint8_t v, uint8_t s, uint32_t remainder)
-{
-    // RGB value when the hue is transitioning from one primary color to another within the current region.
-    return (v * (kMaxColorValue - ((s * remainder) >> 8))) >> 8;
-}
-
-// Calculate the T value for HSV to RGB conversion
-uint8_t RGBLEDWidget::CalculateT(uint8_t v, uint8_t s, uint32_t remainder)
-{
-    // RGB value when the hue is transitioning from one primary color to another within the current region, but in the opposite
-    // direction of q.
-
-    return (v * (kMaxColorValue - ((s * (kMaxColorValue - remainder)) >> 8))) >> 8;
-}
-
-// Set RGB values based on the region for HSV to RGB conversion
-void RGBLEDWidget::SetRgbByRegion(uint8_t region, uint8_t v, uint8_t p, uint8_t q, uint8_t t, RgbColor_t & rgb)
-{
-    switch (region)
-    {
-    case 0:
-        rgb.r = v, rgb.g = t, rgb.b = p;
-        break;
-    case 1:
-        rgb.r = q, rgb.g = v, rgb.b = p;
-        break;
-    case 2:
-        rgb.r = p, rgb.g = v, rgb.b = t;
-        break;
-    case 3:
-        rgb.r = p, rgb.g = q, rgb.b = v;
-        break;
-    case 4:
-        rgb.r = t, rgb.g = p, rgb.b = v;
-        break;
-    default:
-        rgb.r = v, rgb.g = p, rgb.b = q;
-        break;
-    }
-}
-
 // Convert color temperature to RGB color space
 RgbColor_t RGBLEDWidget::CTToRgb(uint16_t ctMireds)
 {
@@ -278,39 +290,6 @@ RgbColor_t RGBLEDWidget::CTToRgb(uint16_t ctMireds)
     return rgb;
 }
 
-// Convert HSV color space to RGB color space
-RgbColor_t RGBLEDWidget::HsvToRgb(HsvColor_t hsv)
-{
-    RgbColor_t rgb;
-
-    uint8_t region, p, q, t;
-    uint32_t remainder;
-
-    if (hsv.s == 0)
-    {
-        rgb.r = rgb.g = rgb.b = hsv.v;
-    }
-    else
-    {
-        // region variable is calculated by dividing the hue value by 43 (since the hue value ranges from 0 to 255, and there
-        // are 6 regions, each region spans approximately 43 units)
-        region = hsv.h / kHueRegionDivider;
-
-        // Calculates the position of h within the current region.Multiplying by 6 scales this position to a range of 0 to 255,
-        // which is used to calculate intermediate RGB values.
-        remainder = (hsv.h - (region * kHueRegionDivider)) * 6;
-
-        // p,q and t intermediate values used to calculate the final RGB values
-        p = CalculateP(hsv.v, hsv.s);
-        q = CalculateQ(hsv.v, hsv.s, remainder);
-        t = CalculateT(hsv.v, hsv.s, remainder);
-
-        SetRgbByRegion(region, hsv.v, p, q, t, rgb);
-    }
-
-    return rgb;
-}
-
 // Convert XY color space to RGB color space
 RgbColor_t RGBLEDWidget::XYToRgb(uint8_t Level, uint16_t currentX, uint16_t currentY)
 {
diff --git a/examples/platform/silabs/rgb_led/RGBLEDWidget.h b/examples/platform/silabs/rgb_led/RGBLEDWidget.h
@@ -77,9 +77,4 @@ class RGBLEDWidget : public LEDWidget
     float CalculateRed(float ct);
     float CalculateGreen(float ct);
     float CalculateBlue(float ct);
-
-    uint8_t CalculateP(uint8_t v, uint8_t s);
-    uint8_t CalculateQ(uint8_t v, uint8_t s, uint32_t remainder);
-    uint8_t CalculateT(uint8_t v, uint8_t s, uint32_t remainder);
-    void SetRgbByRegion(uint8_t region, uint8_t v, uint8_t p, uint8_t q, uint8_t t, RgbColor_t & rgb);
 };
diff --git a/src/platform/silabs/platformAbstraction/GsdkSpam.cpp b/src/platform/silabs/platformAbstraction/GsdkSpam.cpp
@@ -35,8 +35,27 @@
 
 #ifdef ENABLE_WSTK_LEDS
 extern "C" {
+#if (defined(SL_MATTER_RGB_LED_ENABLED) && SL_MATTER_RGB_LED_ENABLED == 1)
+#include "sl_simple_rgb_pwm_led.h"
+#include "sl_simple_rgb_pwm_led_instances.h"
+#define SL_SIMPLE_LED_INSTANCE(x) (&sl_simple_rgb_pwm_led_rgb_led0)
+#define SL_SIMPLE_LED_COUNT 1
+#define SL_LED_INIT_INTANCES() sl_simple_rgb_pwm_led_init_instances();
+#define SL_LED_GET_STATE(x) (x->led_common.context->state)
+#define SL_LED_TURN_ON(x) sl_led_turn_on(&(x->led_common))
+#define SL_LED_TURN_OFF(x) sl_led_turn_off(&(x->led_common))
+#define SL_LED_TOGGLE(x) sl_led_toggle(&(x->led_common))
+#else
 #include "sl_simple_led_instances.h"
+#define SL_LED_INIT_INTANCES() sl_simple_led_init_instances();
+#define SL_LED_GET_STATE(x) sl_simple_led_get_state(const_cast<sl_led_t *>(x))
+#define SL_LED_TURN_ON(x) sl_simple_led_turn_on(const_cast<sl_led_t *>(x))
+#define SL_LED_TURN_OFF(x) sl_simple_led_turn_off(const_cast<sl_led_t *>(x))
+#define SL_LED_TOGGLE(x) sl_simple_led_toggle(const_cast<sl_led_t *>(x))
+
+#endif // (defined(SL_MATTER_RGB_LED_ENABLED) && SL_MATTER_RGB_LED_ENABLED == 1)
 }
+
 #endif
 
 #ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT
@@ -193,7 +212,7 @@ CHIP_ERROR SilabsPlatform::FlashWritePage(uint32_t addr, const uint8_t * data, s
 #ifdef ENABLE_WSTK_LEDS
 void SilabsPlatform::InitLed(void)
 {
-    sl_simple_led_init_instances();
+    SL_LED_INIT_INTANCES();
 }
 
 CHIP_ERROR SilabsPlatform::SetLed(bool state, uint8_t led)
@@ -203,7 +222,7 @@ CHIP_ERROR SilabsPlatform::SetLed(bool state, uint8_t led)
         return CHIP_ERROR_INVALID_ARGUMENT;
     }
 
-    (state) ? sl_led_turn_on(SL_SIMPLE_LED_INSTANCE(led)) : sl_led_turn_off(SL_SIMPLE_LED_INSTANCE(led));
+    (state) ? SL_LED_TURN_ON(SL_SIMPLE_LED_INSTANCE(led)) : SL_LED_TURN_OFF(SL_SIMPLE_LED_INSTANCE(led));
     return CHIP_NO_ERROR;
 }
 
@@ -213,8 +232,7 @@ bool SilabsPlatform::GetLedState(uint8_t led)
     {
         return false;
     }
-
-    return sl_led_get_state(SL_SIMPLE_LED_INSTANCE(led));
+    return SL_LED_GET_STATE(SL_SIMPLE_LED_INSTANCE(led));
 }
 
 CHIP_ERROR SilabsPlatform::ToggleLed(uint8_t led)
@@ -223,7 +241,7 @@ CHIP_ERROR SilabsPlatform::ToggleLed(uint8_t led)
     {
         return CHIP_ERROR_INVALID_ARGUMENT;
     }
-    sl_led_toggle(SL_SIMPLE_LED_INSTANCE(led));
+    SL_LED_TOGGLE(SL_SIMPLE_LED_INSTANCE(led));
     return CHIP_NO_ERROR;
 }
 #endif // ENABLE_WSTK_LEDS
@@ -236,6 +254,23 @@ void SilabsPlatform::StartScheduler()
 }
 #endif
 
+#if (defined(SL_MATTER_RGB_LED_ENABLED) && SL_MATTER_RGB_LED_ENABLED == 1)
+bool SilabsPlatform::GetRGBLedState(uint8_t led)
+{
+    return SL_LED_GET_STATE(SL_SIMPLE_LED_INSTANCE(led));
+}
+CHIP_ERROR SilabsPlatform::SetLedColor(uint8_t led, uint8_t red, uint8_t green, uint8_t blue)
+{
+    sl_led_set_rgb_color(SL_SIMPLE_LED_INSTANCE(led), red, green, blue);
+    return CHIP_NO_ERROR;
+}
+CHIP_ERROR SilabsPlatform::GetLedColor(uint8_t led, uint16_t & r, uint16_t & g, uint16_t & b)
+{
+    sl_led_get_rgb_color(SL_SIMPLE_LED_INSTANCE(led), &r, &g, &b);
+    return CHIP_NO_ERROR;
+}
+#endif // (defined(SL_MATTER_RGB_LED_ENABLED) && SL_MATTER_RGB_LED_ENABLED == 1)
+
 #ifdef SL_CATALOG_SIMPLE_BUTTON_PRESENT
 extern "C" void sl_button_on_change(const sl_button_t * handle)
 {
diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
@@ -417,6 +417,10 @@ template("efr32_sdk") {
       defines += [ "ENABLE_WSTK_LEDS" ]
     }
 
+    if (sl_enable_rgb_led) {
+      defines += [ "SL_MATTER_RGB_LED_ENABLED=1" ]
+    }
+
     if (use_wstk_buttons) {
       _include_dirs += [ "${efr32_sdk_root}/platform/driver/button/inc" ]
     }
@@ -906,9 +910,15 @@ template("efr32_sdk") {
         "${efr32_sdk_root}/platform/driver/leddrv/src/sl_led.c",
         "${efr32_sdk_root}/platform/driver/leddrv/src/sl_pwm_led.c",
         "${efr32_sdk_root}/platform/driver/leddrv/src/sl_simple_led.c",
-        "${efr32_sdk_root}/platform/driver/leddrv/src/sl_simple_rgb_pwm_led.c",
-        "${silabs_gen_folder}/autogen/sl_simple_led_instances.c",
       ]
+      if (sl_enable_rgb_led) {
+        sources += [
+          "${efr32_sdk_root}/platform/driver/leddrv/src/sl_simple_rgb_pwm_led.c",
+          "${silabs_gen_folder}/autogen/sl_simple_rgb_pwm_led_instances.c",
+        ]
+      } else {
+        sources += [ "${silabs_gen_folder}/autogen/sl_simple_led_instances.c" ]
+      }
     }
 
     # SPI is only used for Wifi
diff --git a/third_party/silabs/silabs_board.gni b/third_party/silabs/silabs_board.gni
@@ -154,6 +154,8 @@ if (is_si917_board) {
   silabs_family = "efr32mg24"
   silabs_mcu = "EFR32MG24B310F1536IM48"
 
+  # TODO enable me once submodule is updated
+  # sl_enable_rgb_led = true
   # ThunderBoards don't have a LCD,
   show_qr_code = false
   disable_lcd = true

Original file line number	Diff line number	Diff line change
`@@ -366,8 +366,8 @@ bool LightingManager::InitiateLightCtrlAction(int32_t aActor, Action_t aAction,`
`366`	`366`
`367`	`367`	`if (aAttributeId == ColorControl::Attributes::CurrentX::Id)`
`368`	`368`	`{`
`369`		`- VerifyOrReturnValue(colorData.xy.y != reinterpret_cast<uint16_t >(value), action_initiated);`
`370`		`- colorData.xy.y = reinterpret_cast<uint16_t >(value);`
	`369`	`+ VerifyOrReturnValue(colorData.xy.x != reinterpret_cast<uint16_t >(value), action_initiated);`
	`370`	`+ colorData.xy.x = reinterpret_cast<uint16_t >(value);`
`371`	`371`	`action_initiated = true;`
`372`	`372`	`}`
`373`	`373`	`else if (aAttributeId == ColorControl::Attributes::CurrentY::Id)`
`@@ -385,13 +385,15 @@ bool LightingManager::InitiateLightCtrlAction(int32_t aActor, Action_t aAction,`
`385`	`385`	`{`
`386`	`386`	`VerifyOrReturnValue(colorData.hsv.h != *value, action_initiated);`
`387`	`387`	`colorData.hsv.h = *value;`
	`388`	`+ mCurrentHue = *value;`
`388`	`389`	`action_initiated = true;`
`389`	`390`	`}`
`390`	`391`	`else if (aAttributeId == ColorControl::Attributes::CurrentSaturation::Id)`
`391`	`392`	`{`
`392`	`393`	`VerifyOrReturnValue(colorData.hsv.s != *value, action_initiated);`
`393`		`- colorData.hsv.s = *value;`
`394`		`- action_initiated = true;`
	`394`	`+ colorData.hsv.s = *value;`
	`395`	`+ mCurrentSaturation = *value;`
	`396`	`+ action_initiated = true;`
`395`	`397`	`}`
`396`	`398`	`break;`
`397`	`399`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ void LEDWidget::Init(const uint8_t led)`
`38`	`38`	`mBlinkOffTimeMS = 0;`
`39`	`39`	`mLed = led;`
`40`	`40`	`mLedStatus = false;`
	`41`	`+ mLevel = 0;`
`41`	`42`	`Set(false);`
`42`	`43`	`}`
`43`	`44`
Original file line number	Diff line number	Diff line change
`@@ -185,8 +185,8 @@ source_set("efr32-common") {`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`if (sl_enable_rgb_led) {`
`188`		`- sources += [ "${silabs_common_plat_dir}/led/RGBLEDWidget.cpp" ]`
`189`		`- include_dirs = [ "${silabs_common_plat_dir}/rgb_led" ]`
	`188`	`+ sources += [ "${silabs_common_plat_dir}/rgb_led/RGBLEDWidget.cpp" ]`
	`189`	`+ include_dirs += [ "${silabs_common_plat_dir}/rgb_led" ]`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`if (chip_build_libshell) {`