Skip to content

Commit d05149c

Browse files
kkasperczyk-norestyled-commits
kkasperczyk-no
and
restyled-commits
authored
Integrated examples/common/chip-app-server to the CHIP src/app/server. (project-chip#4158)
* Integrated examples/common/chip-app-server to the CHIP src/app/server. examples/common/chip-app-server should is not a part of CHIP, while is needed by most of CHIP devices and is based on CHIP API. * Created src/app/server directory to store all CHIP accessory device specific files. * Moved examples/common/chip-app-server content to the src/app/server. * Removed examples/common/chip-app-server. * Aligned READMEs to describe directories content. * Restyled by gn Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 0e55cf8 commit d05149c

File tree

33 files changed

+76
-125
lines changed

33 files changed

+76
-125
lines changed

‎BUILD.gn

+5
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import("//build_overrides/nlassert.gni")
1818
import("//build_overrides/nlio.gni")
1919
import("//build_overrides/nlunit_test.gni")
2020
import("//build_overrides/pigweed.gni")
21+
import("//src/platform/device.gni")
2122
import("$dir_pw_build/python.gni")
2223

2324
# This build file should not be used in superproject builds.
@@ -66,6 +67,10 @@ if (current_toolchain != "${dir_pw_toolchain}/dummy:dummy") {
6667
"${nlunit_test_root}:nlunit-test",
6768
]
6869

70+
if (chip_device_platform != "none") {
71+
deps += [ "${chip_root}/src/app/server" ]
72+
}
73+
6974
if (chip_build_tests) {
7075
deps += [ "//src:tests" ]
7176
}

‎config/nrfconnect/chip-module/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ zephyr_interface_library_named(chip)
227227
target_compile_definitions(chip INTERFACE CHIP_HAVE_CONFIG_H)
228228
target_include_directories(chip INTERFACE
229229
${CHIP_ROOT}/src
230+
${CHIP_ROOT}/src/app/server
230231
${CHIP_ROOT}/src/app/util
231232
${CHIP_ROOT}/src/include
232233
${CHIP_ROOT}/src/lib

‎examples/all-clusters-app/all-clusters-common/BUILD.gn

+2-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ config("includes") {
2323

2424
source_set("all-clusters-common") {
2525
sources = [
26-
"${chip_root}/examples/common/chip-app-server/DataModelHandler.cpp",
2726
"${chip_root}/src/app/clusters/barrier-control-server/barrier-control-server.cpp",
2827
"${chip_root}/src/app/clusters/basic/basic.cpp",
2928
"${chip_root}/src/app/clusters/color-control-server/color-control-server.cpp",
@@ -44,6 +43,7 @@ source_set("all-clusters-common") {
4443
"${chip_root}/src/app/clusters/temperature-measurement-server/temperature-measurement-server.cpp",
4544
"${chip_root}/src/app/reporting/reporting-default-configuration.cpp",
4645
"${chip_root}/src/app/reporting/reporting.cpp",
46+
"${chip_root}/src/app/server/DataModelHandler.cpp",
4747
"${chip_root}/src/app/util/af-event.cpp",
4848
"${chip_root}/src/app/util/af-main-common.cpp",
4949
"${chip_root}/src/app/util/attribute-size.cpp",
@@ -61,10 +61,7 @@ source_set("all-clusters-common") {
6161
"gen/callback-stub.cpp",
6262
]
6363

64-
deps = [
65-
"${chip_root}/examples/common/chip-app-server:chip-app-server",
66-
"${chip_root}/src/lib",
67-
]
64+
deps = [ "${chip_root}/src/lib" ]
6865

6966
public_configs = [ ":includes" ]
7067
}

‎examples/all-clusters-app/esp32/main/component.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ COMPONENT_DEPENDS := chip QRCode tft spidriver
2323

2424
COMPONENT_SRCDIRS := \
2525
. \
26-
../third_party/connectedhomeip/examples/common/chip-app-server \
2726
../third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common/gen \
27+
../third_party/connectedhomeip/src/app/server \
2828
../third_party/connectedhomeip/src/app/util \
2929
../third_party/connectedhomeip/src/app/clusters/on-off-server \
3030
../third_party/connectedhomeip/src/app/clusters/level-control \
@@ -46,7 +46,7 @@ COMPONENT_SRCDIRS :=
4646
4747

4848
COMPONENT_EXTRA_INCLUDES := $(PROJECT_PATH)/third_party/connectedhomeip/src/app/util \
49-
$(PROJECT_PATH)/third_party/connectedhomeip/examples/common/chip-app-server/include \
49+
$(PROJECT_PATH)/third_party/connectedhomeip/src/app/server \
5050
$(PROJECT_PATH)/third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common \
5151
$(PROJECT_PATH)/third_party/connectedhomeip/src
5252

‎examples/all-clusters-app/linux/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ config("includes") {
2323
".",
2424
"include",
2525
"${chip_root}/src/app/util",
26+
"${chip_root}/src/app/server",
2627
]
2728
}
2829

@@ -39,7 +40,6 @@ executable("all-clusters-server") {
3940

4041
deps = [
4142
"${chip_root}/examples/all-clusters-app/all-clusters-common",
42-
"${chip_root}/examples/common/chip-app-server:chip-app-server",
4343
"${chip_root}/src/lib",
4444
]
4545

‎examples/common/README.md

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Examples common libraries
2+
3+
## What is this?
4+
5+
The purpose of this directory is to contain libraries, which are not part of
6+
CHIP libraries nor provided by the CHIP, but still very useful for the CHIP
7+
examples in order to provide specific functionalities.
8+
9+
## Available libraries
10+
11+
- **m5stack-tft** - TFT library for ESP32 platform.
12+
- **QRCode** - QR Code generator library
13+
- **screen-framework** - Framework for creating simple on screen user
14+
interfaces.

‎examples/common/chip-app-server/.gn

-23
This file was deleted.

‎examples/common/chip-app-server/BUILD.gn

-45
This file was deleted.

‎examples/common/chip-app-server/build

-1
This file was deleted.

‎examples/lighting-app/efr32/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ efr32_executable("lighting_app") {
6868
public_deps = [
6969
":sdk",
7070
"${chip_root}/examples/common/QRCode",
71-
"${chip_root}/examples/common/chip-app-server:chip-app-server",
7271
"${chip_root}/examples/lighting-app/lighting-common",
7372
"${chip_root}/src/lib",
7473
"${chip_root}/src/setup_payload",
@@ -81,6 +80,7 @@ efr32_executable("lighting_app") {
8180
include_dirs += [
8281
"${efr32_project_dir}/include",
8382
"${chip_root}/src/app/util",
83+
"${chip_root}/src/app/server",
8484
"${examples_plat_dir}",
8585
]
8686

‎examples/lighting-app/lighting-common/BUILD.gn

+2-5
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ config("includes") {
2323

2424
source_set("lighting-common") {
2525
sources = [
26-
"${chip_root}/examples/common/chip-app-server/DataModelHandler.cpp",
2726
"${chip_root}/src/app/clusters/level-control/level-control.cpp",
2827
"${chip_root}/src/app/clusters/on-off-server/on-off.cpp",
2928
"${chip_root}/src/app/reporting/reporting-default-configuration.cpp",
3029
"${chip_root}/src/app/reporting/reporting.cpp",
30+
"${chip_root}/src/app/server/DataModelHandler.cpp",
3131
"${chip_root}/src/app/util/af-event.cpp",
3232
"${chip_root}/src/app/util/af-main-common.cpp",
3333
"${chip_root}/src/app/util/attribute-size.cpp",
@@ -45,10 +45,7 @@ source_set("lighting-common") {
4545
"gen/callback-stub.cpp",
4646
]
4747

48-
deps = [
49-
"${chip_root}/examples/common/chip-app-server:chip-app-server",
50-
"${chip_root}/src/lib",
51-
]
48+
deps = [ "${chip_root}/src/lib" ]
5249

5350
public_configs = [ ":includes" ]
5451
}

‎examples/lighting-app/linux/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ config("includes") {
2323
".",
2424
"include",
2525
"${chip_root}/src/app/util",
26+
"${chip_root}/src/app/server",
2627
]
2728
}
2829

@@ -43,7 +44,6 @@ executable("chip-tool-server") {
4344
public_configs = [ ":includes" ]
4445

4546
deps = [
46-
"${chip_root}/examples/common/chip-app-server:chip-app-server",
4747
"${chip_root}/examples/lighting-app/lighting-common",
4848
"${chip_root}/src/lib",
4949
]

‎examples/lighting-app/nrfconnect/CMakeLists.txt

+2-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
cmake_minimum_required(VERSION 3.13.1)
1717

1818
get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
19-
get_filename_component(CHIP_APP_SERVER ${CHIP_ROOT}/examples/common/chip-app-server REALPATH)
2019
get_filename_component(NRFCONNECT_COMMON ${CHIP_ROOT}/examples/platform/nrfconnect REALPATH)
2120
get_filename_component(LIGHTING_COMMON ${CHIP_ROOT}/examples/lighting-app/lighting-common REALPATH)
2221

@@ -30,8 +29,7 @@ target_include_directories(app PRIVATE
3029
main/include
3130
${LIGHTING_COMMON}
3231
${NRFCONNECT_COMMON}/util/include
33-
${NRFCONNECT_COMMON}/app/include
34-
${CHIP_APP_SERVER}/include)
32+
${NRFCONNECT_COMMON}/app/include)
3533

3634
target_sources(app PRIVATE
3735
main/AppTask.cpp
@@ -45,10 +43,7 @@ target_sources(app PRIVATE
4543
${NRFCONNECT_COMMON}/util/NFCWidget.cpp
4644
${NRFCONNECT_COMMON}/util/ThreadUtil.cpp
4745
${NRFCONNECT_COMMON}/app/Service.cpp
48-
${CHIP_APP_SERVER}/DataModelHandler.cpp
49-
${CHIP_APP_SERVER}/Server.cpp
50-
${CHIP_APP_SERVER}/QRCodeUtil.cpp
51-
${CHIP_APP_SERVER}/RendezvousServer.cpp
46+
${CHIP_ROOT}/src/app/server/DataModelHandler.cpp
5247
${CHIP_ROOT}/src/app/reporting/reporting-default-configuration.cpp
5348
${CHIP_ROOT}/src/app/reporting/reporting.cpp
5449
${CHIP_ROOT}/src/app/util/af-event.cpp

‎examples/lock-app/efr32/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ efr32_executable("lock_app") {
6868
public_deps = [
6969
":sdk",
7070
"${chip_root}/examples/common/QRCode",
71-
"${chip_root}/examples/common/chip-app-server:chip-app-server",
7271
"${chip_root}/examples/lock-app/lock-common",
7372
"${chip_root}/src/lib",
7473
"${chip_root}/src/setup_payload",
@@ -81,6 +80,7 @@ efr32_executable("lock_app") {
8180
include_dirs += [
8281
"${efr32_project_dir}/include",
8382
"${chip_root}/src/app/util",
83+
"${chip_root}/src/app/server",
8484
"${examples_plat_dir}",
8585
]
8686

‎examples/lock-app/k32w/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ k32w_sdk("sdk") {
3131
"${k32w_platform_dir}/app/support",
3232
"${chip_root}/examples/lock-app/lock-common",
3333
"${chip_root}/src/app/util",
34+
"${chip_root}/src/app/server",
3435
"${k32w_platform_dir}/util/include",
3536
]
3637

@@ -69,7 +70,6 @@ k32w_executable("lock_app") {
6970

7071
deps = [
7172
":sdk",
72-
"${chip_root}/examples/common/chip-app-server:chip-app-server",
7373
"${chip_root}/examples/lock-app/lock-common",
7474
"${chip_root}/src/lib",
7575
"${chip_root}/third_party/mbedtls:mbedtls",

‎examples/lock-app/k32w/Makefile

+1-3
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ SRCS = \
5252
$(CHIP_ROOT)/src/app/util/process-global-message.c \
5353
$(CHIP_ROOT)/src/app/util/util.c \
5454
$(CHIP_ROOT)/src/app/clusters/on-off-server/on-off.c \
55-
$(CHIP_ROOT)/examples/common/chip-app-server/DataModelHandler.cpp \
56-
$(CHIP_ROOT)/examples/common/chip-app-server/Server.cpp \
55+
$(CHIP_ROOT)/src/app/server/DataModelHandler.cpp \
5756
$(CHIP_ROOT)/examples/lock-app/lock-common/gen/call-command-handler.c \
5857
$(CHIP_ROOT)/examples/lock-app/lock-common/gen/callback-stub.c \
5958
$(K32W061_SDK_ROOT)/rtos/amazon-freertos/lib/FreeRTOS/tasks.c \
@@ -109,7 +108,6 @@ INC_DIRS = \
109108
$(CHIP_ROOT)/examples/platform/k32w/app/support \
110109
$(CHIP_ROOT)/examples/platform/k32w/app/project_include \
111110
$(CHIP_ROOT)/examples/lock-app/lock-common/ \
112-
$(CHIP_ROOT)/examples/common/chip-app-server/include/ \
113111
$(CHIP_ROOT)/src/include/ \
114112
$(CHIP_ROOT)/src/lib \
115113
$(CHIP_ROOT)/src/ \

‎examples/lock-app/lock-common/BUILD.gn

+2-5
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ config("includes") {
2424

2525
source_set("lock-common") {
2626
sources = [
27-
"${chip_root}/examples/common/chip-app-server/DataModelHandler.cpp",
2827
"${chip_root}/src/app/clusters/on-off-server/on-off.cpp",
2928
"${chip_root}/src/app/reporting/reporting-default-configuration.cpp",
3029
"${chip_root}/src/app/reporting/reporting.cpp",
30+
"${chip_root}/src/app/server/DataModelHandler.cpp",
3131
"${chip_root}/src/app/util/af-event.cpp",
3232
"${chip_root}/src/app/util/af-main-common.cpp",
3333
"${chip_root}/src/app/util/attribute-size.cpp",
@@ -45,10 +45,7 @@ source_set("lock-common") {
4545
"gen/callback-stub.cpp",
4646
]
4747

48-
deps = [
49-
"${chip_root}/examples/common/chip-app-server:chip-app-server",
50-
"${chip_root}/src/lib",
51-
]
48+
deps = [ "${chip_root}/src/lib" ]
5249

5350
public_configs = [ ":includes" ]
5451
}

‎examples/lock-app/nrfconnect/CMakeLists.txt

+2-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
cmake_minimum_required(VERSION 3.13.1)
1717

1818
get_filename_component(CHIP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/third_party/connectedhomeip REALPATH)
19-
get_filename_component(CHIP_APP_SERVER ${CHIP_ROOT}/examples/common/chip-app-server REALPATH)
2019
get_filename_component(NRFCONNECT_COMMON ${CHIP_ROOT}/examples/platform/nrfconnect REALPATH)
2120
get_filename_component(LOCK_COMMON ${CHIP_ROOT}/examples/lock-app/lock-common REALPATH)
2221

@@ -30,8 +29,7 @@ target_include_directories(app PRIVATE
3029
main/include
3130
${LOCK_COMMON}
3231
${NRFCONNECT_COMMON}/util/include
33-
${NRFCONNECT_COMMON}/app/include
34-
${CHIP_APP_SERVER}/include)
32+
${NRFCONNECT_COMMON}/app/include)
3533

3634
target_sources(app PRIVATE
3735
main/AppTask.cpp
@@ -44,10 +42,7 @@ target_sources(app PRIVATE
4442
${NRFCONNECT_COMMON}/util/NFCWidget.cpp
4543
${NRFCONNECT_COMMON}/util/ThreadUtil.cpp
4644
${NRFCONNECT_COMMON}/app/Service.cpp
47-
${CHIP_APP_SERVER}/DataModelHandler.cpp
48-
${CHIP_APP_SERVER}/Server.cpp
49-
${CHIP_APP_SERVER}/QRCodeUtil.cpp
50-
${CHIP_APP_SERVER}/RendezvousServer.cpp
45+
${CHIP_ROOT}/src/app/server/DataModelHandler.cpp
5146
${CHIP_ROOT}/src/app/reporting/reporting-default-configuration.cpp
5247
${CHIP_ROOT}/src/app/reporting/reporting.cpp
5348
${CHIP_ROOT}/src/app/util/af-event.cpp

0 commit comments

Comments
 (0)