Merge branch 'feature/ble_mesh_example_light_driver_v5.1' into 'release/v5.1'

feat: replace lightdriver, and support more chips in ble mesh examples(backport v5.1)

See merge request espressif/esp-idf!28920

Author: Isl2017

examples/bluetooth/esp_ble_mesh/aligenie_demo/main/Kconfig.projbuild

@@ -23,6 +23,7 @@ menu "AliGenie Example Configuration"
     menu "light driver config"
         config LIGHT_GPIO_RED
             int "Light red pin GPIO number"
+            range -1 48 if IDF_TARGET_ESP32S3
             range -1 33
             default 25
             help
@@ -33,6 +34,7 @@ menu "AliGenie Example Configuration"
 
         config LIGHT_GPIO_GREEN
             int "Light green pin GPIO number"
+            range -1 48 if IDF_TARGET_ESP32S3
             range -1 33
             default 26
             help
@@ -43,6 +45,7 @@ menu "AliGenie Example Configuration"
 
         config LIGHT_GPIO_BLUE
             int "Light blue pin GPIO number"
+            range -1 48 if IDF_TARGET_ESP32S3
             range -1 33
             default 27
             help
@@ -53,6 +56,7 @@ menu "AliGenie Example Configuration"
 
         config LIGHT_GPIO_COLD
             int "Light cold colors pin GPIO number"
+            range -1 48 if IDF_TARGET_ESP32S3
             range -1 33
             default -1
             help
@@ -63,6 +67,7 @@ menu "AliGenie Example Configuration"
 
         config LIGHT_GPIO_WARM
             int "Light warm color pin GPIO number"
+            range -1 48 if IDF_TARGET_ESP32S3
             range -1 33
             default -1
             help

examples/bluetooth/esp_ble_mesh/aligenie_demo/main/aligenie_demo.c

@@ -37,6 +37,7 @@ static const char *TAG  = "genie_demo";
 
 #define MESH_ELEM_COUNT         1
 #define MESH_ELEM_STATE_COUNT   MESH_ELEM_COUNT
+#define LIGHT_STATUS_STORE_KEY   "light_status"
 
 nvs_handle_t NVS_HANDLE;
 
@@ -416,12 +417,34 @@ void user_genie_event_handle(genie_event_t event, void *p_arg)
     switch (event) {
     case GENIE_EVT_RESET_BY_REPEAT_NOTIFY:
         ESP_LOGI(TAG, "GENIE_EVT_RESET_BY_REPEAT_NOTIFY");
-        light_driver_breath_start(0, 255, 0);   /**< green blink */
+        lightbulb_set_switch(false);
+        lightbulb_effect_config_t effect1 = {
+            .red = 0,
+            .green = 255,
+            .blue = 0,
+            .max_brightness = 100,
+            .min_brightness = 0,
+            .effect_cycle_ms = CONFIG_LIGHT_BLINK_PERIOD_MS,
+            .effect_type = EFFECT_BLINK,
+            .mode = WORK_COLOR,
+        };
+        lightbulb_basic_effect_start(&effect1);   /**< green blink */
         break;
     case GENIE_EVT_SW_RESET:
     case GENIE_EVT_HW_RESET_START:
         ESP_LOGI(TAG, "GENIE_EVT_HW_RESET_START");
-        light_driver_breath_start(0, 255, 0);   /**< green blink */
+        lightbulb_set_switch(false);
+        lightbulb_effect_config_t effect2 = {
+            .red = 0,
+            .green = 255,
+            .blue = 0,
+            .max_brightness = 100,
+            .min_brightness = 0,
+            .effect_cycle_ms = CONFIG_LIGHT_BLINK_PERIOD_MS,
+            .effect_type = EFFECT_BLINK,
+            .mode = WORK_COLOR,
+        };
+        lightbulb_basic_effect_start(&effect2);   /**< green blink */
         ble_mesh_nvs_erase(NVS_HANDLE, LIGHT_STATUS_STORE_KEY); // erase led status
         reset_light_para();
         break;
@@ -442,7 +465,7 @@ void user_genie_event_handle(genie_event_t event, void *p_arg)
         g_indication_flag |= INDICATION_FLAG_CTL;
 #endif
         ESP_LOGI(TAG, "light_driver_breath_stop %s", __FUNCTION__);
-        light_driver_breath_stop();
+        lightbulb_basic_effect_stop();
         // update led status
         genie_event(GENIE_EVT_SDK_ANALYZE_MSG, &g_elem_state[0]);
         break;
@@ -1290,7 +1313,18 @@ static esp_err_t ble_mesh_init(void)
         ESP_LOGW(TAG, "node already provisioned");
     } else {
         ESP_LOGW(TAG, "node not provisioned");
-        light_driver_breath_start(0, 255, 0); /**< green blink */
+        lightbulb_set_switch(false);
+        lightbulb_effect_config_t effect3 = {
+            .red = 0,
+            .green = 255,
+            .blue = 0,
+            .max_brightness = 100,
+            .min_brightness = 0,
+            .effect_cycle_ms = CONFIG_LIGHT_BLINK_PERIOD_MS,
+            .effect_type = EFFECT_BLINK,
+            .mode = WORK_COLOR,
+        };
+        lightbulb_basic_effect_start(&effect3); /**< green blink */
     }
 
     return err;

