Skip to content

Commit 9be61fd

Browse files
chshuchshu
committed
Merge branch 'revert_bsp_in_light' into 'main'
revert 41ec0e2 See merge request app-frameworks/esp-matter!1073
2 parents 6dd7925 + 3bd14ff commit 9be61fd

10 files changed

+45
-135
lines changed

‎examples/light/CMakeLists.txt

+22
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,26 @@ if(NOT DEFINED ENV{ESP_MATTER_PATH})
66
message(FATAL_ERROR "Please set ESP_MATTER_PATH to the path of esp-matter repo")
77
endif(NOT DEFINED ENV{ESP_MATTER_PATH})
88

9+
if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH})
10+
if("${IDF_TARGET}" STREQUAL "esp32" OR "${IDF_TARGET}" STREQUAL "")
11+
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32_devkit_c)
12+
elseif("${IDF_TARGET}" STREQUAL "esp32c3")
13+
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c3_devkit_m)
14+
elseif("${IDF_TARGET}" STREQUAL "esp32c2")
15+
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c2_devkit_m)
16+
elseif("${IDF_TARGET}" STREQUAL "esp32h2")
17+
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32h2_devkit_c)
18+
elseif("${IDF_TARGET}" STREQUAL "esp32s3")
19+
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s3_devkit_c)
20+
elseif("${IDF_TARGET}" STREQUAL "esp32c6")
21+
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c6_devkit_c)
22+
elseif("${IDF_TARGET}" STREQUAL "esp32p4")
23+
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/hollow)
24+
else()
25+
message(FATAL_ERROR "Unsupported IDF_TARGET")
26+
endif()
27+
endif(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH})
28+
929
set(PROJECT_VER "1.0")
1030
set(PROJECT_VER_NUMBER 1)
1131

@@ -15,11 +35,13 @@ set(MATTER_SDK_PATH ${ESP_MATTER_PATH}/connectedhomeip/connectedhomeip)
1535
# This should be done before using the IDF_TARGET variable.
1636
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
1737
include(${ESP_MATTER_PATH}/examples/common/cmake_common/components_include.cmake)
38+
include($ENV{ESP_MATTER_DEVICE_PATH}/esp_matter_device.cmake)
1839

1940
set(EXTRA_COMPONENT_DIRS
2041
"${ESP_MATTER_PATH}/examples/common"
2142
"${MATTER_SDK_PATH}/config/esp32/components"
2243
"${ESP_MATTER_PATH}/components"
44+
"${ESP_MATTER_PATH}/device_hal/device"
2345
${extra_components_dirs_append})
2446

2547
project(light)

‎examples/light/main/app_driver.cpp

+21-64
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
#include <stdlib.h>
1111
#include <string.h>
1212

13+
#include <device.h>
1314
#include <esp_matter.h>
14-
#include "bsp/esp-bsp.h"
15+
#include <led_driver.h>
1516

1617
#include <app_priv.h>
1718

@@ -22,70 +23,33 @@ static const char *TAG = "app_driver";
2223
extern uint16_t light_endpoint_id;
2324

2425
/* Do any conversions/remapping for the actual value here */
25-
static esp_err_t app_driver_light_set_power(led_indicator_handle_t handle, esp_matter_attr_val_t *val)
26+
static esp_err_t app_driver_light_set_power(led_driver_handle_t handle, esp_matter_attr_val_t *val)
2627
{
27-
#if CONFIG_BSP_LEDS_NUM > 0
28-
esp_err_t err = ESP_OK;
29-
if (val->val.b) {
30-
err = led_indicator_start(handle, BSP_LED_ON);
31-
} else {
32-
err = led_indicator_start(handle, BSP_LED_OFF);
33-
}
34-
return err;
35-
#else
36-
ESP_LOGI(TAG, "LED set power: %d", val->val.b);
37-
return ESP_OK;
38-
#endif
28+
return led_driver_set_power(handle, val->val.b);
3929
}
4030

