Merge branch 'bugfix/lightbulb_iic' into 'master'

fix(lightbulb): Enable new IIC driver in v5.2.6 instead of v5.2.4

See merge request ae_group/esp-iot-solution!1236

Author: YuanMingfu-star

components/led/lightbulb_driver/CHANGELOG.md

@@ -1,5 +1,12 @@
 # ChangeLog
 
+## v1.7.1 - 2025-03-05
+
+### Bug Fix:
+
+* Enable new IIC driver in v5.2.6 instead of v5.2.4
+* Fixed the color power calculation error
+
 ## v1.7.0 - 2025-02-24
 
 ### Improve:

components/led/lightbulb_driver/CMakeLists.txt

@@ -5,7 +5,7 @@ set(srcs "src/hal_driver.c"
 
 set(priv_req nvs_flash driver esp_timer)
 
-if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER_EQUAL "5.2.4")
+if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER_EQUAL "5.2.6")
 list(APPEND priv_req "esp_driver_i2c")
 endif()
 

components/led/lightbulb_driver/Kconfig

@@ -55,9 +55,9 @@ menu "LightBulb Driver Config"
             depends on ENABLE_KP18058_DRIVER || ENABLE_BP1658CJ_DRIVER || ENABLE_BP57x8D_DRIVER || ENABLE_SM2x35EGH_DRIVER || ENABLE_SM2135EH_DRIVER || ENABLE_SM2135E_DRIVER
 
             config LB_ENABLE_NEW_IIC_DRIVER
-                depends on ESP_IDF_VERSION >= 5.2.4
+                depends on ESP_IDF_VERSION >= 5.2.6
                 bool "Enable new I2C driver"
-                default "y"
+                default "n"
                 help
                     Enable new I2C driver.
 

components/led/lightbulb_driver/drivers/common/iic/iic.h

@@ -11,7 +11,7 @@
 #endif
 
 // Need to include this commit: https://github.com/espressif/esp-idf/commit/a245a316a518215c5655ffd2fe24fc920044b094
-#if ((ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 4)) && (ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 3, 0))) || \
+#if ((ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 6)) && (ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 3, 0))) || \
     ((ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 3)) && (ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 4, 0))) || \
     (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 1)) && \
     (CONFIG_LB_ENABLE_NEW_IIC_DRIVER)

components/led/lightbulb_driver/idf_component.yml

@@ -1,4 +1,4 @@
-version: "1.7.0"
+version: "1.7.1"
 description: Provide multiple dimming driver solutions to easily build lightbulb applications
 url: https://github.com/espressif/esp-iot-solution/tree/master/components/led/lightbulb_driver
 dependencies:

components/led/lightbulb_driver/src/lightbulb.c

@@ -1251,6 +1251,11 @@ static esp_err_t _lightbulb_hsv2rgb(uint16_t hue, uint8_t saturation, uint8_t va
     *red = _red / 255.0;
     *green = _green / 255.0;
     *blue = _blue / 255.0;
+
+    float total = *red + *green + *blue;
+    *red = *red / total;
+    *green = *green / total;
+    *blue = *blue / total;
     *cold = 0;
     *warm = 0;