examples/bluetooth/esp_ble_mesh/aligenie_demo/main/board.c

@@ -13,11 +13,15 @@
 #include "esp_log.h"
 
 #include "iot_button.h"
-#include "light_driver.h"
+#include "lightbulb.h"
 
 #include "genie_event.h"
 
+#if CONFIG_IDF_TARGET_ESP32C3
+#define BUTTON_ON_OFF          9   /* on/off button */
+#else
 #define BUTTON_ON_OFF          0   /* on/off button */
+#endif
 #define BUTTON_ACTIVE_LEVEL    0
 
 static const char *TAG  = "board";
@@ -38,22 +42,37 @@ static void board_led_init(void)
      *  If the module has SPI flash, GPIOs 6-11 are connected to the module’s integrated SPI flash and PSRAM.
      *  If the module has PSRAM, GPIOs 16 and 17 are connected to the module’s integrated PSRAM.
      */
-    light_driver_config_t driver_config = {
-        .gpio_red        = CONFIG_LIGHT_GPIO_RED,
-        .gpio_green      = CONFIG_LIGHT_GPIO_GREEN,
-        .gpio_blue       = CONFIG_LIGHT_GPIO_BLUE,
-        .gpio_cold       = CONFIG_LIGHT_GPIO_COLD,
-        .gpio_warm       = CONFIG_LIGHT_GPIO_WARM,
-        .fade_period_ms  = CONFIG_LIGHT_FADE_PERIOD_MS,
-        .blink_period_ms = CONFIG_LIGHT_BLINK_PERIOD_MS,
+    lightbulb_config_t config = {
+        .type = DRIVER_ESP_PWM,
+        .driver_conf.pwm.freq_hz = 4000,
+        .capability.enable_fades = true,
+        .capability.fades_ms = CONFIG_LIGHT_FADE_PERIOD_MS,
+        .capability.enable_lowpower = false,
+        .capability.enable_mix_cct = false,
+        .capability.enable_status_storage = false,
+        .capability.mode_mask = COLOR_MODE,
+        .capability.storage_cb = NULL,
+        .capability.sync_change_brightness_value = true,
+        .io_conf.pwm_io.red = CONFIG_LIGHT_GPIO_RED,
+        .io_conf.pwm_io.green = CONFIG_LIGHT_GPIO_GREEN,
+        .io_conf.pwm_io.blue = CONFIG_LIGHT_GPIO_BLUE,
+        .io_conf.pwm_io.cold_cct = CONFIG_LIGHT_GPIO_COLD,
+        .io_conf.pwm_io.warm_brightness = CONFIG_LIGHT_GPIO_WARM,
+        .external_limit = NULL,
+        .gamma_conf = NULL,
+        .init_status.mode = WORK_COLOR,
+        .init_status.on = true,
+        .init_status.hue = 0,
+        .init_status.saturation = 100,
+        .init_status.value = 100,
     };
 
     /**
      * @brief Light driver initialization
      */
-    ESP_ERROR_CHECK(light_driver_init(&driver_config));
-    light_driver_set_mode(MODE_HSL);
-    // light_driver_set_switch(true);
+    ESP_ERROR_CHECK(lightbulb_init(&config));
+    vTaskDelay(pdMS_TO_TICKS(1000) * 1);
+    lightbulb_set_switch(true);
 
     button_handle_t dev_on_off_btn = iot_button_create(BUTTON_ON_OFF, BUTTON_ACTIVE_LEVEL);
     iot_button_set_evt_cb(dev_on_off_btn, BUTTON_CB_TAP, button_tap_cb, &dev_on_btn_num);
@@ -64,6 +83,62 @@ void board_init(void)
     board_led_init();
 }
 
