From 051685b69b49aa9dfd9857d30ba271aaa5c7ee4c Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Tue, 7 Dec 2021 12:12:12 -0500 Subject: [PATCH] Revert "Add tracing service to example/platform/esp rpc (#12386)" (#12686) This reverts commit 59ca4148ad864ce20b7b1841f571b5461508d87b. --- .../esp32/main/CMakeLists.txt | 3 +-- examples/platform/esp32/Rpc.cpp | 25 ------------------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/examples/all-clusters-app/esp32/main/CMakeLists.txt b/examples/all-clusters-app/esp32/main/CMakeLists.txt index 46a73328487273..41e092378c7f5a 100644 --- a/examples/all-clusters-app/esp32/main/CMakeLists.txt +++ b/examples/all-clusters-app/esp32/main/CMakeLists.txt @@ -227,7 +227,6 @@ target_compile_options(${COMPONENT_LIB} PRIVATE "-DPW_RPC_BUTTON_SERVICE=1" "-DPW_RPC_DEVICE_SERVICE=1" "-DPW_RPC_LIGHTING_SERVICE=1" - "-DPW_RPC_LOCKING_SERVICE=1" - "-DPW_RPC_TRACING_SERVICE=1") + "-DPW_RPC_LOCKING_SERVICE=1") endif (CONFIG_ENABLE_PW_RPC) diff --git a/examples/platform/esp32/Rpc.cpp b/examples/platform/esp32/Rpc.cpp index 9286191dc4eeca..3cfe0070e815b6 100644 --- a/examples/platform/esp32/Rpc.cpp +++ b/examples/platform/esp32/Rpc.cpp @@ -52,23 +52,6 @@ #include "pigweed/rpc_services/Locking.h" #endif // defined(PW_RPC_LOCKING_SERVICE) && PW_RPC_LOCKING_SERVICE -#if defined(PW_RPC_TRACING_SERVICE) && PW_RPC_TRACING_SERVICE -#include "pw_trace/trace.h" -#include "pw_trace_tokenized/trace_rpc_service_nanopb.h" - -// Define trace time for pw_trace -PW_TRACE_TIME_TYPE pw_trace_GetTraceTime() -{ - return (PW_TRACE_TIME_TYPE) chip::System::SystemClock().GetMonotonicMicroseconds64().count(); -} -// Microsecond time source -size_t pw_trace_GetTraceTimeTicksPerSecond() -{ - return 1000000; -} - -#endif // defined(PW_RPC_TRACING_SERVICE) && PW_RPC_TRACING_SERVICE - namespace chip { namespace rpc { @@ -139,10 +122,6 @@ Lighting lighting_service; Locking locking; #endif // defined(PW_RPC_LOCKING_SERVICE) && PW_RPC_LOCKING_SERVICE -#if defined(PW_RPC_TRACING_SERVICE) && PW_RPC_TRACING_SERVICE -pw::trace::TraceService trace_service; -#endif // defined(PW_RPC_TRACING_SERVICE) && PW_RPC_TRACING_SERVICE - void RegisterServices(pw::rpc::Server & server) { #if defined(PW_RPC_ATTRIBUTE_SERVICE) && PW_RPC_ATTRIBUTE_SERVICE @@ -164,10 +143,6 @@ void RegisterServices(pw::rpc::Server & server) #if defined(PW_RPC_LOCKING_SERVICE) && PW_RPC_LOCKING_SERVICE server.RegisterService(locking); #endif // defined(PW_RPC_LOCKING_SERVICE) && PW_RPC_LOCKING_SERVICE - -#if defined(PW_RPC_TRACING_SERVICE) && PW_RPC_TRACING_SERVICE - server.RegisterService(trace_service); -#endif // defined(PW_RPC_TRACING_SERVICE) && PW_RPC_TRACING_SERVICE } } // namespace