feat(lightbulb): Add precise color control capability

Author: shixinke-orion

components/led/lightbulb_driver/include/lightbulb.h

@@ -147,31 +147,18 @@ typedef struct {
 } lightbulb_cct_mapping_data_t;
 
 /**
- * @brief Color (Correlated Color Temperature) mapping data
+ * @brief Color mode mapping data
  *
- * @note This structure is used for precise color temperature calibration.
- *       Each color temperature value (cct_kelvin) needs to have a corresponding percentage (cct_percentage) determined,
- *       which is used to calibrate the color temperature more accurately.
- *       The rgbcw array specifies the current coefficients for the RGBCW channels.
- *       These coefficients are instrumental in adjusting the intensity of each color channel
- *       (Red, Green, Blue, Cool White, Warm White) to achieve the desired color temperature.
- *       They are also used for power limiting to ensure energy efficiency and LED longevity.
- *       Therefore, the sum of all values in the rgbcw array must equal 1 to maintain the correct power balance.
+ * @note Used for calibrating color accuracy in color mode.
  *
  */
 typedef struct {
-    float rgbcw_100[5];
-    float rgbcw_50[5];
-    float rgbcw_0[5];
+    float rgbcw_100[5]; /**< The RGBCW components required when saturation is 100 at a specific hue. */
+    float rgbcw_50[5];  /**< The RGBCW components required when saturation is 50 at a specific hue. */
+    float rgbcw_0[5];   /**< The RGBCW components required when saturation is 10 at a specific hue. */
     uint16_t hue;
 } lightbulb_color_mapping_data_t;
 
-// typedef struct {
-//     float abcdef_100[5];
-//     float abcdef_50[5];
-//     float abcdef_10[5];
-// } lightbulb_color_data_t;
-
 /**
  * @brief Gamma correction and color balance configuration
  *

components/led/lightbulb_driver/src/hal_driver.c

@@ -1047,7 +1047,7 @@ esp_err_t hal_get_driver_feature(hal_feature_query_list_t type, void *out_data)
     return ESP_OK;
 }
 
-esp_err_t hal_get_curve_table_value(uint8_t input, uint16_t *output)
+esp_err_t hal_get_curve_table_value(uint16_t input, uint16_t *output)
 {
     LIGHTBULB_CHECK(s_hal_obj, "init() must be called first", return ESP_ERR_INVALID_STATE);
     LIGHTBULB_CHECK(output, "out_data is null", return ESP_ERR_INVALID_STATE);
@@ -1057,7 +1057,7 @@ esp_err_t hal_get_curve_table_value(uint8_t input, uint16_t *output)
     return ESP_OK;
 }
 
-esp_err_t hal_get_linear_table_value(uint8_t input, uint16_t *output)
+esp_err_t hal_get_linear_table_value(uint16_t input, uint16_t *output)
 {
     LIGHTBULB_CHECK(s_hal_obj, "init() must be called first", return ESP_ERR_INVALID_STATE);
     LIGHTBULB_CHECK(output, "out_data is null", return ESP_ERR_INVALID_STATE);

components/led/lightbulb_driver/src/lightbulb.c

@@ -310,17 +310,18 @@ static void cct_and_brightness_convert_and_power_limit(lightbulb_led_beads_comb_
         hal_get_linear_table_value((uint8_t)value1, &white_value[3]);
         hal_get_linear_table_value((uint8_t)value2, &white_value[4]);
     } else if (led_beads == LED_BEADS_2CH_CW || ((led_beads == LED_BEADS_5CH_RGBCW) && (s_lb_obj->cap.enable_precise_cct_control == false))) {
-        uint16_t max_value = 255;
+        uint16_t max_value;
         float max_power;
         float _c = cct / 100.0;
         float _w = (100 - cct) / 100.0;
 
+        hal_get_driver_feature(QUERY_MAX_INPUT_VALUE, &max_value);
         float baseline = MAX(_c, _w);
         max_power = MIN(max_value * multiple, max_value / baseline);
         _c = max_power * _c * (brightness / 100.0);
         _w = max_power * _w * (brightness / 100.0);
-        hal_get_linear_table_value((uint8_t)_c, &white_value[3]);
-        hal_get_linear_table_value((uint8_t)_w, &white_value[4]);
+        hal_get_linear_table_value((uint16_t)_c, &white_value[3]);
+        hal_get_linear_table_value((uint16_t)_w, &white_value[4]);
     } else {
         uint16_t max_value;
         float max_power;

components/led/lightbulb_driver/src/priv_include/hal_driver.h

@@ -55,8 +55,8 @@ esp_err_t hal_output_init(hal_config_t *config, lightbulb_gamma_config_t *gamma,
 esp_err_t hal_output_deinit(void);
 esp_err_t hal_regist_channel(int channel, gpio_num_t gpio_num);
 esp_err_t hal_get_driver_feature(hal_feature_query_list_t type, void *out_data);
-esp_err_t hal_get_curve_table_value(uint8_t input, uint16_t *output);
-esp_err_t hal_get_linear_table_value(uint8_t input, uint16_t *output);
+esp_err_t hal_get_curve_table_value(uint16_t input, uint16_t *output);
+esp_err_t hal_get_linear_table_value(uint16_t input, uint16_t *output);
 esp_err_t hal_set_channel(int channel, uint16_t value, uint16_t fade_ms);
 esp_err_t hal_set_channel_group(uint16_t value[], uint8_t channel_mask, uint16_t fade_ms);
 esp_err_t hal_start_channel_action(int channel, uint16_t value_min, uint16_t value_max, uint16_t period_ms, bool fade_flag);

examples/lighting/lightbulb/main/lightbulb_example_cmd.c

@@ -83,14 +83,6 @@ static int do_set_rgb_cmd(int argc, char **argv)
         arg_print_errors(stderr, set_rgb_args.end, argv[0]);
         return 1;
     }
-    // uint16_t hsv[3] = {0};
-    // if (lightbulb_rgb2hsv(set_rgb_args.rgb->ival[0], set_rgb_args.rgb->ival[1], set_rgb_args.rgb->ival[2], &hsv[0], (uint8_t *)&hsv[1], (uint8_t *)&hsv[2]) != ESP_OK) {
-    //     return 1;
-    // }
-
-    // if (lightbulb_set_hsv(hsv[0], hsv[1], hsv[2]) != ESP_OK) {
-    //     return 1;
-    // }
 
     lightbulb_set_rgb(set_rgb_args.rgb->ival[0], set_rgb_args.rgb->ival[1], set_rgb_args.rgb->ival[2]);
 

examples/lighting/lightbulb/main/lightbulb_example_main.c

@@ -66,6 +66,15 @@ lightbulb_color_mapping_data_t color_data[COLOR_SZIE] = {
     {.rgbcw_100 = {0.9110, 0.0000, 0.0890}, .rgbcw_50 = {0.5762, 0.2810, 0.1429}, .rgbcw_0 = {0.4000, 0.4190, 0.1810}, .hue = 345}
 };
 
+lightbulb_power_limit_t limit = {
+    .color_max_power = 100,
+    .color_max_value = 100,
+    .color_min_value = 10,
+    .white_max_power = 100,
+    .white_max_brightness = 100,
+    .white_min_brightness = 10
+};
+
 void app_main(void)
 {
     /* Not a warning, just highlighted */
