From 2c6db1b3873ea970871f0d248b1b4954257ba5da Mon Sep 17 00:00:00 2001 From: Alex Tsitsiura Date: Fri, 22 Jul 2022 12:24:54 +0300 Subject: [PATCH] [Telink]: Update every image to 0.5.88 --- .devcontainer/devcontainer.json | 2 +- .github/workflows/bloat_check.yaml | 2 +- .github/workflows/build.yaml | 6 +-- .github/workflows/chef.yaml | 6 +-- .github/workflows/cirque.yaml | 2 +- .github/workflows/doxygen.yaml | 2 +- .github/workflows/examples-ameba.yaml | 2 +- .../workflows/examples-cc13x2x7_26x2x7.yaml | 2 +- .github/workflows/examples-efr32.yaml | 2 +- .github/workflows/examples-esp32.yaml | 4 +- .github/workflows/examples-infineon.yaml | 2 +- .github/workflows/examples-k32w.yaml | 2 +- .github/workflows/examples-linux-arm.yaml | 2 +- .../workflows/examples-linux-standalone.yaml | 2 +- .github/workflows/examples-mbed.yaml | 2 +- .github/workflows/examples-mw320.yaml | 2 +- .github/workflows/examples-nrfconnect.yaml | 2 +- .github/workflows/examples-qpg.yaml | 2 +- .github/workflows/examples-telink.yaml | 2 +- .github/workflows/examples-tizen.yaml | 2 +- .github/workflows/full-android.yaml | 2 +- .github/workflows/fuzzing-build.yaml | 2 +- .github/workflows/qemu.yaml | 2 +- .github/workflows/release_artifacts.yaml | 4 +- .github/workflows/smoketest-android.yaml | 2 +- .github/workflows/tests.yaml | 4 +- .github/workflows/unit_integration_test.yaml | 2 +- .github/workflows/zap_regeneration.yaml | 2 +- .github/workflows/zap_templates.yaml | 2 +- .gitmodules | 2 +- config/telink/app/zephyr.conf | 2 +- config/telink/chip-module/CMakeLists.txt | 2 +- examples/light-switch-app/telink/prj.conf | 2 +- examples/lighting-app/telink/prj.conf | 2 +- .../telink/project_include/OpenThreadConfig.h | 48 ------------------- integrations/cloudbuild/build-all.yaml | 4 +- integrations/cloudbuild/chef.yaml | 6 +-- integrations/cloudbuild/smoke-test.yaml | 12 ++--- src/platform/Zephyr/Logging.cpp | 2 +- third_party/telink_sdk/repo | 2 +- 40 files changed, 54 insertions(+), 102 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index ce44f93caadcea..07ff820254bede 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -17,7 +17,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - "BUILD_VERSION": "0.5.84" + "BUILD_VERSION": "0.5.88" } }, "remoteUser": "vscode", diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml index 3e6e6856a8c0ce..bc3e0b255bdbb7 100644 --- a/.github/workflows/bloat_check.yaml +++ b/.github/workflows/bloat_check.yaml @@ -30,7 +30,7 @@ jobs: runs-on: ubuntu-latest container: - image: connectedhomeip/chip-build:0.5.84 + image: connectedhomeip/chip-build:0.5.88 steps: - uses: Wandalen/wretry.action@v1.0.15 diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f5f78507aa134d..608f24e9e98b7a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -32,7 +32,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.5.84 + image: connectedhomeip/chip-build:0.5.88 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -128,7 +128,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.5.84 + image: connectedhomeip/chip-build:0.5.88 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 @@ -279,7 +279,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.5.84 + image: connectedhomeip/chip-build:0.5.88 volumes: - "/tmp/log_output:/tmp/test_logs" options: --sysctl "net.ipv6.conf.all.disable_ipv6=0 diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml index 7a3e9f86bd7946..0eeaada141a22e 100644 --- a/.github/workflows/chef.yaml +++ b/.github/workflows/chef.yaml @@ -30,7 +30,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.5.84 + image: connectedhomeip/chip-build:0.5.88 options: --user root steps: @@ -58,7 +58,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-esp32:0.5.84 + image: connectedhomeip/chip-build-esp32:0.5.88 options: --user root steps: @@ -86,7 +86,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-nrf-platform:0.5.84 + image: connectedhomeip/chip-build-nrf-platform:0.5.88 options: --user root steps: diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml index 0ecc922ef25e82..603eed8217b419 100644 --- a/.github/workflows/cirque.yaml +++ b/.github/workflows/cirque.yaml @@ -38,7 +38,7 @@ jobs: # need to run with privilege, which isn't supported by job.XXX.contaner # https://github.com/actions/container-action/issues/2 # container: - # image: connectedhomeip/chip-build-cirque:0.5.84 + # image: connectedhomeip/chip-build-cirque:0.5.88 # volumes: # - "/tmp:/tmp" # - "/dev/pts:/dev/pts" diff --git a/.github/workflows/doxygen.yaml b/.github/workflows/doxygen.yaml index ec6cb8671a44af..7a051a706d4815 100644 --- a/.github/workflows/doxygen.yaml +++ b/.github/workflows/doxygen.yaml @@ -82,7 +82,7 @@ jobs: runs-on: ubuntu-20.04 container: - image: connectedhomeip/chip-build-doxygen:0.5.84 + image: connectedhomeip/chip-build-doxygen:0.5.88 if: github.actor != 'restyled-io[bot]' diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml index 08e8a0a46bac75..2fa6f081f98013 100644 --- a/.github/workflows/examples-ameba.yaml +++ b/.github/workflows/examples-ameba.yaml @@ -32,7 +32,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-ameba:0.5.84 + image: connectedhomeip/chip-build-ameba:0.5.88 options: --user root steps: diff --git a/.github/workflows/examples-cc13x2x7_26x2x7.yaml b/.github/workflows/examples-cc13x2x7_26x2x7.yaml index 3e9612c5823a0a..3d703d9cb8eb68 100644 --- a/.github/workflows/examples-cc13x2x7_26x2x7.yaml +++ b/.github/workflows/examples-cc13x2x7_26x2x7.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-ti:0.5.84 + image: connectedhomeip/chip-build-ti:0.5.88 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml index 71b556a4bc0a6a..058ff2b616cbb8 100644 --- a/.github/workflows/examples-efr32.yaml +++ b/.github/workflows/examples-efr32.yaml @@ -35,7 +35,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-efr32:0.5.84 + image: connectedhomeip/chip-build-efr32:0.5.88 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml index 839913cd2ebc05..1fd0e708af1fc7 100644 --- a/.github/workflows/examples-esp32.yaml +++ b/.github/workflows/examples-esp32.yaml @@ -32,7 +32,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-esp32:0.5.84 + image: connectedhomeip/chip-build-esp32:0.5.88 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" @@ -118,7 +118,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-esp32:0.5.84 + image: connectedhomeip/chip-build-esp32:0.5.88 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml index f6b45a7f4b6fa0..fb655aba77617b 100644 --- a/.github/workflows/examples-infineon.yaml +++ b/.github/workflows/examples-infineon.yaml @@ -32,7 +32,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-infineon:0.5.84 + image: connectedhomeip/chip-build-infineon:0.5.88 steps: - uses: Wandalen/wretry.action@v1.0.15 diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml index 9885e1e43788b6..87f0c54d9224f2 100644 --- a/.github/workflows/examples-k32w.yaml +++ b/.github/workflows/examples-k32w.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-k32w:0.5.84 + image: connectedhomeip/chip-build-k32w:0.5.88 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml index ec0ff24c12251e..454d76b2524250 100644 --- a/.github/workflows/examples-linux-arm.yaml +++ b/.github/workflows/examples-linux-arm.yaml @@ -31,7 +31,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-crosscompile:0.5.84 + image: connectedhomeip/chip-build-crosscompile:0.5.88 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml index 6aefd6d6e4a4ff..b69ae4fe63a58c 100644 --- a/.github/workflows/examples-linux-standalone.yaml +++ b/.github/workflows/examples-linux-standalone.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.5.84 + image: connectedhomeip/chip-build:0.5.88 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml index 5facc4ae1d6bba..b60376929ef523 100644 --- a/.github/workflows/examples-mbed.yaml +++ b/.github/workflows/examples-mbed.yaml @@ -37,7 +37,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-mbed-os:0.5.84 + image: connectedhomeip/chip-build-mbed-os:0.5.88 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-mw320.yaml b/.github/workflows/examples-mw320.yaml index c22e74b8c86c8a..9a03dca15f5901 100755 --- a/.github/workflows/examples-mw320.yaml +++ b/.github/workflows/examples-mw320.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.5.84 + image: connectedhomeip/chip-build:0.5.88 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml index e1c06b6a4a3abb..fdc6c9ce7cd52c 100644 --- a/.github/workflows/examples-nrfconnect.yaml +++ b/.github/workflows/examples-nrfconnect.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-nrf-platform:0.5.84 + image: connectedhomeip/chip-build-nrf-platform:0.5.88 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml index b903c0d1d1ba66..6785f7bb1a8b40 100644 --- a/.github/workflows/examples-qpg.yaml +++ b/.github/workflows/examples-qpg.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.5.84 + image: connectedhomeip/chip-build:0.5.88 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" steps: diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml index c74de0749c66ed..03f3d78b511726 100644 --- a/.github/workflows/examples-telink.yaml +++ b/.github/workflows/examples-telink.yaml @@ -32,7 +32,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-telink:0.5.84 + image: connectedhomeip/chip-build-telink:0.5.88 volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml index b34e6426ecfa5c..4a2a02f8d64335 100644 --- a/.github/workflows/examples-tizen.yaml +++ b/.github/workflows/examples-tizen.yaml @@ -32,7 +32,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-tizen:0.5.84 + image: connectedhomeip/chip-build-tizen:0.5.88 options: --user root volumes: - "/tmp/bloat_reports:/tmp/bloat_reports" diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml index 87079eee23e86c..329e3944006382 100644 --- a/.github/workflows/full-android.yaml +++ b/.github/workflows/full-android.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-android:0.5.84 + image: connectedhomeip/chip-build-android:0.5.88 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/fuzzing-build.yaml b/.github/workflows/fuzzing-build.yaml index 70f3a88f8fcc5a..2cd0023cc0206b 100644 --- a/.github/workflows/fuzzing-build.yaml +++ b/.github/workflows/fuzzing-build.yaml @@ -31,7 +31,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build:0.5.84 + image: connectedhomeip/chip-build:0.5.88 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml index 30e70d95ec452d..3d22222cecc79f 100644 --- a/.github/workflows/qemu.yaml +++ b/.github/workflows/qemu.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-esp32-qemu:0.5.84 + image: connectedhomeip/chip-build-esp32-qemu:0.5.88 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml index 60c4cc1454c128..5cd352d2fc5aa1 100644 --- a/.github/workflows/release_artifacts.yaml +++ b/.github/workflows/release_artifacts.yaml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest container: - image: connectedhomeip/chip-build-esp32:0.5.84 + image: connectedhomeip/chip-build-esp32:0.5.88 steps: - uses: Wandalen/wretry.action@v1.0.15 @@ -75,7 +75,7 @@ jobs: runs-on: ubuntu-latest container: - image: connectedhomeip/chip-build-efr32:0.5.84 + image: connectedhomeip/chip-build-efr32:0.5.88 steps: - uses: Wandalen/wretry.action@v1.0.15 name: Checkout diff --git a/.github/workflows/smoketest-android.yaml b/.github/workflows/smoketest-android.yaml index aae77701773fd1..b3eb88cc91b654 100644 --- a/.github/workflows/smoketest-android.yaml +++ b/.github/workflows/smoketest-android.yaml @@ -34,7 +34,7 @@ jobs: if: github.actor != 'restyled-io[bot]' container: - image: connectedhomeip/chip-build-android:0.5.84 + image: connectedhomeip/chip-build-android:0.5.88 volumes: - "/tmp/log_output:/tmp/test_logs" diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index a89692f6c50655..a41a07e595dc38 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest container: - image: connectedhomeip/chip-build:0.5.84 + image: connectedhomeip/chip-build:0.5.88 options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1" @@ -239,7 +239,7 @@ jobs: runs-on: ubuntu-latest container: - image: connectedhomeip/chip-build:0.5.84 + image: connectedhomeip/chip-build:0.5.88 options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1" diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml index be8ff0af07bb06..b120191b224c85 100644 --- a/.github/workflows/unit_integration_test.yaml +++ b/.github/workflows/unit_integration_test.yaml @@ -37,7 +37,7 @@ jobs: runs-on: ubuntu-latest container: - image: connectedhomeip/chip-build:0.5.84 + image: connectedhomeip/chip-build:0.5.88 volumes: - "/tmp/log_output:/tmp/test_logs" options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1" diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml index 0f8a3bf232dc19..8bb7f609d67210 100644 --- a/.github/workflows/zap_regeneration.yaml +++ b/.github/workflows/zap_regeneration.yaml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-20.04 container: - image: connectedhomeip/chip-build-zap:0.5.84 + image: connectedhomeip/chip-build-zap:0.5.88 defaults: run: shell: sh diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml index 6d1b2f2e59682a..11e3f210d7684e 100644 --- a/.github/workflows/zap_templates.yaml +++ b/.github/workflows/zap_templates.yaml @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-20.04 container: - image: connectedhomeip/chip-build-zap:0.5.84 + image: connectedhomeip/chip-build-zap:0.5.88 defaults: run: shell: sh diff --git a/.gitmodules b/.gitmodules index 0c00fa444bedb5..16d589e739d539 100644 --- a/.gitmodules +++ b/.gitmodules @@ -225,7 +225,7 @@ platforms = p6 [submodule "third_party/telink_sdk/repo"] path = third_party/telink_sdk/repo - url = https://github.com/rikorsev/telink_b91_ble_sdk + url = https://github.com/telink-semi/telink_b91_ble_single_connection_sdk_matter platforms = telink [submodule "ti_simplelink_sdk"] path = third_party/ti_simplelink_sdk/repo_cc13xx_cc26xx diff --git a/config/telink/app/zephyr.conf b/config/telink/app/zephyr.conf index 080ea97ce4e475..92944dbed8616f 100644 --- a/config/telink/app/zephyr.conf +++ b/config/telink/app/zephyr.conf @@ -66,7 +66,7 @@ CONFIG_OPENTHREAD_DEBUG=y CONFIG_OPENTHREAD_L2_DEBUG=y CONFIG_OPENTHREAD_L2_LOG_LEVEL_INF=y -CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="IEEE802154_b91" +CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="IEEE802154" CONFIG_NET_CONFIG_MY_IPV6_ADDR="fdde:ad00:beef::1" CONFIG_NET_CONFIG_PEER_IPV6_ADDR="fdde:ad00:beef::2" diff --git a/config/telink/chip-module/CMakeLists.txt b/config/telink/chip-module/CMakeLists.txt index cb4a0cd0424a57..21b01472bf427d 100644 --- a/config/telink/chip-module/CMakeLists.txt +++ b/config/telink/chip-module/CMakeLists.txt @@ -101,7 +101,7 @@ set(GN_ROOT_TARGET ${CHIP_ROOT}/config/telink/chip-gn) if (CONFIG_POSIX_API) list(APPEND CHIP_CFLAGS -D_SYS__PTHREADTYPES_H_ - -isystem${ZEPHYR_BASE}/include/posix + -isystem${ZEPHYR_BASE}/include/zephyr/posix ) endif() diff --git a/examples/light-switch-app/telink/prj.conf b/examples/light-switch-app/telink/prj.conf index c7946f01819c34..7d492d122486e8 100755 --- a/examples/light-switch-app/telink/prj.conf +++ b/examples/light-switch-app/telink/prj.conf @@ -33,7 +33,7 @@ CONFIG_OPENTHREAD_PANID=4660 CONFIG_OPENTHREAD_CHANNEL=15 CONFIG_OPENTHREAD_NETWORK_NAME="OpenThreadDemo" CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" -CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="IEEE802154_b91" +CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="IEEE802154" # CHIP configuration CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h" diff --git a/examples/lighting-app/telink/prj.conf b/examples/lighting-app/telink/prj.conf index 93670fc50320f6..064f8a040a255e 100644 --- a/examples/lighting-app/telink/prj.conf +++ b/examples/lighting-app/telink/prj.conf @@ -33,7 +33,7 @@ CONFIG_OPENTHREAD_PANID=4660 CONFIG_OPENTHREAD_CHANNEL=15 CONFIG_OPENTHREAD_NETWORK_NAME="OpenThreadDemo" CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22" -CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="IEEE802154_b91" +CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="IEEE802154" # CHIP configuration CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h" diff --git a/examples/platform/telink/project_include/OpenThreadConfig.h b/examples/platform/telink/project_include/OpenThreadConfig.h index d7826919cac308..cbd5e19f591da5 100644 --- a/examples/platform/telink/project_include/OpenThreadConfig.h +++ b/examples/platform/telink/project_include/OpenThreadConfig.h @@ -42,62 +42,14 @@ #define OPENTHREAD_CONFIG_ENABLE_DEBUG_UART 1 -#undef OPENTHREAD_CONFIG_LOG_API -#define OPENTHREAD_CONFIG_LOG_API 0 - -#undef OPENTHREAD_CONFIG_LOG_ARP -#define OPENTHREAD_CONFIG_LOG_ARP 0 - -#undef OPENTHREAD_CONFIG_LOG_BB -#define OPENTHREAD_CONFIG_LOG_BBR 0 - #undef OPENTHREAD_CONFIG_LOG_CLI #define OPENTHREAD_CONFIG_LOG_CLI 0 -#undef OPENTHREAD_CONFIG_LOG_COAP -#define OPENTHREAD_CONFIG_LOG_COAP 0 - -#undef OPENTHREAD_CONFIG_LOG_DUA -#define OPENTHREAD_CONFIG_LOG_DUA 0 - -#undef OPENTHREAD_CONFIG_LOG_ICMP -#define OPENTHREAD_CONFIG_LOG_ICMP 0 - -#undef OPENTHREAD_CONFIG_LOG_IP6 -#define OPENTHREAD_CONFIG_LOG_IP6 0 - -#undef OPENTHREAD_CONFIG_LOG_MAC -#define OPENTHREAD_CONFIG_LOG_MAC 0 - -#undef OPENTHREAD_CONFIG_LOG_MEM -#define OPENTHREAD_CONFIG_LOG_MEM 0 - -#undef OPENTHREAD_CONFIG_LOG_MESHCOP -#define OPENTHREAD_CONFIG_LOG_MESHCOP 0 - -#undef OPENTHREAD_CONFIG_LOG_MLE -#define OPENTHREAD_CONFIG_LOG_MLE 0 - -#undef OPENTHREAD_CONFIG_LOG_MLR -#define OPENTHREAD_CONFIG_LOG_MLR 0 - -#undef OPENTHREAD_CONFIG_LOG_NETDATA -#define OPENTHREAD_CONFIG_LOG_NETDATA 0 - -#undef OPENTHREAD_CONFIG_LOG_NETDIAG -#define OPENTHREAD_CONFIG_LOG_NETDIAG 0 - #undef OPENTHREAD_CONFIG_LOG_PKT_DUMP #define OPENTHREAD_CONFIG_LOG_PKT_DUMP 0 -#undef OPENTHREAD_CONFIG_LOG_SRP -#define OPENTHREAD_CONFIG_LOG_SRP 0 - #undef OPENTHREAD_CONFIG_LOG_PLATFORM #define OPENTHREAD_CONFIG_LOG_PLATFORM 0 #undef OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL #define OPENTHREAD_CONFIG_LOG_PREPEND_LEVEL 0 - -#undef OPENTHREAD_CONFIG_LOG_PREPEND_REGION -#define OPENTHREAD_CONFIG_LOG_PREPEND_REGION 0 diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml index 6ceb9183df321c..81a52ac3b398a6 100644 --- a/integrations/cloudbuild/build-all.yaml +++ b/integrations/cloudbuild/build-all.yaml @@ -1,5 +1,5 @@ steps: - - name: "connectedhomeip/chip-build-vscode:0.5.84" + - name: "connectedhomeip/chip-build-vscode:0.5.88" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -12,7 +12,7 @@ steps: path: /pwenv timeout: 900s - - name: "connectedhomeip/chip-build-vscode:0.5.84" + - name: "connectedhomeip/chip-build-vscode:0.5.88" env: - PW_ENVIRONMENT_ROOT=/pwenv args: diff --git a/integrations/cloudbuild/chef.yaml b/integrations/cloudbuild/chef.yaml index ce4145250ef011..ee190933991cb0 100644 --- a/integrations/cloudbuild/chef.yaml +++ b/integrations/cloudbuild/chef.yaml @@ -1,5 +1,5 @@ steps: - - name: "connectedhomeip/chip-build-vscode:0.5.84" + - name: "connectedhomeip/chip-build-vscode:0.5.88" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -12,7 +12,7 @@ steps: path: /pwenv timeout: 900s - - name: "connectedhomeip/chip-build-vscode:0.5.84" + - name: "connectedhomeip/chip-build-vscode:0.5.88" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -26,7 +26,7 @@ steps: - name: pwenv path: /pwenv - - name: "connectedhomeip/chip-build-vscode:0.5.84" + - name: "connectedhomeip/chip-build-vscode:0.5.88" env: - PW_ENVIRONMENT_ROOT=/pwenv args: diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml index 1ef4c8e4210016..670f39d09e93a0 100644 --- a/integrations/cloudbuild/smoke-test.yaml +++ b/integrations/cloudbuild/smoke-test.yaml @@ -1,5 +1,5 @@ steps: - - name: "connectedhomeip/chip-build-vscode:0.5.84" + - name: "connectedhomeip/chip-build-vscode:0.5.88" env: - PW_ENVIRONMENT_ROOT=/pwenv args: @@ -12,7 +12,7 @@ steps: path: /pwenv timeout: 900s - - name: "connectedhomeip/chip-build-vscode:0.5.84" + - name: "connectedhomeip/chip-build-vscode:0.5.88" id: ESP32 env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -28,7 +28,7 @@ steps: - name: pwenv path: /pwenv - - name: "connectedhomeip/chip-build-vscode:0.5.84" + - name: "connectedhomeip/chip-build-vscode:0.5.88" id: NRFConnect env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -45,7 +45,7 @@ steps: - name: pwenv path: /pwenv - - name: "connectedhomeip/chip-build-vscode:0.5.84" + - name: "connectedhomeip/chip-build-vscode:0.5.88" id: EFR32 env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -62,7 +62,7 @@ steps: - name: pwenv path: /pwenv - - name: "connectedhomeip/chip-build-vscode:0.5.84" + - name: "connectedhomeip/chip-build-vscode:0.5.88" id: Linux env: - PW_ENVIRONMENT_ROOT=/pwenv @@ -79,7 +79,7 @@ steps: - name: pwenv path: /pwenv - - name: "connectedhomeip/chip-build-vscode:0.5.84" + - name: "connectedhomeip/chip-build-vscode:0.5.88" id: Android env: - PW_ENVIRONMENT_ROOT=/pwenv diff --git a/src/platform/Zephyr/Logging.cpp b/src/platform/Zephyr/Logging.cpp index 5fb3b98aea5c40..f65a5bbf472d33 100644 --- a/src/platform/Zephyr/Logging.cpp +++ b/src/platform/Zephyr/Logging.cpp @@ -49,7 +49,7 @@ void ENFORCE_FORMAT(3, 0) LogV(const char * module, uint8_t category, const char const size_t prefixLen = strlen(formattedMsg); vsnprintfcb(formattedMsg + prefixLen, sizeof(formattedMsg) - prefixLen, msg, v); - const char * allocatedMsg = log_strdup(formattedMsg); + const char * allocatedMsg = formattedMsg; // Invoke the Zephyr logging library to log the message. // diff --git a/third_party/telink_sdk/repo b/third_party/telink_sdk/repo index acb77b52970a5c..6a3cb0a3615cf7 160000 --- a/third_party/telink_sdk/repo +++ b/third_party/telink_sdk/repo @@ -1 +1 @@ -Subproject commit acb77b52970a5c0a7f5d81273a2f49c884c880dd +Subproject commit 6a3cb0a3615cf7f2f0418440d3ae9d93f6f3e595