From eb43c930cb1d70a184aae6166821382b5556f58b Mon Sep 17 00:00:00 2001 From: Vivien Nicolas Date: Wed, 18 Nov 2020 19:13:44 +0100 Subject: [PATCH] Temperature app measurement does not build anymore on the esp32 --- .../temperature-measurement-app/esp32/main/DeviceCallbacks.cpp | 1 + examples/temperature-measurement-app/esp32/main/component.mk | 2 ++ examples/temperature-measurement-app/esp32/main/main.cpp | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/temperature-measurement-app/esp32/main/DeviceCallbacks.cpp b/examples/temperature-measurement-app/esp32/main/DeviceCallbacks.cpp index 1a8ef0728974ee..c232b7e4ec5c63 100644 --- a/examples/temperature-measurement-app/esp32/main/DeviceCallbacks.cpp +++ b/examples/temperature-measurement-app/esp32/main/DeviceCallbacks.cpp @@ -32,6 +32,7 @@ static const char * TAG = "echo-devicecallbacks"; +using namespace ::chip; using namespace ::chip::Inet; using namespace ::chip::System; using namespace ::chip::DeviceLayer; diff --git a/examples/temperature-measurement-app/esp32/main/component.mk b/examples/temperature-measurement-app/esp32/main/component.mk index a1fa47a35339f0..9762d2b50b1e47 100644 --- a/examples/temperature-measurement-app/esp32/main/component.mk +++ b/examples/temperature-measurement-app/esp32/main/component.mk @@ -26,11 +26,13 @@ COMPONENT_SRCDIRS := gen \ ../third_party/connectedhomeip/examples/common/chip-app-server \ ../third_party/connectedhomeip/src/app/util \ + ../third_party/connectedhomeip/src/app/reporting \ ../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 \ + $(PROJECT_PATH)/third_party/connectedhomeip/src/app/reporting \ $(PROJECT_PATH)/third_party/connectedhomeip/examples/common/chip-app-server/include \ $(PROJECT_PATH)/third_party/connectedhomeip/src diff --git a/examples/temperature-measurement-app/esp32/main/main.cpp b/examples/temperature-measurement-app/esp32/main/main.cpp index 65926b8f2a776b..af940f026c2234 100644 --- a/examples/temperature-measurement-app/esp32/main/main.cpp +++ b/examples/temperature-measurement-app/esp32/main/main.cpp @@ -47,7 +47,7 @@ using namespace ::chip::DeviceLayer; // Used to indicate that an IP address has been added to the QRCode #define EXAMPLE_VENDOR_TAG_IP 1 -extern void PairingComplete(SecurePairingSession * pairing); +extern void PairingComplete(NodeId assignedNodeId, NodeId peerNodeId, SecurePairingSession * pairing); const char * TAG = "temperature-measurement-app";