From 08f17982ae7bbb9d286072d2736646db53739e12 Mon Sep 17 00:00:00 2001 From: Pavel Borcin Date: Thu, 9 May 2024 15:12:29 +0200 Subject: [PATCH] change refrigerator example to use bsp --- examples/refrigerator/CMakeLists.txt | 20 ------------------- examples/refrigerator/main/app_driver.cpp | 8 ++++---- examples/refrigerator/main/idf_component.yml | 2 ++ .../refrigerator/sdkconfig.defaults.esp32c2 | 7 +++++++ .../refrigerator/sdkconfig.defaults.esp32c6 | 6 ++++++ .../refrigerator/sdkconfig.defaults.esp32h2 | 7 +++++++ 6 files changed, 26 insertions(+), 24 deletions(-) diff --git a/examples/refrigerator/CMakeLists.txt b/examples/refrigerator/CMakeLists.txt index 5cd714c0c..9b7a8d43d 100644 --- a/examples/refrigerator/CMakeLists.txt +++ b/examples/refrigerator/CMakeLists.txt @@ -6,24 +6,6 @@ if(NOT DEFINED ENV{ESP_MATTER_PATH}) message(FATAL_ERROR "Please set ESP_MATTER_PATH to the path of esp-matter repo") endif(NOT DEFINED ENV{ESP_MATTER_PATH}) -if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH}) - if("${IDF_TARGET}" STREQUAL "esp32" OR "${IDF_TARGET}" STREQUAL "") - set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32_devkit_c) - elseif("${IDF_TARGET}" STREQUAL "esp32c3") - set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c3_devkit_m) - elseif("${IDF_TARGET}" STREQUAL "esp32c2") - set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c2_devkit_m) - elseif("${IDF_TARGET}" STREQUAL "esp32h2") - set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32h2_devkit_c) - elseif("${IDF_TARGET}" STREQUAL "esp32s3") - set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s3_devkit_c) - elseif("${IDF_TARGET}" STREQUAL "esp32c6") - set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c6_devkit_c) - else() - message(FATAL_ERROR "Unsupported IDF_TARGET") - endif() -endif(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH}) - set(PROJECT_VER "v1.0") set(PROJECT_VER_NUMBER 1) @@ -33,14 +15,12 @@ set(ZAP_GENERATED_PATH ${CMAKE_CURRENT_LIST_DIR}/main/zap-generated) # This should be done before using the IDF_TARGET variable. include($ENV{IDF_PATH}/tools/cmake/project.cmake) -include($ENV{ESP_MATTER_DEVICE_PATH}/esp_matter_device.cmake) include(${ESP_MATTER_PATH}/examples/common/cmake_common/components_include.cmake) set(EXTRA_COMPONENT_DIRS "${ESP_MATTER_PATH}/examples/common" "${MATTER_SDK_PATH}/config/esp32/components" "${ESP_MATTER_PATH}/components" - "${ESP_MATTER_PATH}/device_hal/device" ${extra_components_dirs_append}) project(light_switch) diff --git a/examples/refrigerator/main/app_driver.cpp b/examples/refrigerator/main/app_driver.cpp index 47f377ed6..6bbe4f882 100644 --- a/examples/refrigerator/main/app_driver.cpp +++ b/examples/refrigerator/main/app_driver.cpp @@ -6,7 +6,7 @@ CONDITIONS OF ANY KIND, either express or implied. */ -#include +#include "bsp/esp-bsp.h" #include #include @@ -14,8 +14,8 @@ app_driver_handle_t app_driver_button_init() { /* Initialize button */ - button_config_t config = button_driver_get_config(); - button_handle_t handle = iot_button_create(&config); + button_handle_t btns[BSP_BUTTON_NUM]; + ESP_ERROR_CHECK(bsp_iot_button_create(btns, NULL, BSP_BUTTON_NUM)); - return (app_driver_handle_t)handle; + return (app_driver_handle_t)btns[0]; } diff --git a/examples/refrigerator/main/idf_component.yml b/examples/refrigerator/main/idf_component.yml index 95ee7845b..83c8cbb27 100644 --- a/examples/refrigerator/main/idf_component.yml +++ b/examples/refrigerator/main/idf_component.yml @@ -4,3 +4,5 @@ dependencies: rules: # will add "optional_component" only when all if clauses are True - if: "idf_version >=5.0" - if: "target in [esp32c2]" + espressif/esp_bsp_generic: + version: "^1.1.0" diff --git a/examples/refrigerator/sdkconfig.defaults.esp32c2 b/examples/refrigerator/sdkconfig.defaults.esp32c2 index 2aa4921dc..471130987 100644 --- a/examples/refrigerator/sdkconfig.defaults.esp32c2 +++ b/examples/refrigerator/sdkconfig.defaults.esp32c2 @@ -169,3 +169,10 @@ CONFIG_ESP_MATTER_MAX_DYNAMIC_ENDPOINT_COUNT=4 CONFIG_CU_RELINKER_ENABLE=y CONFIG_CU_RELINKER_ENABLE_CUSTOMIZED_CONFIGURATION_FILES=y CONFIG_CU_RELINKER_CUSTOMIZED_CONFIGURATION_FILES_PATH="../common/relinker/esp32c2" + +# ESP32-C2-DevKitM-1 Settings +# Buttons +CONFIG_BSP_BUTTONS_NUM=1 +CONFIG_BSP_BUTTON_1_TYPE_GPIO=y +CONFIG_BSP_BUTTON_1_GPIO=0 +CONFIG_BSP_BUTTON_1_LEVEL=0 diff --git a/examples/refrigerator/sdkconfig.defaults.esp32c6 b/examples/refrigerator/sdkconfig.defaults.esp32c6 index 42508614a..8c6594280 100644 --- a/examples/refrigerator/sdkconfig.defaults.esp32c6 +++ b/examples/refrigerator/sdkconfig.defaults.esp32c6 @@ -38,3 +38,9 @@ CONFIG_BUTTON_LONG_PRESS_TIME_MS=5000 # Enable chip shell CONFIG_ENABLE_CHIP_SHELL=y +# ESP32-C6-DevKitM-1 Settings +# Buttons +CONFIG_BSP_BUTTONS_NUM=1 +CONFIG_BSP_BUTTON_1_TYPE_GPIO=y +CONFIG_BSP_BUTTON_1_GPIO=9 +CONFIG_BSP_BUTTON_1_LEVEL=0 diff --git a/examples/refrigerator/sdkconfig.defaults.esp32h2 b/examples/refrigerator/sdkconfig.defaults.esp32h2 index fef128357..64b7cd4f4 100644 --- a/examples/refrigerator/sdkconfig.defaults.esp32h2 +++ b/examples/refrigerator/sdkconfig.defaults.esp32h2 @@ -73,3 +73,10 @@ CONFIG_ENABLE_CHIP_SHELL=y # Enable DS Peripheral CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL=y + +# ESP32-H2-DevKitM-1 Settings +# Buttons +CONFIG_BSP_BUTTONS_NUM=1 +CONFIG_BSP_BUTTON_1_TYPE_GPIO=y +CONFIG_BSP_BUTTON_1_GPIO=9 +CONFIG_BSP_BUTTON_1_LEVEL=0