Submodule: Update the connectedhomeip submodule to the lastest master commit 069b09b5f3

Example: Update lighting app on ESP32-H2

qrcode: use managed_component instead of the extra_component from IDF
This commit is contained in:
WanqQixiang
2022-08-24 19:06:57 +08:00
parent e0c4b5db75
commit 74d6f1ae81
13 changed files with 50 additions and 34 deletions
+22 -2
View File
@@ -28,23 +28,37 @@ led_driver_handle_t led_driver_init(led_driver_config_t *config)
{
ESP_LOGI(TAG, "Initializing light driver");
esp_err_t err = ESP_OK;
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
rmt_config_t rmt_cfg = RMT_DEFAULT_CONFIG_TX(config->gpio, config->channel);
rmt_cfg.clk_div = 2;
err = rmt_config(&rmt_cfg);
if (err != ESP_OK) {
ESP_LOGE(TAG, "rmt_cfg failed");
return NULL;
}
err = rmt_driver_install(rmt_cfg.channel, 0, 0);
if (err != ESP_OK) {
ESP_LOGE(TAG, "rmt_driver_install failed");
return NULL;
}
led_strip_config_t strip_config = LED_STRIP_DEFAULT_CONFIG(1, (led_strip_dev_t)rmt_cfg.channel);
led_strip_t *strip = led_strip_new_rmt_ws2812(&strip_config);
#else
led_strip_config_t strip_config = {
.strip_gpio_num = config->gpio,
.max_leds = 1,
};
led_strip_handle_t strip;
err = led_strip_new_rmt_device(&strip_config, &strip);
if (err != ESP_OK) {
ESP_LOGE(TAG, "led_strip initializing failed");
return NULL;
}
#endif
if (!strip) {
ESP_LOGE(TAG, "W2812 driver install failed");
err = ESP_FAIL;
return NULL;
}
return (led_driver_handle_t)strip;
}
@@ -62,6 +76,7 @@ esp_err_t led_driver_set_RGB(led_driver_handle_t handle)
ESP_LOGE(TAG, "led driver handle cannot be NULL");
err = ESP_FAIL;
} else {
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
led_strip_t *strip = (led_strip_t *)handle;
err = strip->set_pixel(strip, 0, mRGB.red, mRGB.green, mRGB.blue);
if (err != ESP_OK) {
@@ -70,6 +85,11 @@ esp_err_t led_driver_set_RGB(led_driver_handle_t handle)
}
ESP_LOGI(TAG, "led set r:%d, g:%d, b:%d", mRGB.red, mRGB.green, mRGB.blue);
err = strip->refresh(strip, 100);
#else
led_strip_handle_t strip = (led_strip_handle_t)handle;
err = led_strip_set_pixel(strip, 0, mRGB.red, mRGB.green, mRGB.blue);
err |= led_strip_refresh(strip);
#endif
if (err != ESP_OK) {
ESP_LOGE(TAG, "strip_refresh failed");
}