@@ -93,9 +102,9 @@ void app_main(void)
         .type = DRIVER_BP57x8D,
         .driver_conf.bp57x8d.freq_khz = 300,
         .driver_conf.bp57x8d.enable_iic_queue = true,
-        .driver_conf.bp57x8d.iic_clk = CONFIG_BP5758D_IIC_CLK_GPIO,
-        .driver_conf.bp57x8d.iic_sda = CONFIG_BP5758D_IIC_SDA_GPIO,
-        .driver_conf.bp57x8d.current = {15, 16, 15, 25, 25},
+        .driver_conf.bp57x8d.iic_clk = 3,
+        .driver_conf.bp57x8d.iic_sda = 7,
+        .driver_conf.bp57x8d.current = {10, 10, 10, 30, 30},
 #endif
         // 2. Configure the drive capability
         .capability.enable_fade = true,
@@ -106,7 +115,7 @@ void app_main(void)
         .capability.led_beads = LED_BEADS_3CH_RGB,
 #elif CONFIG_LIGHTBULB_DEMO_DRIVER_SELECT_BP5758D
 #if TEST_IIC_RGBWW_LIGHTBULB
-        .capability.led_beads = LED_BEADS_5CH_RGBW,
+        .capability.led_beads = LED_BEADS_5CH_RGBCW,
 #else
         .capability.led_beads = LED_BEADS_5CH_RGBCW,
 #endif
@@ -126,14 +135,14 @@ void app_main(void)
         .io_conf.pwm_io.warm_brightness = PWM_W_GPIO,
 #endif
 #ifdef CONFIG_LIGHTBULB_DEMO_DRIVER_SELECT_BP5758D
-        .io_conf.iic_io.red = OUT3,
+        .io_conf.iic_io.red = OUT1,
         .io_conf.iic_io.green = OUT2,
-        .io_conf.iic_io.blue = OUT1,
+        .io_conf.iic_io.blue = OUT3,
         .io_conf.iic_io.cold_white = OUT5,
         .io_conf.iic_io.warm_yellow = OUT4,
 #endif
         //4. Limit param
-        .external_limit = NULL,
+        .external_limit = &limit,
 
         //5. Gamma param
         .gamma_conf = NULL,
@@ -142,12 +151,12 @@ void app_main(void)
 #ifdef CONFIG_LIGHTBULB_DEMO_DRIVER_SELECT_BP5758D
         .color_mix_mode.precise.table = color_data,
         .color_mix_mode.precise.table_size = COLOR_SZIE,
-        .capability.enable_precise_color_control = 1,
+        .capability.enable_precise_color_control = 0,
 #endif
 #if CONFIG_LIGHTBULB_DEMO_DRIVER_SELECT_BP5758D && TEST_IIC_RGBWW_LIGHTBULB
         .cct_mix_mode.precise.table_size = MIX_TABLE_SIZE,
         .cct_mix_mode.precise.table = table,
-        .capability.enable_precise_cct_control = true,
+        .capability.enable_precise_cct_control = 0,
 #else
         .cct_mix_mode.standard.kelvin_max = 6500,
         .cct_mix_mode.standard.kelvin_min = 2200,