reverting whitespace changes.

eahove · Jan 17, 2024 · c7e612c · c7e612c
1 parent 505eeda
commit c7e612c
Showing 1 changed file with 131 additions and 127 deletions.
diff --git a/examples/all-clusters-app/esp32/main/CMakeLists.txt b/examples/all-clusters-app/esp32/main/CMakeLists.txt
@@ -1,28 +1,28 @@
 #
-# Copyright (c) 2021 Project CHIP Authors
-# All rights reserved.
+#    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
+#    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
+#        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.
+#    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-app/esp32/main/component.mk
 set(PRIV_INCLUDE_DIRS_LIST
-  "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common/include"
-  "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/energy-management-app/energy-management-common/include"
-  "${CMAKE_CURRENT_LIST_DIR}/include"
-  "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/providers"
-  "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
-  "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/third_party/nlfaultinjection/include"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common/include"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/energy-management-app/energy-management-common/include"
+                      "${CMAKE_CURRENT_LIST_DIR}/include"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/providers"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32"
+                      "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/third_party/nlfaultinjection/include"
 )
 set(SRC_DIRS_LIST
                       "${CMAKE_CURRENT_LIST_DIR}"
@@ -95,50 +95,51 @@ set(SRC_DIRS_LIST
                       "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/electrical-energy-measurement-server"
 )
 
+
 set(EXCLUDE_SRCS "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp")
 
-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"
-  )
+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"
+)
 
-  if(${IDF_VERSION_MAJOR} LESS 5)
+if (${IDF_VERSION_MAJOR} LESS 5)
     list(APPEND PRIV_INCLUDE_DIRS_LIST "${IDF_PATH}/components/freertos/include/freertos")
-  else()
+else()
     list(APPEND PRIV_INCLUDE_DIRS_LIST "${IDF_PATH}/components/freertos/FreeRTOS-Kernel/include/freertos")
-  endif()
+endif()
 
-  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)
+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_ENABLE_ICD_SERVER)
-  list(APPEND PRIV_INCLUDE_DIRS_LIST "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/icd")
-  list(APPEND SRC_DIRS_LIST "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/icd")
+if (CONFIG_ENABLE_ICD_SERVER)
+    list(APPEND PRIV_INCLUDE_DIRS_LIST "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/icd")
+    list(APPEND SRC_DIRS_LIST "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/platform/esp32/icd")
 endif()
 
 set(PRIV_REQUIRES_LIST chip QRCode bt app_update nvs_flash spi_flash openthread)
 
 if(${IDF_TARGET} STREQUAL "esp32")
-  list(APPEND PRIV_REQUIRES_LIST spidriver screen-framework)
+    list(APPEND PRIV_REQUIRES_LIST spidriver screen-framework)
 endif()
 
 if(CONFIG_DEVICE_TYPE_ESP32_C3_DEVKITM)
-  list(APPEND PRIV_REQUIRES_LIST led_strip)
+    list(APPEND PRIV_REQUIRES_LIST led_strip)
 endif()
 
 idf_component_register(PRIV_INCLUDE_DIRS ${PRIV_INCLUDE_DIRS_LIST}
-  SRC_DIRS ${SRC_DIRS_LIST}
-  EXCLUDE_SRCS ${EXCLUDE_SRCS}
-  PRIV_REQUIRES ${PRIV_REQUIRES_LIST})
+                       SRC_DIRS ${SRC_DIRS_LIST}
+                       EXCLUDE_SRCS ${EXCLUDE_SRCS}
+                       PRIV_REQUIRES ${PRIV_REQUIRES_LIST})
 
 get_filename_component(CHIP_ROOT ${CMAKE_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
 
@@ -150,132 +151,135 @@ chip_app_component_zapgen("${CHIP_ROOT}/examples/all-clusters-app/all-clusters-c
 set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 17)
 target_compile_options(${COMPONENT_LIB} PRIVATE "-DCHIP_HAVE_CONFIG_H")
 target_compile_options(${COMPONENT_LIB} PUBLIC
-  "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>"
+           "-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>"
 )
 
-if(CONFIG_ENABLE_PW_RPC)
-  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)
+if (CONFIG_ENABLE_PW_RPC)
 
-  pw_proto_library(attributes_service
-    SOURCES
+
+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
+  INPUTS
     ${CHIP_ROOT}/examples/common/pigweed/protos/attributes_service.options
-    PREFIX
+  PREFIX
     attributes_service
-    STRIP_PREFIX
+  STRIP_PREFIX
     ${CHIP_ROOT}/examples/common/pigweed/protos
-    DEPS
+  DEPS
     pw_protobuf.common_proto
-  )
+)
 
