[Telink] Cleanup & fix identify cluster

project-chip · Feb 28, 2023 · e4e3ec9 · e4e3ec9
1 parent 4884f38
commit e4e3ec9
Show file tree

Hide file tree

Showing 14 changed files with 1,437 additions and 1,538 deletions.
diff --git a/examples/temperature-measurement-app/telink/CMakeLists.txt b/examples/temperature-measurement-app/telink/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-#    Copyright (c) 2022 Project CHIP Authors
+#    Copyright (c) 2023 Project CHIP Authors
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -39,16 +39,17 @@ target_include_directories(app PRIVATE
                            ${GEN_DIR}/app-common
                            ${GEN_DIR}/temperature-measurement-app
                            ${TELINK_COMMON}/util/include
-                           ${TELINK_COMMON}/app/include)
+                           ${TELINK_COMMON}/app/include
+                           )
 
 add_definitions(
     "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>"
 )
 
 target_sources(app PRIVATE
                src/AppTask.cpp
-               src/main.cpp
                src/SensorManager.cpp
+               src/main.cpp
                ${TELINK_COMMON}/util/src/LEDWidget.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp
                ${TELINK_COMMON}/util/src/ThreadUtil.cpp
@@ -63,157 +64,3 @@ chip_configure_data_model(app
 if(CONFIG_CHIP_OTA_REQUESTOR)
     target_sources(app PRIVATE ${TELINK_COMMON}/util/src/OTAUtil.cpp)
 endif()
-
-# Fix for unused swap parameter in: zephyr/include/zephyr/arch/riscv/irq.h:70
-add_compile_options(-Wno-error=unused-parameter)
-
-if (CONFIG_CHIP_PW_RPC)
-
-# Make all targets created below depend on zephyr_interface to inherit MCU-related compilation flags
-link_libraries($<BUILD_INTERFACE:zephyr_interface>)
-
-set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
-include(${PIGWEED_ROOT}/pw_build/pigweed.cmake)
-include(${PIGWEED_ROOT}/pw_protobuf_compiler/proto.cmake)
-
-include($ENV{PW_ROOT}/pw_assert/backend.cmake)
-include($ENV{PW_ROOT}/pw_log/backend.cmake)
-include($ENV{PW_ROOT}/pw_sys_io/backend.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.telink)
-
-set(dir_pw_third_party_nanopb "${CHIP_ROOT}/third_party/nanopb/repo" CACHE STRING "" FORCE)
-
-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/telink/pw_sys_io)
-
-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
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  PREFIX
-    lighting_service
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(ot_cli_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/ot_cli_service.proto
-  INPUTS
-    ${CHIP_ROOT}/examples/common/pigweed/protos/ot_cli_service.options
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  PREFIX
-    ot_cli_service
-  DEPS
-    pw_protobuf.common_proto
-)
-
-pw_proto_library(thread_service
-  SOURCES
-    ${CHIP_ROOT}/examples/common/pigweed/protos/thread_service.proto
-  INPUTS
-    ${CHIP_ROOT}/examples/common/pigweed/protos/thread_service.options
-  STRIP_PREFIX
-    ${CHIP_ROOT}/examples/common/pigweed/protos
-  PREFIX
-    thread_service
-  DEPS
-    pw_protobuf.common_proto
-)
-
-target_sources(app PRIVATE
-  ../../common/pigweed/RpcService.cpp
-  ../../common/pigweed/telink/PigweedLoggerMutex.cpp
-  ${TELINK_COMMON}/Rpc.cpp
-  ${TELINK_COMMON}/util/src/PigweedLogger.cpp
-)
-
-target_include_directories(app PRIVATE
-  ${PIGWEED_ROOT}/pw_sys_io/public
-  ${CHIP_ROOT}/src/lib/support
-  ${CHIP_ROOT}/src/system
-  ${TELINK_COMMON}
-  ../../common
-  ../../common/pigweed
-  ../../common/pigweed/telink)
-
-target_compile_options(app 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_THREAD_SERVICE=1")
-
-target_link_libraries(app PRIVATE
-  attributes_service.nanopb_rpc
-  button_service.nanopb_rpc
-  descriptor_service.nanopb_rpc
-  device_service.nanopb_rpc
-  lighting_service.nanopb_rpc
-  thread_service.nanopb_rpc
-  pw_checksum
-  pw_hdlc
-  pw_hdlc.pw_rpc
-  pw_log
-  pw_rpc.server
-  pw_sys_io
-)
-
-endif(CONFIG_CHIP_PW_RPC)