+static esp_err_t board_led_hsl2rgb(uint16_t hue, uint8_t saturation, uint8_t lightness,
+                                      uint8_t *red, uint8_t *green, uint8_t *blue)
+{
+    uint16_t hi = (hue / 60) % 6;
+    uint16_t C  = (100 - abs(2 * lightness - 100)) * saturation / 100;
+    uint16_t M  = 100 * (lightness - 0.5 * C) / 100;
+    uint16_t X  = C * (100 - abs((hue * 100 / 60 ) % 200 - 100)) / 100;
+
+    switch (hi) {
+        case 0: /* hue 0~60 */
+            *red   = C + M;
+            *green = X + M;
+            *blue  = M;
+            break;
+
+        case 1: /* hue 60~120 */
+            *red   = X + M;
+            *green = C + M;
+            *blue  = M;
+            break;
+
+        case 2: /* hue 120~180 */
+            *red   = M;
+            *green = C + M;
+            *blue  = X + M;
+            break;
+
+        case 3: /* hue 180~240 */
+            *red   = M;
+            *green = X + M;
+            *blue  = C + M;
+            break;
+
+        case 4: /* hue 240~300 */
+            *red   = X + M;
+            *green = M;
+            *blue  = C + M;
+            break;
+
+        case 5: /* hue 300~360 */
+            *red   = C + M;
+            *green = M;
+            *blue  = X + M;
+            break;
+
+        default:
+            return ESP_FAIL;
+    }
+
+    *red   = *red * 255 / 100;
+    *green = *green * 255 / 100;
+    *blue  = *blue * 255 / 100;
+
+    return ESP_OK;
+}
+
 /**
  * hsl
  */
@@ -86,8 +161,14 @@ void board_led_hsl(uint8_t elem_index, uint16_t hue, uint16_t saturation, uint16
         uint8_t  actual_saturation = (float)last_saturation / (UINT16_MAX / 100.0);
         uint8_t  actual_lightness  = (float)last_lightness / (UINT16_MAX / 100.0);
 
+        uint8_t r, g, b;
+        uint16_t h;
+        uint8_t s, v;
+
         ESP_LOGD(TAG, "hsl: %d, %d, %d operation", actual_hue, actual_saturation, actual_lightness);
-        light_driver_set_hsl(actual_hue, actual_saturation, actual_lightness);
+        board_led_hsl2rgb(actual_hue, actual_saturation, actual_lightness, &r, &g, &b);
+        lightbulb_rgb2hsv(r, g, b, &h, &s, &v);
+        lightbulb_set_hsv(h, s, v);
     }
 }
 
@@ -105,7 +186,7 @@ void board_led_temperature(uint8_t elem_index, uint16_t temperature)
 
         uint16_t actual_temperature = (float)last_temperature / (UINT16_MAX / 100.0);
         ESP_LOGD(TAG, "temperature %d %%%d operation", last_temperature, actual_temperature);
-        light_driver_set_color_temperature(actual_temperature);
+        lightbulb_set_cct(actual_temperature);
     }
 }
 
@@ -123,7 +204,7 @@ void board_led_lightness(uint8_t elem_index, uint16_t actual)
 
         uint16_t actual_lightness = (float)last_acual / (UINT16_MAX / 100.0);
         ESP_LOGD(TAG, "lightness %d %%%d operation", last_acual, actual_lightness);
-        light_driver_set_lightness(actual_lightness);
+        lightbulb_set_brightness(actual_lightness);
     }
 }
 