41-
static esp_err_t app_driver_light_set_brightness(led_indicator_handle_t handle, esp_matter_attr_val_t *val)
31+
static esp_err_t app_driver_light_set_brightness(led_driver_handle_t handle, esp_matter_attr_val_t *val)
4232
{
4333
int value = REMAP_TO_RANGE(val->val.u8, MATTER_BRIGHTNESS, STANDARD_BRIGHTNESS);
44-
#if CONFIG_BSP_LEDS_NUM > 0
45-
return led_indicator_set_brightness(handle, value);
46-
#else
47-
ESP_LOGI(TAG, "LED set brightness: %d", value);
48-
return ESP_OK;
49-
#endif
34+
return led_driver_set_brightness(handle, value);
5035
}
5136

52-
static esp_err_t app_driver_light_set_hue(led_indicator_handle_t handle, esp_matter_attr_val_t *val)
37+
static esp_err_t app_driver_light_set_hue(led_driver_handle_t handle, esp_matter_attr_val_t *val)
5338
{
5439
int value = REMAP_TO_RANGE(val->val.u8, MATTER_HUE, STANDARD_HUE);
55-
#if CONFIG_BSP_LEDS_NUM > 0
56-
led_indicator_ihsv_t hsv;
57-
hsv.value = led_indicator_get_hsv(handle);
58-
hsv.h = value;
59-
return led_indicator_set_hsv(handle, hsv.value);
60-
#else
61-
ESP_LOGI(TAG, "LED set hue: %d", value);
62-
return ESP_OK;
63-
#endif
40+
return led_driver_set_hue(handle, value);
6441
}
6542

66-
static esp_err_t app_driver_light_set_saturation(led_indicator_handle_t handle, esp_matter_attr_val_t *val)
43+
static esp_err_t app_driver_light_set_saturation(led_driver_handle_t handle, esp_matter_attr_val_t *val)
6744
{
6845
int value = REMAP_TO_RANGE(val->val.u8, MATTER_SATURATION, STANDARD_SATURATION);
69-
#if CONFIG_BSP_LEDS_NUM > 0
70-
led_indicator_ihsv_t hsv;
71-
hsv.value = led_indicator_get_hsv(handle);
72-
hsv.s = value;
73-
return led_indicator_set_hsv(handle, hsv.value);
74-
#else
75-
ESP_LOGI(TAG, "LED set saturation: %d", value);
76-
return ESP_OK;
77-
#endif
46+
return led_driver_set_saturation(handle, value);
7847
}
7948

80-
static esp_err_t app_driver_light_set_temperature(led_indicator_handle_t handle, esp_matter_attr_val_t *val)
49+
static esp_err_t app_driver_light_set_temperature(led_driver_handle_t handle, esp_matter_attr_val_t *val)
8150
{
8251
uint32_t value = REMAP_TO_RANGE_INVERSE(val->val.u16, STANDARD_TEMPERATURE_FACTOR);
83-
#if CONFIG_BSP_LEDS_NUM > 0
84-
return led_indicator_set_color_temperature(handle, value);
85-
#else
86-
ESP_LOGI(TAG, "LED set temperature: %ld", value);
87-
return ESP_OK;
88-
#endif
52+
return led_driver_set_temperature(handle, value);
8953
}
9054

