From 4327af481d18d18883fcab5d02fe5c45d85fa931 Mon Sep 17 00:00:00 2001 From: rgoliver Date: Wed, 15 Jun 2022 10:50:26 -0400 Subject: [PATCH] Pigweed: Update to 67bc89cdda8c (#19560) --- config/ameba/chip.cmake | 2 +- .../bouffalolab/bl602/lib/pw_rpc/pw_rpc.gni | 2 +- config/efr32/lib/pw_rpc/pw_rpc.gni | 2 +- config/esp32/components/chip/CMakeLists.txt | 4 +- config/mbed/CMakeLists.txt | 3 +- config/mbed/chip-gn/lib/pw_rpc/pw_rpc.gni | 2 +- config/nrfconnect/chip-module/CMakeLists.txt | 2 +- config/qpg/lib/pw_rpc/pw_rpc.gni | 2 +- .../all-clusters-app/ameba/chip_main.cmake | 15 +- .../all-clusters-app/esp32/CMakeLists.txt | 3 +- .../esp32/main/CMakeLists.txt | 14 +- .../ameba/chip_main.cmake | 268 ++++++++++++++++++ .../esp32/main/CMakeLists.txt | 261 +++++++++++++++++ examples/chef/efr32/args.gni | 2 +- examples/chef/efr32/build_for_wifi_args.gni | 2 +- examples/chef/esp32/CMakeLists.txt | 3 +- examples/chef/esp32/main/CMakeLists.txt | 6 +- examples/chef/linux/with_pw_rpc.gni | 2 +- examples/chef/nrfconnect/CMakeLists.txt | 70 ++--- examples/ipv6only-app/esp32/CMakeLists.txt | 3 +- examples/light-switch-app/efr32/args.gni | 2 +- .../efr32/build_for_wifi_args.gni | 2 +- .../lighting-app/bouffalolab/bl602/args.gni | 2 +- examples/lighting-app/efr32/args.gni | 2 +- .../efr32/build_for_wifi_args.gni | 2 +- examples/lighting-app/linux/with_pw_rpc.gni | 2 +- .../lighting-app/nrfconnect/CMakeLists.txt | 17 +- examples/lighting-app/qpg/args.gni | 2 +- examples/lock-app/efr32/args.gni | 2 +- .../lock-app/efr32/build_for_wifi_args.gni | 2 +- examples/lock-app/esp32/CMakeLists.txt | 3 +- examples/lock-app/esp32/main/CMakeLists.txt | 8 +- examples/lock-app/qpg/args.gni | 2 +- examples/ota-requestor-app/efr32/args.gni | 2 +- .../ota-requestor-app/esp32/CMakeLists.txt | 21 ++ .../esp32/main/CMakeLists.txt | 104 ++++++- examples/persistent-storage/efr32/args.gni | 2 +- examples/pigweed-app/ameba/chip_main.cmake | 3 +- examples/pigweed-app/esp32/CMakeLists.txt | 3 +- .../pigweed-app/nrfconnect/CMakeLists.txt | 3 +- .../nrfconnect/pw_sys_io/CMakeLists.txt | 1 + examples/shell/efr32/args.gni | 2 +- examples/shell/qpg/args.gni | 2 +- .../esp32/CMakeLists.txt | 4 +- .../esp32/main/CMakeLists.txt | 10 +- examples/window-app/efr32/args.gni | 2 +- .../window-app/efr32/build_for_wifi_args.gni | 2 +- third_party/pigweed/repo | 2 +- 48 files changed, 773 insertions(+), 106 deletions(-) create mode 100755 examples/all-clusters-minimal-app/ameba/chip_main.cmake create mode 100644 examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt diff --git a/config/ameba/chip.cmake b/config/ameba/chip.cmake index 40dc11bd659711..0f5cd186367b0f 100644 --- a/config/ameba/chip.cmake +++ b/config/ameba/chip.cmake @@ -110,7 +110,7 @@ if (matter_enable_rpc) #string(APPEND CHIP_GN_ARGS "remove_default_configs = [\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_build:cpp17\"]\n") string(APPEND CHIP_GN_ARGS "chip_build_pw_rpc_lib = true\n") string(APPEND CHIP_GN_ARGS "pw_log_BACKEND = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_log_basic\"\n") -string(APPEND CHIP_GN_ARGS "pw_assert_BACKEND = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert_log\"\n") +string(APPEND CHIP_GN_ARGS "pw_assert_BACKEND = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert_log:check_backend\"\n") string(APPEND CHIP_GN_ARGS "pw_sys_io_BACKEND = \"//third_party/connectedhomeip/examples/platform/ameba/pw_sys_io:pw_sys_io_ameba\"\n") string(APPEND CHIP_GN_ARGS "dir_pw_third_party_nanopb = \"//third_party/connectedhomeip/third_party/nanopb/repo\"\n") string(APPEND CHIP_GN_ARGS "pw_build_LINK_DEPS = [\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert:impl\", \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_log:impl\"]\n") diff --git a/config/bouffalolab/bl602/lib/pw_rpc/pw_rpc.gni b/config/bouffalolab/bl602/lib/pw_rpc/pw_rpc.gni index 29f549efd4b088..69bd1634363ebc 100644 --- a/config/bouffalolab/bl602/lib/pw_rpc/pw_rpc.gni +++ b/config/bouffalolab/bl602/lib/pw_rpc/pw_rpc.gni @@ -16,7 +16,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") pw_log_BACKEND = "$dir_pw_log_basic" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" pw_sys_io_BACKEND = "${chip_root}/examples/platform/bl602/pw_sys_io:pw_sys_io_bl602" diff --git a/config/efr32/lib/pw_rpc/pw_rpc.gni b/config/efr32/lib/pw_rpc/pw_rpc.gni index b0ef83d19dabd6..68f1c6154f4a91 100644 --- a/config/efr32/lib/pw_rpc/pw_rpc.gni +++ b/config/efr32/lib/pw_rpc/pw_rpc.gni @@ -16,7 +16,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") pw_log_BACKEND = "$dir_pw_log_basic" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" pw_sys_io_BACKEND = "${chip_root}/examples/platform/efr32/pw_sys_io:pw_sys_io_efr32" diff --git a/config/esp32/components/chip/CMakeLists.txt b/config/esp32/components/chip/CMakeLists.txt index 02ca0822c986c8..144b3ba420c3bf 100644 --- a/config/esp32/components/chip/CMakeLists.txt +++ b/config/esp32/components/chip/CMakeLists.txt @@ -80,11 +80,11 @@ endif() if(CONFIG_ENABLE_PW_RPC) string(APPEND chip_gn_args "import(\"//build_overrides/pigweed.gni\")\n") - chip_gn_arg_append("remove_default_configs" "[\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_build:cpp17\"]") + chip_gn_arg_append("remove_default_configs" "[\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_build:toolchain_cpp_standard\"]") chip_gn_arg_append("chip_build_pw_rpc_lib" "true") chip_gn_arg_append("chip_build_pw_trace_lib" "true") chip_gn_arg_append("pw_log_BACKEND" "\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_log_basic\"") - chip_gn_arg_append("pw_assert_BACKEND" "\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert_log\"") + chip_gn_arg_append("pw_assert_BACKEND" "\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert_log:check_backend\"") chip_gn_arg_append("pw_sys_io_BACKEND" "\"//third_party/connectedhomeip/examples/platform/esp32/pw_sys_io:pw_sys_io_esp32\"") chip_gn_arg_append("pw_trace_BACKEND" "\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_trace_tokenized\"") chip_gn_arg_append("dir_pw_third_party_nanopb" "\"//third_party/connectedhomeip/third_party/nanopb/repo\"") diff --git a/config/mbed/CMakeLists.txt b/config/mbed/CMakeLists.txt index dbf7e91ba13708..337020b56c3d62 100644 --- a/config/mbed/CMakeLists.txt +++ b/config/mbed/CMakeLists.txt @@ -383,8 +383,9 @@ target_include_directories(${APP_TARGET} PRIVATE ${PIGWEED_ROOT}/pw_sys_io/public ${PIGWEED_ROOT}/pw_assert/public ${PIGWEED_ROOT}/pw_assert/assert_lite_public_overrides + ${PIGWEED_ROOT}/pw_assert_log/assert_backend_public_overrides + ${PIGWEED_ROOT}/pw_assert_log/check_backend_public_overrides ${PIGWEED_ROOT}/pw_assert_log/public - ${PIGWEED_ROOT}/pw_assert_log/public_overrides ${PIGWEED_ROOT}/pw_bytes/public ${PIGWEED_ROOT}/pw_checksum/public ${PIGWEED_ROOT}/pw_containers/public diff --git a/config/mbed/chip-gn/lib/pw_rpc/pw_rpc.gni b/config/mbed/chip-gn/lib/pw_rpc/pw_rpc.gni index f35741414952c5..2b03f6b4c9958c 100644 --- a/config/mbed/chip-gn/lib/pw_rpc/pw_rpc.gni +++ b/config/mbed/chip-gn/lib/pw_rpc/pw_rpc.gni @@ -16,7 +16,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") pw_log_BACKEND = "$dir_pw_log_basic" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" pw_sys_io_BACKEND = "${chip_root}/examples/platform/mbed/pw_sys_io:pw_sys_io_mbed" pw_rpc_system_server_BACKEND = diff --git a/config/nrfconnect/chip-module/CMakeLists.txt b/config/nrfconnect/chip-module/CMakeLists.txt index ede05417747580..ef4690aef82531 100644 --- a/config/nrfconnect/chip-module/CMakeLists.txt +++ b/config/nrfconnect/chip-module/CMakeLists.txt @@ -252,7 +252,7 @@ if (CONFIG_CHIP_PW_RPC) set(PIGWEED_DIR "//third_party/pigweed/repo") chip_gn_arg_bool("chip_build_pw_trace_lib" "true") chip_gn_arg_string("pw_trace_BACKEND" ${PIGWEED_DIR}/pw_trace_tokenized) - chip_gn_arg_string("pw_assert_BACKEND" ${PIGWEED_DIR}/pw_assert_log) + chip_gn_arg_string("pw_assert_BACKEND" ${PIGWEED_DIR}/pw_assert_log:check_backend) chip_gn_arg_string("pw_log_BACKEND" ${PIGWEED_DIR}/pw_log_basic) chip_gn_arg("pw_build_LINK_DEPS" [\"${PIGWEED_DIR}/pw_assert:impl\",\ \"${PIGWEED_DIR}/pw_log:impl\"]) endif() diff --git a/config/qpg/lib/pw_rpc/pw_rpc.gni b/config/qpg/lib/pw_rpc/pw_rpc.gni index 1f1a5012e803ea..60fb93e6b8fc44 100644 --- a/config/qpg/lib/pw_rpc/pw_rpc.gni +++ b/config/qpg/lib/pw_rpc/pw_rpc.gni @@ -16,7 +16,7 @@ import("//build_overrides/chip.gni") import("//build_overrides/pigweed.gni") pw_log_BACKEND = "$dir_pw_log_basic" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" pw_sys_io_BACKEND = "${chip_root}/examples/platform/qpg/pw_sys_io:pw_sys_io_qpg" pw_build_LINK_DEPS = [ diff --git a/examples/all-clusters-app/ameba/chip_main.cmake b/examples/all-clusters-app/ameba/chip_main.cmake index 9f1d8ad078f1c5..d597eeecb9e5bc 100755 --- a/examples/all-clusters-app/ameba/chip_main.cmake +++ b/examples/all-clusters-app/ameba/chip_main.cmake @@ -18,7 +18,8 @@ set(dir_pw_third_party_nanopb "${chip_dir}/third_party/nanopb/repo" CACHE STRING pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config) pw_set_backend(pw_log pw_log_basic) -pw_set_backend(pw_assert pw_assert_log) +pw_set_backend(pw_assert.check pw_assert_log.check_backend) +pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend) pw_set_backend(pw_sys_io pw_sys_io.ameba) pw_set_backend(pw_trace pw_trace_tokenized) @@ -36,7 +37,7 @@ pw_proto_library(attributes_service STRIP_PREFIX ${chip_dir}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(button_service @@ -47,7 +48,7 @@ pw_proto_library(button_service STRIP_PREFIX ${chip_dir}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(device_service @@ -60,7 +61,7 @@ pw_proto_library(device_service STRIP_PREFIX ${chip_dir}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(lighting_service @@ -71,7 +72,7 @@ pw_proto_library(lighting_service STRIP_PREFIX ${chip_dir}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(locking_service @@ -82,7 +83,7 @@ pw_proto_library(locking_service STRIP_PREFIX ${chip_dir}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(wifi_service @@ -93,7 +94,7 @@ pw_proto_library(wifi_service PREFIX wifi_service DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto STRIP_PREFIX ${chip_dir}/examples/common/pigweed/protos ) diff --git a/examples/all-clusters-app/esp32/CMakeLists.txt b/examples/all-clusters-app/esp32/CMakeLists.txt index d7907d6ba7762f..0cf459d3e725af 100644 --- a/examples/all-clusters-app/esp32/CMakeLists.txt +++ b/examples/all-clusters-app/esp32/CMakeLists.txt @@ -53,7 +53,8 @@ include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cm pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config) pw_set_backend(pw_log pw_log_basic) -pw_set_backend(pw_assert pw_assert_log) +pw_set_backend(pw_assert.check pw_assert_log.check_backend) +pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend) pw_set_backend(pw_sys_io pw_sys_io.esp32) pw_set_backend(pw_trace pw_trace_tokenized) diff --git a/examples/all-clusters-app/esp32/main/CMakeLists.txt b/examples/all-clusters-app/esp32/main/CMakeLists.txt index 94c5bd15476d60..8a58dc8f04c6a3 100644 --- a/examples/all-clusters-app/esp32/main/CMakeLists.txt +++ b/examples/all-clusters-app/esp32/main/CMakeLists.txt @@ -151,7 +151,7 @@ pw_proto_library(attributes_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(button_service @@ -162,7 +162,7 @@ pw_proto_library(button_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(descriptor_service @@ -173,7 +173,7 @@ pw_proto_library(descriptor_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(device_service @@ -186,7 +186,7 @@ pw_proto_library(device_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(lighting_service @@ -197,7 +197,7 @@ pw_proto_library(lighting_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(locking_service @@ -208,7 +208,7 @@ pw_proto_library(locking_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(wifi_service @@ -219,7 +219,7 @@ pw_proto_library(wifi_service PREFIX wifi_service DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos ) diff --git a/examples/all-clusters-minimal-app/ameba/chip_main.cmake b/examples/all-clusters-minimal-app/ameba/chip_main.cmake new file mode 100755 index 00000000000000..97884c6d92335f --- /dev/null +++ b/examples/all-clusters-minimal-app/ameba/chip_main.cmake @@ -0,0 +1,268 @@ +cmake_minimum_required(VERSION 3.6) + +project(chip_main) + +set(chip_dir "${ameba_matter_root}") +set(chip_dir_output "${matter_output_path}/chip") +set(dir "${sdk_root}/component/common/api") +set(chip_main chip_main) +set(list_chip_main_sources chip_main_sources) + +if (matter_enable_rpc) +set(pigweed_dir "${chip_dir}/third_party/pigweed/repo") + +include(${pigweed_dir}/pw_build/pigweed.cmake) +include(${pigweed_dir}/pw_protobuf_compiler/proto.cmake) + +set(dir_pw_third_party_nanopb "${chip_dir}/third_party/nanopb/repo" CACHE STRING "" FORCE) + +pw_set_backend(pw_log pw_log_basic) +pw_set_backend(pw_assert.check pw_assert_log.check_backend) +pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend) +pw_set_backend(pw_sys_io pw_sys_io.ameba) +pw_set_backend(pw_trace pw_trace_tokenized) + +add_subdirectory(${chip_dir}/third_party/pigweed/repo ${chip_dir}/examples/all-clusters-minimal-app/ameba/out/pigweed) +add_subdirectory(${chip_dir}/third_party/nanopb/repo ${chip_dir}/examples/all-clusters-minimal-app/ameba/out/nanopb) +add_subdirectory(${chip_dir}/examples/platform/ameba/pw_sys_io ${chip_dir}/examples/all-clusters-minimal-app/ameba/out/pw_sys_io) + +pw_proto_library(attributes_service + SOURCES + ${chip_dir}/examples/common/pigweed/protos/attributes_service.proto + INPUTS + ${chip_dir}/examples/common/pigweed/protos/attributes_service.options + PREFIX + attributes_service + STRIP_PREFIX + ${chip_dir}/examples/common/pigweed/protos + DEPS + pw_protobuf.common_proto +) + +pw_proto_library(button_service + SOURCES + ${chip_dir}/examples/common/pigweed/protos/button_service.proto + PREFIX + button_service + STRIP_PREFIX + ${chip_dir}/examples/common/pigweed/protos + DEPS + pw_protobuf.common_proto +) + +pw_proto_library(device_service + SOURCES + ${chip_dir}/examples/common/pigweed/protos/device_service.proto + INPUTS + ${chip_dir}/examples/common/pigweed/protos/device_service.options + PREFIX + device_service + STRIP_PREFIX + ${chip_dir}/examples/common/pigweed/protos + DEPS + pw_protobuf.common_proto +) + +pw_proto_library(lighting_service + SOURCES + ${chip_dir}/examples/common/pigweed/protos/lighting_service.proto + PREFIX + lighting_service + STRIP_PREFIX + ${chip_dir}/examples/common/pigweed/protos + DEPS + pw_protobuf.common_proto +) + +pw_proto_library(locking_service + SOURCES + ${chip_dir}/examples/common/pigweed/protos/locking_service.proto + PREFIX + locking_service + STRIP_PREFIX + ${chip_dir}/examples/common/pigweed/protos + DEPS + pw_protobuf.common_proto +) + +pw_proto_library(wifi_service + SOURCES + ${chip_dir}/examples/common/pigweed/protos/wifi_service.proto + INPUTS + ${chip_dir}/examples/common/pigweed/protos/wifi_service.options + PREFIX + wifi_service + DEPS + pw_protobuf.common_proto + STRIP_PREFIX + ${chip_dir}/examples/common/pigweed/protos +) + +endif(matter_enable_rpc) + +include(${prj_root}/GCC-RELEASE/project_hp/asdk/includepath.cmake) + +if (matter_enable_rpc) +list( + APPEND ${list_chip_main_sources} + #rpc + ${chip_dir}/examples/platform/ameba/PigweedLogger.cpp + ${chip_dir}/examples/platform/ameba/Rpc.cpp + ${chip_dir}/examples/common/pigweed/RpcService.cpp + ${chip_dir}/examples/common/pigweed/ameba/PigweedLoggerMutex.cpp +) +endif (matter_enable_rpc) + +if (matter_enable_ota_requestor) +list( + APPEND ${list_chip_main_sources} + #OTARequestor + ${chip_dir}/src/app/clusters/ota-requestor/BDXDownloader.cpp + ${chip_dir}/src/app/clusters/ota-requestor/DefaultOTARequestor.cpp + ${chip_dir}/src/app/clusters/ota-requestor/DefaultOTARequestorDriver.cpp + ${chip_dir}/src/app/clusters/ota-requestor/DefaultOTARequestorStorage.cpp + ${chip_dir}/src/app/clusters/ota-requestor/ota-requestor-server.cpp +) +endif (matter_enable_ota_requestor) + +list( + APPEND ${list_chip_main_sources} + + ${chip_dir}/zzz_generated/all-clusters-minimal-app/zap-generated/callback-stub.cpp + ${chip_dir}/zzz_generated/all-clusters-minimal-app/zap-generated/IMClusterCommandHandler.cpp + + ${chip_dir}/examples/all-clusters-minimal-app/all-clusters-common/src/bridged-actions-stub.cpp + ${chip_dir}/examples/all-clusters-minimal-app/all-clusters-common/src/static-supported-modes-manager.cpp + + ${chip_dir}/examples/all-clusters-minimal-app/ameba/main/chipinterface.cpp + ${chip_dir}/examples/all-clusters-minimal-app/ameba/main/DeviceCallbacks.cpp + ${chip_dir}/examples/all-clusters-minimal-app/ameba/main/CHIPDeviceManager.cpp + ${chip_dir}/examples/all-clusters-minimal-app/ameba/main/Globals.cpp + ${chip_dir}/examples/all-clusters-minimal-app/ameba/main/LEDWidget.cpp + ${chip_dir}/examples/all-clusters-minimal-app/ameba/main/DsoHack.cpp +) + +add_library( + ${chip_main} + STATIC + ${chip_main_sources} +) + +chip_configure_data_model(chip_main + INCLUDE_SERVER + ZAP_FILE ${matter_example_path}/../all-clusters-common/all-clusters-minimal-app.zap +) + +if (matter_enable_rpc) +target_include_directories( + ${chip_main} + PUBLIC + #rpc + ${chip_dir}/examples/platform/ameba + ${chip_dir}/examples/platform/ameba/pw_sys_io/public + ${chip_dir}/examples/common + ${chip_dir}/examples/common/pigweed + ${chip_dir}/examples/common/pigweed/ameba + ${chip_dir}/src + ${chip_dir}/src/lib/support + ${pigweed_dir}/pw_rpc/nanopb/public +) +endif (matter_enable_rpc) + +target_include_directories( + ${chip_main} + PUBLIC + ${inc_path} + ${chip_dir}/zzz_generated/all-clusters-minimal-app + ${chip_dir}/zzz_generated/all-clusters-minimal-app/zap-generated + ${chip_dir}/zzz_generated/app-common + ${chip_dir}/examples/all-clusters-app/all-clusters-common + ${chip_dir}/examples/all-clusters-app/all-clusters-common/include + ${chip_dir}/examples/all-clusters-minimal-app/ameba/main/include + ${chip_dir_output}/gen/include + ${chip_dir}/src/include/ + ${chip_dir}/src/lib/ + ${chip_dir}/src/ + ${chip_dir}/third_party/nlassert/repo/include/ + ${chip_dir}/src/app/ + ${chip_dir}/src/app/util/ + ${chip_dir}/src/app/server/ + ${chip_dir}/src/controller/data_model + ${chip_dir}/third_party/nlio/repo/include/ + ${chip_dir}/third_party/nlunit-test/repo/src +) + +if (matter_enable_rpc) +target_link_libraries(${chip_main} PUBLIC + attributes_service.nanopb_rpc + button_service.nanopb_rpc + device_service.nanopb_rpc + lighting_service.nanopb_rpc + locking_service.nanopb_rpc + wifi_service.nanopb_rpc + pw_checksum + pw_hdlc + pw_log + pw_rpc.server + pw_trace_tokenized + pw_trace_tokenized.trace_buffer + pw_trace_tokenized.rpc_service + pw_trace_tokenized.protos.nanopb_rpc + PwRpc +) + +link_directories( + ${chip_dir_output}/lib +) +endif (matter_enable_rpc) + +list( + APPEND chip_main_flags + + -DINET_CONFIG_ENABLE_IPV4=0 + -DCHIP_PROJECT=1 + -DCHIP_DEVICE_LAYER_TARGET=Ameba + -DUSE_ZAP_CONFIG + -DCHIP_HAVE_CONFIG_H + -DMBEDTLS_CONFIG_FILE= + -DMATTER_ALL_CLUSTERS_APP=1 +) + +if (matter_enable_rpc) +list( + APPEND chip_main_flags + + -DPW_RPC_ATTRIBUTE_SERVICE=1 + -DPW_RPC_BUTTON_SERVICE=1 + -DPW_RPC_DEVICE_SERVICE=1 + -DPW_RPC_LIGHTING_SERVICE=1 + -DPW_RPC_LOCKING_SERVICE=1 + -DCONFIG_ENABLE_PW_RPC=1 +) +endif (matter_enable_rpc) + +if (matter_enable_ota_requestor) +list( + APPEND chip_main_flags + + -DCONFIG_ENABLE_OTA_REQUESTOR=1 +) +endif (matter_enable_ota_requestor) + +list( + APPEND chip_main_cpp_flags + + -Wno-unused-parameter + -std=gnu++11 + -std=c++14 + -fno-rtti +) +target_compile_definitions(${chip_main} PRIVATE ${chip_main_flags} ) +target_compile_options(${chip_main} PRIVATE ${chip_main_cpp_flags}) + +# move static library post build command +add_custom_command( + TARGET ${chip_main} + POST_BUILD + COMMAND cp lib${chip_main}.a ${CMAKE_CURRENT_SOURCE_DIR}/lib/application +) diff --git a/examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt b/examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt new file mode 100644 index 00000000000000..19108d27dab518 --- /dev/null +++ b/examples/all-clusters-minimal-app/esp32/main/CMakeLists.txt @@ -0,0 +1,261 @@ +# +# Copyright (c) 2021 Project CHIP Authors +# All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.) +# The list of src and include dirs must be in sync with that in all-clusters-minimal-app/esp32/main/component.mk +set(PRIV_INCLUDE_DIRS_LIST + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/all-clusters-minimal-app" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common/include" + "${CMAKE_CURRENT_LIST_DIR}/include" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32" +) +set(SRC_DIRS_LIST + "${CMAKE_CURRENT_LIST_DIR}" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/all-clusters-minimal-app/zap-generated" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/app-common/app-common/zap-generated/attributes" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/app-common/app-common/zap-generated" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/route_hook" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/ota" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/common" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/shell_extension" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/util" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/reporting" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/administrator-commissioning-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/application-basic-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/test-cluster-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/descriptor" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/fan-control-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/fixed-label-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/user-label-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/on-off-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/level-control" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/identify-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/access-control-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/account-login-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/application-launcher-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/audio-output-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/barrier-control-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/window-covering-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/general-commissioning-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/network-commissioning" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/groups-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/color-control-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/content-launch-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/operational-credentials-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/media-input-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/mode-select-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/low-power-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/keypad-input-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/media-playback-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ota-requestor" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/target-navigator-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/thermostat-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/thermostat-user-interface-configuration-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/thread-network-diagnostics-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/channel-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/scenes" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/software-diagnostics-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/switch-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/general-diagnostics-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/group-key-mgmt-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/basic" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/bindings" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/diagnostic-logs-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/door-lock-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/occupancy-sensor-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/ethernet-network-diagnostics-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/localization-configuration-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/time-format-localization-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/wifi-network-diagnostics-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/wake-on-lan-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/pump-configuration-and-control-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/power-source-configuration-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/power-source-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common/src" +) + +if (CONFIG_ENABLE_PW_RPC) +# Append additional directories for RPC build +set(PRIV_INCLUDE_DIRS_LIST "${PRIV_INCLUDE_DIRS_LIST}" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/pw_sys_io/public" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed/esp32" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/lib/support" + "${IDF_PATH}/components/freertos/include/freertos" +) +set(SRC_DIRS_LIST "${SRC_DIRS_LIST}" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/pigweed/esp32" +) +endif (CONFIG_ENABLE_PW_RPC) + +if(("${CONFIG_DEVICE_TYPE_ESP32_DEVKITC}" STREQUAL "y") OR ("${CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM}" STREQUAL "y")) + list(APPEND PRIV_INCLUDE_DIRS_LIST + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/common/screen-framework/include") + set(PRIV_REQUIRES_LIST chip QRCode bt) +elseif(("${CONFIG_DEVICE_TYPE_M5STACK}" STREQUAL "y") OR ("${CONFIG_DEVICE_TYPE_ESP32_WROVER_KIT}" STREQUAL "y")) + set(PRIV_REQUIRES_LIST chip QRCode bt tft spidrier screen-framework) +endif() + +if("${CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM}" STREQUAL "y") + list(APPEND PRIV_REQUIRES_LIST led_strip) +endif() + +if (CONFIG_OPENTHREAD_ENABLED) + list(APPEND PRIV_REQUIRES_LIST openthread) +endif() + +idf_component_register(PRIV_INCLUDE_DIRS ${PRIV_INCLUDE_DIRS_LIST} + SRC_DIRS ${SRC_DIRS_LIST} + PRIV_REQUIRES ${PRIV_REQUIRES_LIST}) + +set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17) +target_compile_options(${COMPONENT_LIB} PRIVATE "-DLWIP_IPV6_SCOPES=0" "-DCHIP_HAVE_CONFIG_H") +target_compile_options(${COMPONENT_LIB} PUBLIC + "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=" +) + +if (CONFIG_ENABLE_PW_RPC) + +get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH) + +set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo") +include(${PIGWEED_ROOT}/pw_build/pigweed.cmake) +include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake) +set(dir_pw_third_party_nanopb "${CHIP_ROOT}/third_party/nanopb/repo" CACHE STRING "" FORCE) + +pw_proto_library(attributes_service + SOURCES + ${CHIP_ROOT}/examples/common/pigweed/protos/attributes_service.proto + INPUTS + ${CHIP_ROOT}/examples/common/pigweed/protos/attributes_service.options + PREFIX + attributes_service + STRIP_PREFIX + ${CHIP_ROOT}/examples/common/pigweed/protos + DEPS + pw_protobuf.common_proto +) + +pw_proto_library(button_service + SOURCES + ${CHIP_ROOT}/examples/common/pigweed/protos/button_service.proto + PREFIX + button_service + STRIP_PREFIX + ${CHIP_ROOT}/examples/common/pigweed/protos + DEPS + pw_protobuf.common_proto +) + +pw_proto_library(descriptor_service + SOURCES + ${CHIP_ROOT}/examples/common/pigweed/protos/descriptor_service.proto + PREFIX + descriptor_service + STRIP_PREFIX + ${CHIP_ROOT}/examples/common/pigweed/protos + DEPS + pw_protobuf.common_proto +) + +pw_proto_library(device_service + SOURCES + ${CHIP_ROOT}/examples/common/pigweed/protos/device_service.proto + INPUTS + ${CHIP_ROOT}/examples/common/pigweed/protos/device_service.options + PREFIX + device_service + STRIP_PREFIX + ${CHIP_ROOT}/examples/common/pigweed/protos + DEPS + pw_protobuf.common_proto +) + +pw_proto_library(lighting_service + SOURCES + ${CHIP_ROOT}/examples/common/pigweed/protos/lighting_service.proto + PREFIX + lighting_service + STRIP_PREFIX + ${CHIP_ROOT}/examples/common/pigweed/protos + DEPS + pw_protobuf.common_proto +) + +pw_proto_library(locking_service + SOURCES + ${CHIP_ROOT}/examples/common/pigweed/protos/locking_service.proto + PREFIX + locking_service + STRIP_PREFIX + ${CHIP_ROOT}/examples/common/pigweed/protos + DEPS + pw_protobuf.common_proto +) + +pw_proto_library(wifi_service + SOURCES + ${CHIP_ROOT}/examples/common/pigweed/protos/wifi_service.proto + INPUTS + ${CHIP_ROOT}/examples/common/pigweed/protos/wifi_service.options + PREFIX + wifi_service + DEPS + pw_protobuf.common_proto + STRIP_PREFIX + ${CHIP_ROOT}/examples/common/pigweed/protos +) + +target_link_libraries(${COMPONENT_LIB} PUBLIC + attributes_service.nanopb_rpc + button_service.nanopb_rpc + descriptor_service.nanopb_rpc + device_service.nanopb_rpc + lighting_service.nanopb_rpc + locking_service.nanopb_rpc + wifi_service.nanopb_rpc + pw_checksum + pw_hdlc + pw_log + pw_rpc.server + pw_trace_tokenized + pw_trace_tokenized.trace_buffer + pw_trace_tokenized.rpc_service + pw_trace_tokenized.protos.nanopb_rpc +) + +target_link_options(${COMPONENT_LIB} + PUBLIC + "-T${PIGWEED_ROOT}/pw_tokenizer/pw_tokenizer_linker_sections.ld" +) + +target_compile_options(${COMPONENT_LIB} PRIVATE + "-DPW_RPC_ATTRIBUTE_SERVICE=1" + "-DPW_RPC_BUTTON_SERVICE=1" + "-DPW_RPC_DESCRIPTOR_SERVICE=1" + "-DPW_RPC_DEVICE_SERVICE=1" + "-DPW_RPC_LIGHTING_SERVICE=1" + "-DPW_RPC_LOCKING_SERVICE=1" + "-DPW_RPC_TRACING_SERVICE=1" + "-DPW_RPC_WIFI_SERVICE=1" + "-DPW_TRACE_BACKEND_SET=1") + +endif (CONFIG_ENABLE_PW_RPC) diff --git a/examples/chef/efr32/args.gni b/examples/chef/efr32/args.gni index 96b6262f50b93e..0b7ef403df72cd 100644 --- a/examples/chef/efr32/args.gni +++ b/examples/chef/efr32/args.gni @@ -21,5 +21,5 @@ efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") chip_enable_ota_requestor = true pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" chip_enable_openthread = true diff --git a/examples/chef/efr32/build_for_wifi_args.gni b/examples/chef/efr32/build_for_wifi_args.gni index bf21912871e59d..4a3bdfd804ae19 100644 --- a/examples/chef/efr32/build_for_wifi_args.gni +++ b/examples/chef/efr32/build_for_wifi_args.gni @@ -21,4 +21,4 @@ import("${chip_root}/src/platform/EFR32/wifi_args.gni") chip_enable_ota_requestor = true pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" diff --git a/examples/chef/esp32/CMakeLists.txt b/examples/chef/esp32/CMakeLists.txt index 086f2eed23a846..b03f1e123b88b2 100644 --- a/examples/chef/esp32/CMakeLists.txt +++ b/examples/chef/esp32/CMakeLists.txt @@ -61,7 +61,8 @@ if (CONFIG_ENABLE_PW_RPC) get_filename_component(CHIP_ROOT ./third_party/connectedhomeip REALPATH) include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cmake) pw_set_backend(pw_log pw_log_basic) -pw_set_backend(pw_assert pw_assert_log) +pw_set_backend(pw_assert.check pw_assert_log.check_backend) +pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend) pw_set_backend(pw_sys_io pw_sys_io.esp32) pw_set_backend(pw_trace pw_trace_tokenized) diff --git a/examples/chef/esp32/main/CMakeLists.txt b/examples/chef/esp32/main/CMakeLists.txt index 6ebd23b7da224f..68f43aece32ea8 100644 --- a/examples/chef/esp32/main/CMakeLists.txt +++ b/examples/chef/esp32/main/CMakeLists.txt @@ -132,7 +132,7 @@ pw_proto_library(attributes_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(button_service @@ -143,7 +143,7 @@ pw_proto_library(button_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(descriptor_service @@ -167,7 +167,7 @@ pw_proto_library(device_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(wifi_service diff --git a/examples/chef/linux/with_pw_rpc.gni b/examples/chef/linux/with_pw_rpc.gni index 969b2b88c9b75b..9533565ecf4ce8 100644 --- a/examples/chef/linux/with_pw_rpc.gni +++ b/examples/chef/linux/with_pw_rpc.gni @@ -24,7 +24,7 @@ import("//build_overrides/pigweed.gni") cpp_standard = "gnu++17" pw_log_BACKEND = "$dir_pw_log_basic" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" pw_sys_io_BACKEND = "$dir_pw_sys_io_stdio" pw_trace_BACKEND = "$dir_pw_trace_tokenized" pw_unit_test_MAIN = "$dir_pw_unit_test:logging_main" diff --git a/examples/chef/nrfconnect/CMakeLists.txt b/examples/chef/nrfconnect/CMakeLists.txt index 4adb95a8efeb7d..1cb1fcda165f2d 100644 --- a/examples/chef/nrfconnect/CMakeLists.txt +++ b/examples/chef/nrfconnect/CMakeLists.txt @@ -108,30 +108,32 @@ endif() include(${CHIP_ROOT}/config/nrfconnect/app/flashing.cmake) if(CONFIG_ENABLE_PW_RPC) - target_compile_options(app PRIVATE - "-DCONFIG_ENABLE_PW_RPC=1" - ) +target_compile_options(app PRIVATE + "-DCONFIG_ENABLE_PW_RPC=1" +) - # Make all targets created below depend on zephyr_interface to inherit MCU-related compilation flags - link_libraries($) +# Make all targets created below depend on zephyr_interface to inherit MCU-related compilation flags +link_libraries($) - set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo") - include(${PIGWEED_ROOT}/pw_build/pigweed.cmake) - include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake) +set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo") +include(${PIGWEED_ROOT}/pw_build/pigweed.cmake) +include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake) - pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config) - pw_set_backend(pw_log pw_log_basic) - pw_set_backend(pw_assert pw_assert_log) - pw_set_backend(pw_sys_io pw_sys_io.nrfconnect) - pw_set_backend(pw_trace pw_trace_tokenized) - set(dir_pw_third_party_nanopb "${CHIP_ROOT}/third_party/nanopb/repo" CACHE STRING "" FORCE) +pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config) +pw_set_backend(pw_log pw_log_basic) +pw_set_backend(pw_assert pw_assert_log) +pw_set_backend(pw_assert.check pw_assert_log.check_backend) +pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend) +pw_set_backend(pw_sys_io pw_sys_io.nrfconnect) +pw_set_backend(pw_trace pw_trace_tokenized) +set(dir_pw_third_party_nanopb "${CHIP_ROOT}/third_party/nanopb/repo" CACHE STRING "" FORCE) - add_subdirectory(third_party/connectedhomeip/examples/platform/nrfconnect/pw_sys_io) - add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo) - add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo) +add_subdirectory(third_party/connectedhomeip/examples/platform/nrfconnect/pw_sys_io) +add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo) +add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo) - pw_proto_library(attributes_service - SOURCES +pw_proto_library(attributes_service + SOURCES ${CHIP_ROOT}/examples/common/pigweed/protos/attributes_service.proto INPUTS ${CHIP_ROOT}/examples/common/pigweed/protos/attributes_service.options @@ -139,9 +141,9 @@ if(CONFIG_ENABLE_PW_RPC) attributes_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos - DEPS - pw_protobuf.common_protos - ) + DEPS + pw_protobuf.common_proto +) pw_proto_library(descriptor_service SOURCES @@ -150,9 +152,9 @@ if(CONFIG_ENABLE_PW_RPC) descriptor_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos - DEPS - pw_protobuf.common_protos - ) + DEPS + pw_protobuf.common_proto +) pw_proto_library(device_service SOURCES @@ -163,9 +165,9 @@ if(CONFIG_ENABLE_PW_RPC) device_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos - DEPS - pw_protobuf.common_protos - ) + DEPS + pw_protobuf.common_proto +) pw_proto_library(ot_cli_service SOURCES @@ -176,9 +178,9 @@ if(CONFIG_ENABLE_PW_RPC) ${CHIP_ROOT}/examples/common/pigweed/protos PREFIX ot_cli_service - DEPS - pw_protobuf.common_protos - ) + DEPS + pw_protobuf.common_proto +) pw_proto_library(thread_service SOURCES @@ -189,9 +191,9 @@ if(CONFIG_ENABLE_PW_RPC) ${CHIP_ROOT}/examples/common/pigweed/protos PREFIX thread_service - DEPS - pw_protobuf.common_protos - ) + DEPS + pw_protobuf.common_proto +) target_sources(app PRIVATE ../../common/pigweed/RpcService.cpp diff --git a/examples/ipv6only-app/esp32/CMakeLists.txt b/examples/ipv6only-app/esp32/CMakeLists.txt index 4b125c1cc43895..51d962b685bf61 100644 --- a/examples/ipv6only-app/esp32/CMakeLists.txt +++ b/examples/ipv6only-app/esp32/CMakeLists.txt @@ -40,7 +40,8 @@ get_filename_component(CHIP_ROOT ./third_party/connectedhomeip REALPATH) include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cmake) pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config) pw_set_backend(pw_log pw_log_basic) -pw_set_backend(pw_assert pw_assert_log) +pw_set_backend(pw_assert.check pw_assert_log.check_backend) +pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend) pw_set_backend(pw_sys_io pw_sys_io.esp32) add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo) diff --git a/examples/light-switch-app/efr32/args.gni b/examples/light-switch-app/efr32/args.gni index 348e8e012098ae..7df1c5e400f56f 100644 --- a/examples/light-switch-app/efr32/args.gni +++ b/examples/light-switch-app/efr32/args.gni @@ -21,6 +21,6 @@ efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") chip_enable_ota_requestor = true pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" chip_enable_openthread = true pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex" diff --git a/examples/light-switch-app/efr32/build_for_wifi_args.gni b/examples/light-switch-app/efr32/build_for_wifi_args.gni index 04529fddd2076a..8a19f57ceb268a 100644 --- a/examples/light-switch-app/efr32/build_for_wifi_args.gni +++ b/examples/light-switch-app/efr32/build_for_wifi_args.gni @@ -19,4 +19,4 @@ chip_enable_openthread = false import("${chip_root}/src/platform/EFR32/wifi_args.gni") pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" diff --git a/examples/lighting-app/bouffalolab/bl602/args.gni b/examples/lighting-app/bouffalolab/bl602/args.gni index ab5fb2b420693f..3425fc8d0035ba 100644 --- a/examples/lighting-app/bouffalolab/bl602/args.gni +++ b/examples/lighting-app/bouffalolab/bl602/args.gni @@ -18,7 +18,7 @@ import("${chip_root}/src/platform/bouffalolab/BL602/args.gni") bl602_sdk_target = get_label_info(":sdk", "label_no_toolchain") pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" chip_enable_openthread = false diff --git a/examples/lighting-app/efr32/args.gni b/examples/lighting-app/efr32/args.gni index 348e8e012098ae..7df1c5e400f56f 100644 --- a/examples/lighting-app/efr32/args.gni +++ b/examples/lighting-app/efr32/args.gni @@ -21,6 +21,6 @@ efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") chip_enable_ota_requestor = true pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" chip_enable_openthread = true pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex" diff --git a/examples/lighting-app/efr32/build_for_wifi_args.gni b/examples/lighting-app/efr32/build_for_wifi_args.gni index 04529fddd2076a..8a19f57ceb268a 100644 --- a/examples/lighting-app/efr32/build_for_wifi_args.gni +++ b/examples/lighting-app/efr32/build_for_wifi_args.gni @@ -19,4 +19,4 @@ chip_enable_openthread = false import("${chip_root}/src/platform/EFR32/wifi_args.gni") pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" diff --git a/examples/lighting-app/linux/with_pw_rpc.gni b/examples/lighting-app/linux/with_pw_rpc.gni index 969b2b88c9b75b..9533565ecf4ce8 100644 --- a/examples/lighting-app/linux/with_pw_rpc.gni +++ b/examples/lighting-app/linux/with_pw_rpc.gni @@ -24,7 +24,7 @@ import("//build_overrides/pigweed.gni") cpp_standard = "gnu++17" pw_log_BACKEND = "$dir_pw_log_basic" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" pw_sys_io_BACKEND = "$dir_pw_sys_io_stdio" pw_trace_BACKEND = "$dir_pw_trace_tokenized" pw_unit_test_MAIN = "$dir_pw_unit_test:logging_main" diff --git a/examples/lighting-app/nrfconnect/CMakeLists.txt b/examples/lighting-app/nrfconnect/CMakeLists.txt index 5e4b4b52d2ee38..ae9baae719544e 100644 --- a/examples/lighting-app/nrfconnect/CMakeLists.txt +++ b/examples/lighting-app/nrfconnect/CMakeLists.txt @@ -93,7 +93,8 @@ include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake) pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config) pw_set_backend(pw_log pw_log_basic) -pw_set_backend(pw_assert pw_assert_log) +pw_set_backend(pw_assert.check pw_assert_log.check_backend) +pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend) pw_set_backend(pw_sys_io pw_sys_io.nrfconnect) pw_set_backend(pw_trace pw_trace_tokenized) set(dir_pw_third_party_nanopb "${CHIP_ROOT}/third_party/nanopb/repo" CACHE STRING "" FORCE) @@ -112,7 +113,7 @@ pw_proto_library(attributes_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(button_service @@ -123,7 +124,7 @@ pw_proto_library(button_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(descriptor_service @@ -134,7 +135,7 @@ pw_proto_library(descriptor_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(device_service @@ -147,7 +148,7 @@ pw_proto_library(device_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(lighting_service @@ -158,7 +159,7 @@ pw_proto_library(lighting_service PREFIX lighting_service DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(ot_cli_service @@ -171,7 +172,7 @@ pw_proto_library(ot_cli_service PREFIX ot_cli_service DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(thread_service @@ -184,7 +185,7 @@ pw_proto_library(thread_service PREFIX thread_service DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) target_sources(app PRIVATE diff --git a/examples/lighting-app/qpg/args.gni b/examples/lighting-app/qpg/args.gni index 90189de5731270..3e533b2a6f1751 100644 --- a/examples/lighting-app/qpg/args.gni +++ b/examples/lighting-app/qpg/args.gni @@ -26,4 +26,4 @@ chip_openthread_ftd = true chip_stack_lock_tracking = "none" pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" diff --git a/examples/lock-app/efr32/args.gni b/examples/lock-app/efr32/args.gni index 66670784404334..b4a0322c442f40 100644 --- a/examples/lock-app/efr32/args.gni +++ b/examples/lock-app/efr32/args.gni @@ -22,5 +22,5 @@ chip_enable_ota_requestor = true chip_enable_openthread = true pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" pw_rpc_CONFIG = "$dir_pw_rpc:disable_global_mutex" diff --git a/examples/lock-app/efr32/build_for_wifi_args.gni b/examples/lock-app/efr32/build_for_wifi_args.gni index 04529fddd2076a..8a19f57ceb268a 100644 --- a/examples/lock-app/efr32/build_for_wifi_args.gni +++ b/examples/lock-app/efr32/build_for_wifi_args.gni @@ -19,4 +19,4 @@ chip_enable_openthread = false import("${chip_root}/src/platform/EFR32/wifi_args.gni") pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" diff --git a/examples/lock-app/esp32/CMakeLists.txt b/examples/lock-app/esp32/CMakeLists.txt index 3bcab4dbab199e..63ac7259d0d397 100644 --- a/examples/lock-app/esp32/CMakeLists.txt +++ b/examples/lock-app/esp32/CMakeLists.txt @@ -45,7 +45,8 @@ include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cm pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config) pw_set_backend(pw_log pw_log_basic) -pw_set_backend(pw_assert pw_assert_log) +pw_set_backend(pw_assert.check pw_assert_log.check_backend) +pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend) pw_set_backend(pw_sys_io pw_sys_io.esp32) add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo) diff --git a/examples/lock-app/esp32/main/CMakeLists.txt b/examples/lock-app/esp32/main/CMakeLists.txt index 85f8d7b0963d93..50d8aa41f98e67 100644 --- a/examples/lock-app/esp32/main/CMakeLists.txt +++ b/examples/lock-app/esp32/main/CMakeLists.txt @@ -78,7 +78,7 @@ pw_proto_library(descriptor_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(device_service @@ -91,7 +91,7 @@ pw_proto_library(device_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(button_service @@ -102,7 +102,7 @@ pw_proto_library(button_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(locking_service @@ -113,7 +113,7 @@ pw_proto_library(locking_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) target_link_libraries(${COMPONENT_LIB} PUBLIC diff --git a/examples/lock-app/qpg/args.gni b/examples/lock-app/qpg/args.gni index 03c7000100c47f..26f7455d068eda 100644 --- a/examples/lock-app/qpg/args.gni +++ b/examples/lock-app/qpg/args.gni @@ -26,4 +26,4 @@ chip_openthread_ftd = false chip_stack_lock_tracking = "none" pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" diff --git a/examples/ota-requestor-app/efr32/args.gni b/examples/ota-requestor-app/efr32/args.gni index fde26ca7395bb4..5d3bf441f0fc19 100644 --- a/examples/ota-requestor-app/efr32/args.gni +++ b/examples/ota-requestor-app/efr32/args.gni @@ -19,7 +19,7 @@ import("${chip_root}/src/platform/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" chip_enable_openthread = true chip_openthread_ftd = false diff --git a/examples/ota-requestor-app/esp32/CMakeLists.txt b/examples/ota-requestor-app/esp32/CMakeLists.txt index 7edf64a69941d5..2d1b7398791956 100644 --- a/examples/ota-requestor-app/esp32/CMakeLists.txt +++ b/examples/ota-requestor-app/esp32/CMakeLists.txt @@ -39,4 +39,25 @@ idf_build_set_property(COMPILE_OPTIONS "-Wno-format-nonliteral;-Wno-format-secur # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80635 idf_build_set_property(COMPILE_OPTIONS "-Wno-error=maybe-uninitialized" APPEND) +if (CONFIG_ENABLE_PW_RPC) +get_filename_component(CHIP_ROOT ./third_party/connectedhomeip REALPATH) +include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cmake) + +pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config) +pw_set_backend(pw_log pw_log_basic) +pw_set_backend(pw_assert.check pw_assert_log.check_backend) +pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend) +pw_set_backend(pw_sys_io pw_sys_io.esp32) + +add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo) +add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo) +add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io) + +get_target_property(_target_cxx_flags pw_build.cpp17 INTERFACE_COMPILE_OPTIONS) +list(REMOVE_ITEM _target_cxx_flags $<$:-std=c++17>) +list(APPEND _target_cxx_flags $<$:-std=gnu++17>) +set_target_properties(pw_build.cpp17 PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}") +endif(CONFIG_ENABLE_PW_RPC) + + flashing_script() diff --git a/examples/ota-requestor-app/esp32/main/CMakeLists.txt b/examples/ota-requestor-app/esp32/main/CMakeLists.txt index f89b111d538656..a465e628863136 100644 --- a/examples/ota-requestor-app/esp32/main/CMakeLists.txt +++ b/examples/ota-requestor-app/esp32/main/CMakeLists.txt @@ -16,7 +16,7 @@ # # # (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.) -idf_component_register(PRIV_INCLUDE_DIRS +idf_component_register(PRIV_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/include" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/zzz_generated/ota-requestor-app/" @@ -58,3 +58,105 @@ target_compile_options(${COMPONENT_LIB} PRIVATE "-DLWIP_IPV6_SCOPES=0" "-DCHIP_H target_compile_options(${COMPONENT_LIB} PUBLIC "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=" ) + +if (CONFIG_ENABLE_PW_RPC) + +get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH) + +set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo") +include(${PIGWEED_ROOT}/pw_build/pigweed.cmake) +include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake) +set(dir_pw_third_party_nanopb "${CHIP_ROOT}/third_party/nanopb/repo" CACHE STRING "" FORCE) + +pw_proto_library(attributes_service + SOURCES + ${CHIP_ROOT}/examples/common/pigweed/protos/attributes_service.proto + INPUTS + ${CHIP_ROOT}/examples/common/pigweed/protos/attributes_service.options + PREFIX + attributes_service + STRIP_PREFIX + ${CHIP_ROOT}/examples/common/pigweed/protos + DEPS + pw_protobuf.common_proto +) + +pw_proto_library(button_service + SOURCES + ${CHIP_ROOT}/examples/common/pigweed/protos/button_service.proto + PREFIX + button_service + STRIP_PREFIX + ${CHIP_ROOT}/examples/common/pigweed/protos + DEPS + pw_protobuf.common_proto +) + +pw_proto_library(descriptor_service + SOURCES + ${CHIP_ROOT}/examples/common/pigweed/protos/descriptor_service.proto + PREFIX + descriptor_service + STRIP_PREFIX + ${CHIP_ROOT}/examples/common/pigweed/protos + DEPS + pw_protobuf.common_proto +) + +pw_proto_library(device_service + SOURCES + ${CHIP_ROOT}/examples/common/pigweed/protos/device_service.proto + INPUTS + ${CHIP_ROOT}/examples/common/pigweed/protos/device_service.options + PREFIX + device_service + STRIP_PREFIX + ${CHIP_ROOT}/examples/common/pigweed/protos + DEPS + pw_protobuf.common_proto +) + +pw_proto_library(wifi_service + SOURCES + ${CHIP_ROOT}/examples/common/pigweed/protos/wifi_service.proto + INPUTS + ${CHIP_ROOT}/examples/common/pigweed/protos/wifi_service.options + PREFIX + wifi_service + DEPS + pw_protobuf.common_proto + STRIP_PREFIX + ${CHIP_ROOT}/examples/common/pigweed/protos +) + +target_link_libraries(${COMPONENT_LIB} PUBLIC + attributes_service.nanopb_rpc + button_service.nanopb_rpc + descriptor_service.nanopb_rpc + device_service.nanopb_rpc + wifi_service.nanopb_rpc + pw_checksum + pw_hdlc + pw_log + pw_rpc.server + pw_trace_tokenized + pw_trace_tokenized.trace_buffer + pw_trace_tokenized.rpc_service + pw_trace_tokenized.protos.nanopb_rpc +) + +target_link_options(${COMPONENT_LIB} + PUBLIC + "-T${PIGWEED_ROOT}/pw_tokenizer/pw_tokenizer_linker_sections.ld" +) + +target_compile_options(${COMPONENT_LIB} PRIVATE + "-DPW_RPC_ATTRIBUTE_SERVICE=1" + "-DPW_RPC_BUTTON_SERVICE=1" + "-DPW_RPC_DESCRIPTOR_SERVICE=1" + "-DPW_RPC_DEVICE_SERVICE=1" + "-DPW_RPC_TRACING_SERVICE=1" + "-DPW_RPC_WIFI_SERVICE=1" + "-DPW_TRACE_BACKEND_SET=1") + +endif (CONFIG_ENABLE_PW_RPC) diff --git a/examples/persistent-storage/efr32/args.gni b/examples/persistent-storage/efr32/args.gni index 86fbf759d00d08..9c2f04d2324347 100644 --- a/examples/persistent-storage/efr32/args.gni +++ b/examples/persistent-storage/efr32/args.gni @@ -19,4 +19,4 @@ import("${chip_root}/src/platform/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" diff --git a/examples/pigweed-app/ameba/chip_main.cmake b/examples/pigweed-app/ameba/chip_main.cmake index 8ece704a50ae56..e585c1fdcc0067 100644 --- a/examples/pigweed-app/ameba/chip_main.cmake +++ b/examples/pigweed-app/ameba/chip_main.cmake @@ -18,7 +18,8 @@ set(dir_pw_third_party_nanopb "${chip_dir}/third_party/nanopb/repo" CACHE STRING pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config) pw_set_backend(pw_log pw_log_basic) -pw_set_backend(pw_assert pw_assert_log) +pw_set_backend(pw_assert.check pw_assert_log.check_backend) +pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend) pw_set_backend(pw_sys_io pw_sys_io.ameba) add_subdirectory(${chip_dir}/third_party/pigweed/repo ${chip_dir}/examples/pigweed-app/ameba/out/pigweed) diff --git a/examples/pigweed-app/esp32/CMakeLists.txt b/examples/pigweed-app/esp32/CMakeLists.txt index b28ce191bf3312..d47b2b29062aa1 100644 --- a/examples/pigweed-app/esp32/CMakeLists.txt +++ b/examples/pigweed-app/esp32/CMakeLists.txt @@ -46,7 +46,8 @@ include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake) pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config) pw_set_backend(pw_log pw_log_basic) -pw_set_backend(pw_assert pw_assert_log) +pw_set_backend(pw_assert.check pw_assert_log.check_backend) +pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend) pw_set_backend(pw_sys_io pw_sys_io.esp32) add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo) diff --git a/examples/pigweed-app/nrfconnect/CMakeLists.txt b/examples/pigweed-app/nrfconnect/CMakeLists.txt index d3fd816033eb4f..90d53ea9ad0d38 100644 --- a/examples/pigweed-app/nrfconnect/CMakeLists.txt +++ b/examples/pigweed-app/nrfconnect/CMakeLists.txt @@ -52,7 +52,8 @@ include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake) pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config) pw_set_backend(pw_log pw_log_basic) -pw_set_backend(pw_assert pw_assert_log) +pw_set_backend(pw_assert.check pw_assert_log.check_backend) +pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend) pw_set_backend(pw_sys_io pw_sys_io.nrfconnect) set(dir_pw_third_party_nanopb "${CHIP_ROOT}/third_party/nanopb/repo" CACHE STRING "" FORCE) diff --git a/examples/platform/nrfconnect/pw_sys_io/CMakeLists.txt b/examples/platform/nrfconnect/pw_sys_io/CMakeLists.txt index 466168e405d097..9e3a33c158b099 100644 --- a/examples/platform/nrfconnect/pw_sys_io/CMakeLists.txt +++ b/examples/platform/nrfconnect/pw_sys_io/CMakeLists.txt @@ -14,4 +14,5 @@ pw_add_module_library(pw_sys_io.nrfconnect PRIVATE_DEPS pw_sys_io suppress_zephyr_warnings + pw_sys_io.default_putget_bytes ) diff --git a/examples/shell/efr32/args.gni b/examples/shell/efr32/args.gni index 9d49561c413334..a80bfb32a7e784 100644 --- a/examples/shell/efr32/args.gni +++ b/examples/shell/efr32/args.gni @@ -19,7 +19,7 @@ import("${chip_root}/src/platform/EFR32/args.gni") efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" chip_enable_openthread = true chip_openthread_ftd = true chip_build_libshell = true diff --git a/examples/shell/qpg/args.gni b/examples/shell/qpg/args.gni index aa5f8f16d9ed27..46bcd2aa1b8297 100644 --- a/examples/shell/qpg/args.gni +++ b/examples/shell/qpg/args.gni @@ -19,7 +19,7 @@ import("${chip_root}/examples/platform/qpg/args.gni") qpg_sdk_target = get_label_info(":sdk", "label_no_toolchain") pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" chip_build_libshell = true # Disable lock tracking, since our FreeRTOS configuration does not set diff --git a/examples/temperature-measurement-app/esp32/CMakeLists.txt b/examples/temperature-measurement-app/esp32/CMakeLists.txt index aacc392404c4ea..6bd79c439c876a 100644 --- a/examples/temperature-measurement-app/esp32/CMakeLists.txt +++ b/examples/temperature-measurement-app/esp32/CMakeLists.txt @@ -50,8 +50,10 @@ flashing_script() if (CONFIG_ENABLE_PW_RPC) get_filename_component(CHIP_ROOT ./third_party/connectedhomeip REALPATH) include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cmake) +pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config) pw_set_backend(pw_log pw_log_basic) -pw_set_backend(pw_assert pw_assert_log) +pw_set_backend(pw_assert.check pw_assert_log.check_backend) +pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend) pw_set_backend(pw_sys_io pw_sys_io.esp32) add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo) diff --git a/examples/temperature-measurement-app/esp32/main/CMakeLists.txt b/examples/temperature-measurement-app/esp32/main/CMakeLists.txt index 0a113c9508727d..fe5c24bc612464 100644 --- a/examples/temperature-measurement-app/esp32/main/CMakeLists.txt +++ b/examples/temperature-measurement-app/esp32/main/CMakeLists.txt @@ -100,7 +100,7 @@ pw_proto_library(attributes_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(button_service @@ -111,7 +111,7 @@ pw_proto_library(button_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(descriptor_service @@ -122,7 +122,7 @@ pw_proto_library(descriptor_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(device_service @@ -135,7 +135,7 @@ pw_proto_library(device_service STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto ) pw_proto_library(wifi_service @@ -146,7 +146,7 @@ pw_proto_library(wifi_service PREFIX wifi_service DEPS - pw_protobuf.common_protos + pw_protobuf.common_proto STRIP_PREFIX ${CHIP_ROOT}/examples/common/pigweed/protos ) diff --git a/examples/window-app/efr32/args.gni b/examples/window-app/efr32/args.gni index 4fbeec81fd8e05..92b200171357b2 100644 --- a/examples/window-app/efr32/args.gni +++ b/examples/window-app/efr32/args.gni @@ -22,5 +22,5 @@ efr32_sdk_target = get_label_info(":sdk", "label_no_toolchain") chip_enable_ota_requestor = false pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" chip_enable_openthread = true diff --git a/examples/window-app/efr32/build_for_wifi_args.gni b/examples/window-app/efr32/build_for_wifi_args.gni index 04529fddd2076a..8a19f57ceb268a 100644 --- a/examples/window-app/efr32/build_for_wifi_args.gni +++ b/examples/window-app/efr32/build_for_wifi_args.gni @@ -19,4 +19,4 @@ chip_enable_openthread = false import("${chip_root}/src/platform/EFR32/wifi_args.gni") pw_log_BACKEND = "${chip_root}/src/lib/support/pw_log_chip" -pw_assert_BACKEND = "$dir_pw_assert_log" +pw_assert_BACKEND = "$dir_pw_assert_log:check_backend" diff --git a/third_party/pigweed/repo b/third_party/pigweed/repo index e61718e9f4e5c5..67bc89cdda8c66 160000 --- a/third_party/pigweed/repo +++ b/third_party/pigweed/repo @@ -1 +1 @@ -Subproject commit e61718e9f4e5c58c0855679a367de8b93eb116cb +Subproject commit 67bc89cdda8c663b1983c6215f14e8db6a19a328