Merge branch 'feature/lightbulb_add_color_mode_calibration' into 'master'

feat(lightbulb): Add color Calibration Scheme

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

Author: YuanMingfu-star

components/led/lightbulb_driver/CHANGELOG.md

@@ -1,4 +1,9 @@
 # ChangeLog
+## v1.3.0 - 2024-06-05
+
+### Enhancements:
+
+* Add precise color control capability.
 
 ## v1.2.0 - 2024-05-22
 

components/led/lightbulb_driver/drivers/kp18058/kp18058.c

@@ -98,7 +98,7 @@ static kp18058_handle_t *s_kp18058 = NULL;
 
 static IRAM_ATTR uint8_t parity_check(uint8_t input)
 {
-#if 0
+#if 1
     uint8_t result = input;
     result ^= result >> 8;
     result ^= result >> 4;

components/led/lightbulb_driver/idf_component.yml

@@ -1,4 +1,4 @@
-version: "1.2.0"
+version: "1.3.0"
 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/include/lightbulb.h

@@ -146,6 +146,19 @@ typedef struct {
                                     Used to define the perceived warmth or coolness of the light emitted. */
 } lightbulb_cct_mapping_data_t;
 
+/**
+ * @brief Color mode mapping data
+ *
+ * @note Used for calibrating color accuracy in color mode.
+ *
+ */
+typedef struct {
+    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;
+
 /**
  * @brief Gamma correction and color balance configuration
  *
@@ -263,6 +276,7 @@ typedef struct {
     bool enable_status_storage : 1;             /**< Enable this option to store the lightbulb state in NVS. */
     bool enable_hardware_cct : 1;               /**< Enable this option if your driver uses hardware CCT. Some PWM type drivers may need to set this option. */
     bool enable_precise_cct_control : 1;        /**< Enable this option if you need precise CCT control. Must set 'enable_hardware_cct' to false in order to enable it.*/
+    bool enable_precise_color_control : 1;      /**< Enable this option if you need precise Color control. */
     bool sync_change_brightness_value : 1;      /**< Enable this option if you need to use a parameter to mark the brightness of the white and color output. */
     bool disable_auto_on : 1;                   /**< Enable this option if you don't need automatic on when the color/white value is set. */
 } lightbulb_capability_t;
@@ -326,6 +340,13 @@ typedef struct {
         } precise;
     } cct_mix_mode;
 
+    union {
+        struct {
+            lightbulb_color_mapping_data_t *table;
+            int table_size;
+        } precise;
+    } color_mix_mode;
+
     lightbulb_gamma_config_t *gamma_conf;       /**< Pointer to the gamma configuration data. */
     lightbulb_power_limit_t *external_limit;    /**< Pointer to the external power limit configuration. */
 