@@ -139,10 +220,10 @@ void board_led_switch(uint8_t elem_index, uint8_t onoff)
         last_onoff = onoff;
         if (last_onoff) {
             ESP_LOGD(TAG, "onoff %d operation", last_onoff);
-            light_driver_set_switch(true);
+            lightbulb_set_switch(true);
         } else {
             ESP_LOGD(TAG, "onoff %d operation", last_onoff);
-            light_driver_set_switch(false);
+            lightbulb_set_switch(false);
         }
     }
 }

examples/bluetooth/esp_ble_mesh/aligenie_demo/main/include/board.h

@@ -14,7 +14,7 @@ extern "C" {
 #endif /**< __cplusplus */
 
 #include "driver/gpio.h"
-#include "light_driver.h"
+#include "lightbulb.h"
 
 #define LED_ON    1
 #define LED_OFF   0

examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults

@@ -35,3 +35,9 @@ CONFIG_BLE_MESH_MODEL_KEY_COUNT=5
 CONFIG_BLE_MESH_MODEL_GROUP_COUNT=5
 CONFIG_BLE_MESH_MSG_CACHE_SIZE=20
 CONFIG_BLE_MESH_ADV_BUF_COUNT=256
+
+#
+# light driver config
+#
+CONFIG_PWM_ENABLE_HW_FADE=n
+# end of light driver config

examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32c3

@@ -1,15 +1,3 @@
-#
-# Partition Table
-#
-CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
-
-#
-# Serial flasher config
-#
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
-CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
-
 # Override some defaults so BT stack is enabled
 # by default in this example
 CONFIG_BT_ENABLED=y
@@ -18,20 +6,8 @@ CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-
-# Override some defaults of ESP BLE Mesh
-CONFIG_BLE_MESH=y
-CONFIG_BLE_MESH_NODE=y
-CONFIG_BLE_MESH_PB_GATT=y
-CONFIG_BLE_MESH_TX_SEG_MSG_COUNT=10
-CONFIG_BLE_MESH_RX_SEG_MSG_COUNT=10
-CONFIG_BLE_MESH_SETTINGS=y
-CONFIG_BLE_MESH_SUBNET_COUNT=5
-CONFIG_BLE_MESH_APP_KEY_COUNT=5
-CONFIG_BLE_MESH_MODEL_KEY_COUNT=5
-CONFIG_BLE_MESH_MODEL_GROUP_COUNT=5
-CONFIG_BLE_MESH_MSG_CACHE_SIZE=20
-CONFIG_BLE_MESH_ADV_BUF_COUNT=256
+CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n
+CONFIG_BT_LE_50_FEATURE_SUPPORT=n
 
 #
 # light driver config

examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32c6

@@ -0,0 +1,19 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+CONFIG_BT_ENABLED=y
+CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
+CONFIG_BT_BTU_TASK_STACK_SIZE=4512
+CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n
+CONFIG_BT_LE_50_FEATURE_SUPPORT=n
+
+#
+# light driver config
+#
+CONFIG_LIGHT_GPIO_RED=4
+CONFIG_LIGHT_GPIO_GREEN=5
+CONFIG_LIGHT_GPIO_BLUE=6
+CONFIG_LIGHT_GPIO_COLD=7
+CONFIG_LIGHT_GPIO_WARM=10
+# end of light driver config

examples/bluetooth/esp_ble_mesh/aligenie_demo/sdkconfig.defaults.esp32h2

@@ -0,0 +1,19 @@
+# Override some defaults so BT stack is enabled
+# by default in this example
+CONFIG_BT_ENABLED=y
+CONFIG_BT_LE_SCAN_DUPL_TYPE_DATA_DEVICE=y
+CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
+CONFIG_BT_BTU_TASK_STACK_SIZE=4512
+CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_BT_BLE_50_FEATURES_SUPPORTED=n
+CONFIG_BT_LE_50_FEATURE_SUPPORT=n
+
+#
+# light driver config
+#
+CONFIG_LIGHT_GPIO_RED=4
+CONFIG_LIGHT_GPIO_GREEN=5
+CONFIG_LIGHT_GPIO_BLUE=11
+CONFIG_LIGHT_GPIO_COLD=12
+CONFIG_LIGHT_GPIO_WARM=10
+# end of light driver config