-  pw_proto_library(button_service
-    SOURCES
+pw_proto_library(button_service
+  SOURCES
     ${CHIP_ROOT}/examples/common/pigweed/protos/button_service.proto
-    PREFIX
+  PREFIX
     button_service
-    STRIP_PREFIX
+  STRIP_PREFIX
     ${CHIP_ROOT}/examples/common/pigweed/protos
-    DEPS
+  DEPS
     pw_protobuf.common_proto
-  )
+)
 
-  pw_proto_library(descriptor_service
-    SOURCES
+pw_proto_library(descriptor_service
+  SOURCES
     ${CHIP_ROOT}/examples/common/pigweed/protos/descriptor_service.proto
-    PREFIX
+  PREFIX
     descriptor_service
-    STRIP_PREFIX
+  STRIP_PREFIX
     ${CHIP_ROOT}/examples/common/pigweed/protos
-    DEPS
+  DEPS
     pw_protobuf.common_proto
-  )
+)
 
-  pw_proto_library(device_service
-    SOURCES
+pw_proto_library(device_service
+  SOURCES
     ${CHIP_ROOT}/examples/common/pigweed/protos/device_service.proto
-    INPUTS
+  INPUTS
     ${CHIP_ROOT}/examples/common/pigweed/protos/device_service.options
-    PREFIX
+  PREFIX
     device_service
-    STRIP_PREFIX
+  STRIP_PREFIX
     ${CHIP_ROOT}/examples/common/pigweed/protos
-    DEPS
+  DEPS
     pw_protobuf.common_proto
-  )
+)
 
-  pw_proto_library(lighting_service
-    SOURCES
+pw_proto_library(lighting_service
+  SOURCES
     ${CHIP_ROOT}/examples/common/pigweed/protos/lighting_service.proto
-    PREFIX
+  PREFIX
     lighting_service
-    STRIP_PREFIX
+  STRIP_PREFIX
     ${CHIP_ROOT}/examples/common/pigweed/protos
-    DEPS
+  DEPS
     pw_protobuf.common_proto
-  )
+)
 
-  pw_proto_library(locking_service
-    SOURCES
+pw_proto_library(locking_service
+  SOURCES
     ${CHIP_ROOT}/examples/common/pigweed/protos/locking_service.proto
-    PREFIX
+  PREFIX
     locking_service
-    STRIP_PREFIX
+  STRIP_PREFIX
     ${CHIP_ROOT}/examples/common/pigweed/protos
-    DEPS
+  DEPS
     pw_protobuf.common_proto
-  )
+)
 
-  pw_proto_library(wifi_service
-    SOURCES
+pw_proto_library(wifi_service
+  SOURCES
     ${CHIP_ROOT}/examples/common/pigweed/protos/wifi_service.proto
-    INPUTS
+  INPUTS
     ${CHIP_ROOT}/examples/common/pigweed/protos/wifi_service.options
-    PREFIX
+  PREFIX
     wifi_service
-    DEPS
+  DEPS
     pw_protobuf.common_proto
-    STRIP_PREFIX
+  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_sys_io
-    pw_trace
-    pw_trace_tokenized
-    pw_trace_tokenized.trace_buffer
-    pw_trace_tokenized.rpc_service
-    pw_trace_tokenized.protos.nanopb_rpc
-  )
+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_sys_io
+  pw_trace
+  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
+target_link_options(${COMPONENT_LIB}
+  PUBLIC
     "-T${PIGWEED_ROOT}/pw_tokenizer/pw_tokenizer_linker_sections.ld"
     "-L${PIGWEED_ROOT}/pw_tokenizer"
-  )
+)
+
+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")
 
-  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)
+endif (CONFIG_ENABLE_PW_RPC)