@@ -357,12 +378,11 @@ typedef struct {
 typedef struct {
     lightbulb_effect_t effect_type;      /**< Type of the effect to be configured. */
     lightbulb_works_mode_t mode;        /**< Working mode of the lightbulb during the effect. */
-    uint8_t red;                        /**< Red component value for the effect (0-255). */
-    uint8_t green;                      /**< Green component value for the effect (0-255). */
-    uint8_t blue;                       /**< Blue component value for the effect (0-255). */
+    uint16_t hue;                        /**< Hue component value for the effect (0-360). */
+    uint8_t saturation;                      /**< Saturation component value for the effect (0-100). */
     uint16_t cct;                       /**< Color temperature value for the effect. */
-    uint8_t min_brightness;             /**< Minimum brightness level for the effect (0-100). */
-    uint8_t max_brightness;             /**< Maximum brightness level for the effect (0-100). */
+    uint8_t min_value_brightness;             /**< Minimum brightness level for the effect (0-100). */
+    uint8_t max_value_brightness;             /**< Maximum brightness level for the effect (0-100). */
     uint16_t effect_cycle_ms;           /**< Cycle time for the effect in milliseconds (ms). */
 
     /*

components/led/lightbulb_driver/src/hal_driver.c

@@ -50,7 +50,7 @@ static void gpio_reverse(int gpio_num)
 #define CHANGE_RATE_MS                          (12)                    // Interval in milliseconds between each update during the lightbulb's fading transition.
 #define FADE_CB_CHECK_MS                        (CHANGE_RATE_MS * 4)    // Maximum wait time in milliseconds when fade_cb is blocked.
 #define HARDWARE_RETAIN_RATE_MS                 (CHANGE_RATE_MS - 2)    // Safety margin in milliseconds for hardware fade interface in PWM scheme.
-#define MAX_TABLE_SIZE                          (256)                   // Maximum size for linear and gamma correction tables.
+//#define s_hal_obj->interface->driver_grayscale_level                          (256)                   // Maximum size for linear and gamma correction tables.
 #define DEFAULT_CURVE_COE                       (1.0)                   // Default coefficient for gamma correction curve.
 #define HAL_OUT_MAX_CHANNEL                     (5)                     // Maximum number of output channels in the Hardware Abstraction Layer (HAL).
 #define ERROR_COUNT_THRESHOLD                   (6)                     // Threshold for errors in the lower interface.
@@ -493,22 +493,22 @@ esp_err_t hal_output_init(hal_config_t *config, lightbulb_gamma_config_t *gamma,
     err = s_hal_obj->interface->init(config->driver_data, driver_default_hook_func);
     LIGHTBULB_CHECK(err == ESP_OK, "driver init fail", goto EXIT);
 
-    s_hal_obj->table_group[0] = calloc(MAX_TABLE_SIZE, sizeof(uint16_t));
+    s_hal_obj->table_group[0] = calloc(s_hal_obj->interface->driver_grayscale_level, sizeof(uint16_t));
     LIGHTBULB_CHECK(s_hal_obj->table_group[0], "curve table buffer alloc fail", goto EXIT);
 
     float curve_coe = gamma ? gamma->curve_coefficient : DEFAULT_CURVE_COE;
     float linear_coe = 1.0;
 
-    gamma_table_create(s_hal_obj->table_group[0], MAX_TABLE_SIZE, curve_coe, s_hal_obj->interface->driver_grayscale_level);
-    s_hal_obj->table_group[0][MAX_TABLE_SIZE - 1] = s_hal_obj->interface->hardware_allow_max_input_value;
+    gamma_table_create(s_hal_obj->table_group[0], s_hal_obj->interface->driver_grayscale_level, curve_coe, s_hal_obj->interface->driver_grayscale_level);
+    s_hal_obj->table_group[0][s_hal_obj->interface->driver_grayscale_level - 1] = s_hal_obj->interface->hardware_allow_max_input_value;
 
     if (linear_coe == curve_coe) {
         s_hal_obj->linear_use_curve_table = true;
     } else {
-        s_hal_obj->table_group[1] = calloc(MAX_TABLE_SIZE, sizeof(uint16_t));
+        s_hal_obj->table_group[1] = calloc(s_hal_obj->interface->driver_grayscale_level, sizeof(uint16_t));
         LIGHTBULB_CHECK(s_hal_obj->table_group[1], "linear table buffer alloc fail", goto EXIT);
-        gamma_table_create(s_hal_obj->table_group[1], MAX_TABLE_SIZE, linear_coe, s_hal_obj->interface->driver_grayscale_level);
-        s_hal_obj->table_group[1][MAX_TABLE_SIZE - 1] = s_hal_obj->interface->hardware_allow_max_input_value;
+        gamma_table_create(s_hal_obj->table_group[1], s_hal_obj->interface->driver_grayscale_level, linear_coe, s_hal_obj->interface->driver_grayscale_level);
+        s_hal_obj->table_group[1][s_hal_obj->interface->driver_grayscale_level - 1] = s_hal_obj->interface->hardware_allow_max_input_value;
     }
 
     for (int i = 0; i < 5; i++) {
@@ -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);