From 878d3e6fb87e6a060253d9d287988b3165a88699 Mon Sep 17 00:00:00 2001 From: Shu Chen Date: Thu, 26 May 2022 23:07:03 +0800 Subject: [PATCH] ci: fix ci and add esp32h2 build --- .gitlab-ci.yml | 15 ++++++++++++--- .gitmodules | 2 +- examples/switch/sdkconfig.defaults.esp32h2 | 14 +++++++++----- examples/zap_light/sdkconfig.defaults.esp32h2 | 15 +++++++++------ 4 files changed, 31 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4448db806..1be7c32ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,10 +78,19 @@ variables: - idf.py build - cp sdkconfig.defaults.backup sdkconfig.defaults -.build_bridge_zigbee_app: &build_bridge_zigbee_app - - cd $ESP_MATTER_PATH/examples/bridge_zigbee +.build_examples_idf_v5_0: &build_examples_idf_v5_0 # pyparsing in python_env created by matter is version 2.4.0 IDF v5.0 requires 3.0.8 - pip install pyparsing==3.0.8 + - cd $ESP_MATTER_PATH/examples/zap_light + - idf.py --preview set-target esp32h2 + - idf.py build + - cd $ESP_MATTER_PATH/examples/switch + - idf.py --preview set-target esp32h2 + - idf.py build + - cd $ESP_MATTER_PATH/examples/light + - idf.py --preview set-target esp32h2 + - idf.py build + - cd $ESP_MATTER_PATH/examples/bridge_zigbee - idf.py set-target esp32 - idf.py build @@ -114,7 +123,7 @@ build_esp_matter_examples_idf_v5_0: - *chip_submodule_update - *setup_idf_v5_0 - *setup_matter - - *build_bridge_zigbee_app + - *build_examples_idf_v5_0 build_upstream_examples: stage: build diff --git a/.gitmodules b/.gitmodules index 8ae0c1616..908740f27 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "connectedhomeip"] +[submodule "connectedhomeip/connectedhomeip"] path = connectedhomeip/connectedhomeip url = https://github.com/espressif/connectedhomeip.git diff --git a/examples/switch/sdkconfig.defaults.esp32h2 b/examples/switch/sdkconfig.defaults.esp32h2 index fb483329a..b94164d2f 100644 --- a/examples/switch/sdkconfig.defaults.esp32h2 +++ b/examples/switch/sdkconfig.defaults.esp32h2 @@ -17,11 +17,15 @@ CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y # It will be merge to bt component soon CONFIG_BT_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y -CONFIG_NEWTOS_ENABLE=n -CONFIG_BLE_50_FEATURE_SUPPORT=y -CONFIG_BLE_HCI_UART_BAUD=921600 -CONFIG_BLE_EXT_ADV=n -CONFIG_BLE_LOG_LEVEL=1 +CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=y +CONFIG_BT_NIMBLE_EXT_ADV=n +CONFIG_BT_NIMBLE_USE_ESP_TIMER=n +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n +CONFIG_BTDM_CTRL_MODE_BTDM=n + +# FreeRTOS should use legacy API +CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y # Enable OpenThread CONFIG_OPENTHREAD_ENABLED=y diff --git a/examples/zap_light/sdkconfig.defaults.esp32h2 b/examples/zap_light/sdkconfig.defaults.esp32h2 index ccc23de7a..afc0fdcc8 100644 --- a/examples/zap_light/sdkconfig.defaults.esp32h2 +++ b/examples/zap_light/sdkconfig.defaults.esp32h2 @@ -17,11 +17,15 @@ CONFIG_LIBSODIUM_USE_MBEDTLS_SHA=y # It will be merge to bt component soon CONFIG_BT_ENABLED=y CONFIG_BT_NIMBLE_ENABLED=y -CONFIG_NEWTOS_ENABLE=n -CONFIG_BLE_50_FEATURE_SUPPORT=y -CONFIG_BLE_HCI_UART_BAUD=921600 -CONFIG_BLE_EXT_ADV=n -CONFIG_BLE_LOG_LEVEL=1 +CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT=y +CONFIG_BT_NIMBLE_EXT_ADV=n +CONFIG_BT_NIMBLE_USE_ESP_TIMER=n +CONFIG_BTDM_CTRL_MODE_BLE_ONLY=y +CONFIG_BTDM_CTRL_MODE_BR_EDR_ONLY=n +CONFIG_BTDM_CTRL_MODE_BTDM=n + +# FreeRTOS should use legacy API +CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y # Enable OpenThread CONFIG_OPENTHREAD_ENABLED=y @@ -52,7 +56,6 @@ CONFIG_MBEDTLS_KEY_EXCHANGE_ECJPAKE=y CONFIG_USE_MINIMAL_MDNS=n # Increase stacks size -CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096 CONFIG_NIMBLE_CONTROLLER_TASK_STACK_SIZE=5120 CONFIG_NIMBLE_HOST_TASK_STACK_SIZE=5120