9155
static void app_driver_button_toggle_cb(void *arg, void *data)
@@ -108,7 +72,7 @@ esp_err_t app_driver_attribute_update(app_driver_handle_t driver_handle, uint16_
10872
{
10973
esp_err_t err = ESP_OK;
11074
if (endpoint_id == light_endpoint_id) {
111-
led_indicator_handle_t handle = (led_indicator_handle_t)driver_handle;
75+
led_driver_handle_t handle = (led_driver_handle_t)driver_handle;
11276
if (cluster_id == OnOff::Id) {
11377
if (attribute_id == OnOff::Attributes::OnOff::Id) {
11478
err = app_driver_light_set_power(handle, val);
@@ -134,7 +98,7 @@ esp_err_t app_driver_light_set_defaults(uint16_t endpoint_id)
13498
{
13599
esp_err_t err = ESP_OK;
136100
void *priv_data = endpoint::get_priv_data(endpoint_id);
137-
led_indicator_handle_t handle = (led_indicator_handle_t)priv_data;
101+
led_driver_handle_t handle = (led_driver_handle_t)priv_data;
138102
esp_matter_attr_val_t val = esp_matter_invalid(NULL);
139103

140104
/* Setting brightness */
@@ -173,24 +137,17 @@ esp_err_t app_driver_light_set_defaults(uint16_t endpoint_id)
173137

174138
app_driver_handle_t app_driver_light_init()
175139
{
176-
#if CONFIG_BSP_LEDS_NUM > 0
177140
/* Initialize led */
178-
led_indicator_handle_t leds[CONFIG_BSP_LEDS_NUM];
179-
ESP_ERROR_CHECK(bsp_led_indicator_create(leds, NULL, CONFIG_BSP_LEDS_NUM));
180-
led_indicator_set_hsv(leds[0], SET_HSV(DEFAULT_HUE, DEFAULT_SATURATION, DEFAULT_BRIGHTNESS));
181-
182-
return (app_driver_handle_t)leds[0];
183-
#else
184-
return NULL;
185-
#endif
141+
led_driver_config_t config = led_driver_get_config();
142+
led_driver_handle_t handle = led_driver_init(&config);
143+
return (app_driver_handle_t)handle;
186144
}
187145

188146
app_driver_handle_t app_driver_button_init()
189147
{
190148
/* Initialize button */
191-
button_handle_t btns[BSP_BUTTON_NUM];
192-
ESP_ERROR_CHECK(bsp_iot_button_create(btns, NULL, BSP_BUTTON_NUM));
193-
ESP_ERROR_CHECK(iot_button_register_cb(btns[0], BUTTON_PRESS_DOWN, app_driver_button_toggle_cb, NULL));
194-
195-
return (app_driver_handle_t)btns[0];
149+
button_config_t config = button_driver_get_config();
150+
button_handle_t handle = iot_button_create(&config);
151+
iot_button_register_cb(handle, BUTTON_PRESS_DOWN, app_driver_button_toggle_cb, NULL);
152+
return (app_driver_handle_t)handle;
196153
}

‎examples/light/main/app_priv.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
#endif
1717

1818
/** Standard max values (used for remapping attributes) */
19-
#define STANDARD_BRIGHTNESS 255
19+
#define STANDARD_BRIGHTNESS 100
2020
#define STANDARD_HUE 360
21-
#define STANDARD_SATURATION 255
21+
#define STANDARD_SATURATION 100
2222
#define STANDARD_TEMPERATURE_FACTOR 1000000
2323

2424
/** Matter max values (used for remapping attributes) */

‎examples/light/main/idf_component.yml

-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,3 @@ dependencies:
44
rules: # will add "optional_component" only when all if clauses are True
55
- if: "idf_version >=5.0"
66
- if: "target in [esp32c2]"
7-
esp_bsp_devkit:
8-
version: "^1.0.0"
9-
espressif/led_strip:
10-
version: "^2.0.0"

‎examples/light/sdkconfig.defaults

-9
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,3 @@ CONFIG_MBEDTLS_HKDF_C=y
4040
# Increase LwIP IPv6 address number to 6 (MAX_FABRIC + 1)
4141
# unique local addresses for fabrics(MAX_FABRIC), a link local address(1)
4242
CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
43-
44-
# ESP32-DevKitC Settings
45-
# Buttons
46-
CONFIG_BSP_BUTTONS_NUM=1
47-
CONFIG_BSP_BUTTON_1_TYPE_GPIO=y
48-
CONFIG_BSP_BUTTON_1_GPIO=0
49-
CONFIG_BSP_BUTTON_1_LEVEL=0
50-
# LEDs
51-
CONFIG_BSP_LEDS_NUM=0

‎examples/light/sdkconfig.defaults.esp32c2

-14
Original file line numberDiff line numberDiff line change
@@ -172,17 +172,3 @@ CONFIG_EVENT_LOGGING_DEBUG_BUFFER_SIZE=256
172172
# ESP Matter
173173
CONFIG_ESP_MATTER_MAX_DEVICE_TYPE_COUNT=4
174174
CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=4
175-
176-
# ESP32-C2-DevKitM-1 Settings
177-
# Buttons
178-
CONFIG_BSP_BUTTONS_NUM=1
179-
CONFIG_BSP_BUTTON_1_TYPE_GPIO=y
180-
CONFIG_BSP_BUTTON_1_GPIO=0
181-
CONFIG_BSP_BUTTON_1_LEVEL=0
182-
# LEDs
183-
CONFIG_BSP_LEDS_NUM=1
184-
CONFIG_BSP_LED_TYPE_RGB_CLASSIC=y
185-
CONFIG_BSP_LED_RGB_RED_GPIO=0
186-
CONFIG_BSP_LED_RGB_GREEN_GPIO=1
187-
CONFIG_BSP_LED_RGB_BLUE_GPIO=8
188-

‎examples/light/sdkconfig.defaults.esp32c6

-13
Original file line numberDiff line numberDiff line change
@@ -1,14 +1 @@
11
CONFIG_IDF_TARGET="esp32c6"
2-
3-
# ESP32-C6-DevKitM-1 Settings
4-
# Buttons
5-
CONFIG_BSP_BUTTONS_NUM=1
6-
CONFIG_BSP_BUTTON_1_TYPE_GPIO=y
7-
CONFIG_BSP_BUTTON_1_GPIO=9
8-
CONFIG_BSP_BUTTON_1_LEVEL=0
9-
# LEDs
10-
CONFIG_BSP_LEDS_NUM=1
11-
CONFIG_BSP_LED_TYPE_RGB=y
12-
CONFIG_BSP_LED_RGB_GPIO=8
13-
CONFIG_BSP_LED_RGB_BACKEND_RMT=y
14-

‎examples/light/sdkconfig.defaults.esp32h2

-12
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,3 @@ CONFIG_USE_MINIMAL_MDNS=n
1919

2020
# Disable STA
2121
CONFIG_ENABLE_WIFI_STATION=n
22-
23-
# ESP32-H2-DevKitM-1 Settings
24-
# Buttons
25-
CONFIG_BSP_BUTTONS_NUM=1
26-
CONFIG_BSP_BUTTON_1_TYPE_GPIO=y
27-
CONFIG_BSP_BUTTON_1_GPIO=9
28-
CONFIG_BSP_BUTTON_1_LEVEL=0
29-
# LEDs
30-
CONFIG_BSP_LEDS_NUM=1
31-
CONFIG_BSP_LED_TYPE_RGB=y
32-
CONFIG_BSP_LED_RGB_GPIO=8
33-
CONFIG_BSP_LED_RGB_BACKEND_RMT=y

‎examples/light/sdkconfig.defaults.esp32s3

-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
11
CONFIG_IDF_TARGET="esp32s3"
2-
3-
# ESP32-S3-DevKitC-1 Settings
4-
# Buttons
5-
CONFIG_BSP_BUTTONS_NUM=1
6-
CONFIG_BSP_BUTTON_1_TYPE_GPIO=y
7-
CONFIG_BSP_BUTTON_1_GPIO=0
8-
CONFIG_BSP_BUTTON_1_LEVEL=0

‎examples/light/sdkconfig.defaults.ext_plat

-10
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,3 @@ CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=n
4444

4545
# Enable HKDF in mbedtls
4646
CONFIG_MBEDTLS_HKDF_C=y
47-
48-
# ESP32-DevKit Settings
49-
# Buttons
50-
CONFIG_BSP_BUTTONS_NUM=1
51-
CONFIG_BSP_BUTTON_1_TYPE_GPIO=y
52-
CONFIG_BSP_BUTTON_1_GPIO=0
53-
CONFIG_BSP_BUTTON_1_LEVEL=0
54-
# LEDs
55-
CONFIG_BSP_LEDS_NUM=0
56-

0 commit comments

Comments
 (0)