Use DataModelHandler from examples/common/chip-app-server in ESP32 wi…

…fi-echo demo app instead of its own copy (#3468)
project-chip · Oct 27, 2020 · 7257d44 · 7257d44
1 parent 22d5b09
commit 7257d44
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 266 deletions.
diff --git a/examples/temperature-measurement-app/esp32/main/DataModelHandler.cpp b/examples/temperature-measurement-app/esp32/main/DataModelHandler.cpp
diff --git a/examples/temperature-measurement-app/esp32/main/component.mk b/examples/temperature-measurement-app/esp32/main/component.mk
@@ -24,12 +24,14 @@ COMPONENT_DEPENDS := chip QRCode tft spidriver
 COMPONENT_SRCDIRS :=                                                              \
   .                                                                               \
   gen                                                                             \
+  ../third_party/connectedhomeip/examples/common/chip-app-server                  \
   ../third_party/connectedhomeip/src/app/util                                     \
   ../third_party/connectedhomeip/src/app/clusters/basic                           \
   ../third_party/connectedhomeip/src/app/clusters/temperature-measurement-server  \
 
 
-COMPONENT_EXTRA_INCLUDES := $(PROJECT_PATH)/third_party/connectedhomeip/src/app/util \
+COMPONENT_EXTRA_INCLUDES := $(PROJECT_PATH)/third_party/connectedhomeip/src/app/util                            \
+                            $(PROJECT_PATH)/third_party/connectedhomeip/examples/common/chip-app-server/include \
                             $(PROJECT_PATH)/third_party/connectedhomeip/src
 
 # So "gen/*" files are found by the src/app bits.

diff --git a/examples/temperature-measurement-app/esp32/main/include/DataModelHandler.h b/examples/temperature-measurement-app/esp32/main/include/DataModelHandler.h
diff --git a/examples/wifi-echo/server/esp32/main/DataModelHandler.cpp b/examples/wifi-echo/server/esp32/main/DataModelHandler.cpp
diff --git a/examples/wifi-echo/server/esp32/main/component.mk b/examples/wifi-echo/server/esp32/main/component.mk
@@ -24,6 +24,7 @@ COMPONENT_DEPENDS := chip QRCode tft spidriver
 COMPONENT_SRCDIRS :=                                                                \
   .                                                                                 \
   gen                                                                               \
+  ../third_party/connectedhomeip/examples/common/chip-app-server                    \
   ../third_party/connectedhomeip/src/app/util                                       \
   ../third_party/connectedhomeip/src/app/clusters/on-off-server                     \
   ../third_party/connectedhomeip/src/app/clusters/level-control                     \
@@ -42,7 +43,8 @@ COMPONENT_SRCDIRS :=
 #  ../third_party/connectedhomeip/src/app/clusters/ias-zone-client                  \
 
 
-COMPONENT_EXTRA_INCLUDES := $(PROJECT_PATH)/third_party/connectedhomeip/src/app/util \
+COMPONENT_EXTRA_INCLUDES := $(PROJECT_PATH)/third_party/connectedhomeip/src/app/util                            \
+                            $(PROJECT_PATH)/third_party/connectedhomeip/examples/common/chip-app-server/include \
                             $(PROJECT_PATH)/third_party/connectedhomeip/src
 
 # So "gen/*" files are found by the src/app bits.

diff --git a/examples/wifi-echo/server/esp32/main/include/DataModelHandler.h b/examples/wifi-echo/server/esp32/main/include/DataModelHandler.h