[Mbed] Add RPC support for locking and lighting examples

config/mbed/CMakeLists.txt

@@ -225,8 +225,12 @@ if (CONFIG_CHIP_PW_RPC)
     list(APPEND CHIP_LIBRARIES -lPwRpc)
     if (${APP_TARGET} MATCHES "pigweed-app")
         set(CONFIG_CHIP_PW_RPC_ECHO_PROTO "y")
-    else()
-        set(CONFIG_CHIP_PW_RPC_ECHO_PROTO "n")
+    elseif (${APP_TARGET} MATCHES "lighting-app")
+        set(CONFIG_CHIP_PW_RPC_COMMON_PROTO "y")
+        set(CONFIG_CHIP_PW_RPC_LIGHTING_PROTO "y")
+    elseif (${APP_TARGET} MATCHES "lock-app")
+        set(CONFIG_CHIP_PW_RPC_COMMON_PROTO "y")
+        set(CONFIG_CHIP_PW_RPC_LOCKING_PROTO "y")
     endif()
 endif(CONFIG_CHIP_PW_RPC)
 
@@ -271,6 +275,9 @@ chip_gn_arg_bool  ("chip_bypass_rendezvous"               CONFIG_CHIP_BYPASS_REN
 chip_gn_arg_bool  ("chip_build_pw_rpc_lib"                CONFIG_CHIP_PW_RPC)
 if (CONFIG_CHIP_PW_RPC)
     chip_gn_arg_bool  ("chip_build_pw_rpc_echo_proto"         CONFIG_CHIP_PW_RPC_ECHO_PROTO)
+    chip_gn_arg_bool  ("chip_build_pw_rpc_common_proto"       CONFIG_CHIP_PW_RPC_COMMON_PROTO)
+    chip_gn_arg_bool  ("chip_build_pw_rpc_lighting_proto"     CONFIG_CHIP_PW_RPC_LIGHTING_PROTO)
+    chip_gn_arg_bool  ("chip_build_pw_rpc_locking_proto"      CONFIG_CHIP_PW_RPC_LOCKING_PROTO)
 endif(CONFIG_CHIP_PW_RPC)
 
 file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/args.gn CONTENT ${CHIP_GN_ARGS})
@@ -335,26 +342,18 @@ endif()
 if (CONFIG_CHIP_PW_RPC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17" PARENT_SCOPE)
     list(APPEND CHIP_DEFINES 
-        CONFIG_CHIP_PW_RPC=1
+        CHIP_PW_RPC=1
     )
 endif()
 
-target_include_directories(${APP_TARGET} PRIVATE 
-                           ${CHIP_INCLUDES}
-)
-
-target_compile_definitions(${APP_TARGET} PRIVATE
-                           ${CHIP_DEFINES}                      
-)
-
-
 if (CONFIG_CHIP_PW_RPC)
 
 set(PIGWEED_ROOT "${CHIP_ROOT}/third_party/pigweed/repo")
 
 target_sources(${APP_TARGET} PRIVATE
     ${CHIP_ROOT}/examples/common/pigweed/RpcService.cpp
     ${CHIP_ROOT}/examples/common/pigweed/mbed/PigweedLoggerMutex.cpp
+    ${CHIP_ROOT}/examples/common/pigweed/mbed/Rpc.cpp
     ${MBED_COMMON}/util/PigweedLogger.cpp
 )
 
@@ -389,16 +388,64 @@ target_include_directories(${APP_TARGET} PRIVATE
                     ${CHIP_ROOT}/third_party/nanopb/repo
 
                     ${CHIP_ROOT}/examples/common
-                    ${CHIP_ROOT}/examples//common/pigweed/mbed
+                    ${CHIP_ROOT}/examples/common/pigweed
+                    ${CHIP_ROOT}/examples/common/pigweed/mbed
                     ${MBED_COMMON}/pw_sys_io/public
+
+                    ${CMAKE_CURRENT_BINARY_DIR}/protocol_buffer/gen/third_party/connectedhomeip/third_party/pigweed/repo/pw_rpc/protos.proto_library/pwpb
+                    ${CMAKE_CURRENT_BINARY_DIR}/protocol_buffer/gen/third_party/connectedhomeip/third_party/pigweed/repo/pw_protobuf/common_protos.proto_library/nanopb
 )
 
 if (CONFIG_CHIP_PW_RPC_ECHO_PROTO)
     target_include_directories(${APP_TARGET} PRIVATE
         ${CMAKE_CURRENT_BINARY_DIR}/protocol_buffer/gen/third_party/connectedhomeip/third_party/pigweed/repo/pw_rpc/protos.proto_library/nanopb_rpc
         ${CMAKE_CURRENT_BINARY_DIR}/protocol_buffer/gen/third_party/connectedhomeip/third_party/pigweed/repo/pw_rpc/protos.proto_library/nanopb
-        ${CMAKE_CURRENT_BINARY_DIR}/protocol_buffer/gen/third_party/connectedhomeip/third_party/pigweed/repo/pw_rpc/protos.proto_library/pwpb
+    )
+    list(APPEND CHIP_DEFINES 
+        CHIP_PW_RPC_ECHO_PROTO=1
     )
 endif(CONFIG_CHIP_PW_RPC_ECHO_PROTO)
 
-endif(CONFIG_CHIP_PW_RPC) 
+if (CONFIG_CHIP_PW_RPC_COMMON_PROTO)
+    target_include_directories(${APP_TARGET} PRIVATE
+        ${CMAKE_CURRENT_BINARY_DIR}/protocol_buffer/gen/third_party/connectedhomeip/examples/common/pigweed/button_service.proto_library/nanopb
+        ${CMAKE_CURRENT_BINARY_DIR}/protocol_buffer/gen/third_party/connectedhomeip/examples/common/pigweed/button_service.proto_library/nanopb_rpc
+
+        ${CMAKE_CURRENT_BINARY_DIR}/protocol_buffer/gen/third_party/connectedhomeip/examples/common/pigweed/device_service.proto_library/nanopb
+        ${CMAKE_CURRENT_BINARY_DIR}/protocol_buffer/gen/third_party/connectedhomeip/examples/common/pigweed/device_service.proto_library/nanopb_rpc
+    )
+    list(APPEND CHIP_DEFINES 
+        CHIP_PW_RPC_COMMON_PROTO=1
+    )
+endif(CONFIG_CHIP_PW_RPC_COMMON_PROTO)
+
+if (CONFIG_CHIP_PW_RPC_LIGHTING_PROTO)
+    target_include_directories(${APP_TARGET} PRIVATE
+        ${CMAKE_CURRENT_BINARY_DIR}/protocol_buffer/gen/third_party/connectedhomeip/examples/common/pigweed/lighting_service.proto_library/nanopb
+        ${CMAKE_CURRENT_BINARY_DIR}/protocol_buffer/gen/third_party/connectedhomeip/examples/common/pigweed/lighting_service.proto_library/nanopb_rpc
+    )
+    list(APPEND CHIP_DEFINES 
+        CHIP_PW_RPC_LIGHTING_PROTO=1
+    )
+endif(CONFIG_CHIP_PW_RPC_LIGHTING_PROTO)
+
+if (CONFIG_CHIP_PW_RPC_LOCKING_PROTO)
+    target_include_directories(${APP_TARGET} PRIVATE
+        ${CMAKE_CURRENT_BINARY_DIR}/protocol_buffer/gen/third_party/connectedhomeip/examples/common/pigweed/locking_service.proto_library/nanopb
+        ${CMAKE_CURRENT_BINARY_DIR}/protocol_buffer/gen/third_party/connectedhomeip/examples/common/pigweed/locking_service.proto_library/nanopb_rpc
+    )
+    list(APPEND CHIP_DEFINES 
+        CHIP_PW_RPC_LOCKING_PROTO=1
+    )
+endif(CONFIG_CHIP_PW_RPC_LOCKING_PROTO)
+
+endif(CONFIG_CHIP_PW_RPC)
+
+
+target_include_directories(${APP_TARGET} PRIVATE 
+                           ${CHIP_INCLUDES}
+)
+
+target_compile_definitions(${APP_TARGET} PRIVATE
+                           ${CHIP_DEFINES}                      
+)

config/mbed/chip-gn/lib/pw_rpc/BUILD.gn

@@ -18,6 +18,9 @@ import("$dir_pw_build/target_types.gni")
 
 declare_args() {
   chip_build_pw_rpc_echo_proto = false
+  chip_build_pw_rpc_common_proto = false
+  chip_build_pw_rpc_lighting_proto = false
+  chip_build_pw_rpc_locking_proto = false
 }
 
 static_library("pw_rpc") {
@@ -37,6 +40,23 @@ static_library("pw_rpc") {
     deps += [ "$dir_pw_rpc/nanopb:echo_service" ]
   }
 
+  if (chip_build_pw_rpc_common_proto) {
+    deps += [
+      "${chip_root}/examples/common/pigweed:button_service.nanopb_rpc",
+      "${chip_root}/examples/common/pigweed:device_service.nanopb_rpc",
+    ]
+  }
+
+  if (chip_build_pw_rpc_lighting_proto) {
+    deps +=
+        [ "${chip_root}/examples/common/pigweed:lighting_service.nanopb_rpc" ]
+  }
+
+  if (chip_build_pw_rpc_locking_proto) {
+    deps +=
+        [ "${chip_root}/examples/common/pigweed:locking_service.nanopb_rpc" ]
+  }
+
   deps += pw_build_LINK_DEPS
 
   output_dir = "${root_out_dir}/lib"

examples/common/pigweed/mbed/Rpc.cpp

@@ -0,0 +1,138 @@
+/*
+ *
+ *    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
+ *
+ *        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.
+ */
+
+#include "Rpc.h"
+#include "PigweedLogger.h"
+#include "PigweedLoggerMutex.h"
+#include "pigweed/RpcService.h"
+
+#include "pw_hdlc/rpc_channel.h"
+#include "pw_hdlc/rpc_packets.h"
+#include "pw_rpc/server.h"
+#include "pw_stream/sys_io_stream.h"
+#include "pw_sys_io/sys_io.h"
+#include "pw_sys_io_mbed/init.h"
+
+#include <platform/CHIPDeviceLayer.h>
+#include <support/logging/CHIPLogging.h>
+
+#ifdef CHIP_PW_RPC_ECHO_PROTO
+#include "pw_rpc/echo_service_nanopb.h"
+#endif
+
+#ifdef CHIP_PW_RPC_COMMON_PROTO
+#include "AppTask.h"
+#include "rpc_services/Button.h"
+#include "rpc_services/Device.h"
+#endif
+
+#ifdef CHIP_PW_RPC_LIGHTING_PROTO
+#include "rpc_services/Lighting.h"
+#endif
+
+#ifdef CHIP_PW_RPC_LOCKING_PROTO
+#include "rpc_services/Locking.h"
+#endif
+
+using namespace ::chip::DeviceLayer;
+using namespace ::rtos;
+
+namespace chip {
+namespace rpc {
+
+#ifdef CHIP_PW_RPC_COMMON_PROTO
+class MbedButton final : public Button
+{
+public:
+    pw::Status Event(ServerContext &, const chip_rpc_ButtonEvent & request, pw_protobuf_Empty & response)
+    {
+        GetAppTask().ButtonEventHandler(request.idx, request.pushed);
+        return pw::OkStatus();
+    }
+};
+#endif
+
+namespace {
+
+#define RPC_THREAD_NAME "RPC"
+#define RPC_STACK_SIZE (4 * 1024)
+
+rtos::Thread rpcThread{ osPriorityNormal, RPC_STACK_SIZE, /* memory provided */ nullptr, RPC_THREAD_NAME };
+
+#ifdef CHIP_PW_RPC_ECHO_PROTO
+pw::rpc::EchoService echo_service;
+#endif
+
+#ifdef CHIP_PW_RPC_COMMON_PROTO
+chip::rpc::MbedButton button_service;
+chip::rpc::Device device_service;
+#endif
+
+#ifdef CHIP_PW_RPC_LIGHTING_PROTO
+chip::rpc::Lighting lighting_service;
+#endif
+
+#ifdef CHIP_PW_RPC_LOCKING_PROTO
+chip::rpc::Locking locking_service;
+#endif
+
+void RegisterServices(pw::rpc::Server & server)
+{
+#ifdef CHIP_PW_RPC_ECHO_PROTO
+    server.RegisterService(echo_service);
+#endif
+
+#ifdef CHIP_PW_RPC_COMMON_PROTO
+    server.RegisterService(button_service);
+    server.RegisterService(device_service);
+#endif
+
+#ifdef CHIP_PW_RPC_LIGHTING_PROTO
+    server.RegisterService(lighting_service);
+#endif
+
+#ifdef CHIP_PW_RPC_LOCKING_PROTO
+    server.RegisterService(locking_service);
+#endif
+}
+
+} // namespace
+
+void RunRpcService()
+{
+    Start(RegisterServices, &logger_mutex);
+}
+
+Thread * Init()
+{
+    pw_sys_io_Init();
+
+    ChipLogProgress(NotSpecified, "RPC service starting...\r\n");
+
+    auto error = rpcThread.start(RunRpcService);
+    if (error != osOK)
+    {
+        ChipLogError(NotSpecified, "Run RPC service failed[%d]", error);
+        return NULL;
+    }
+
+    return &rpcThread;
+}
+
+} // namespace rpc
+} // namespace chip

examples/common/pigweed/mbed/Rpc.h

@@ -0,0 +1,30 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *
+ *    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
+ *
+ *    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.
+ */
+
+#pragma once
+
+#include "rtos/Thread.h"
+
+namespace chip {
+namespace rpc {
+
+void RunRpcService();
+
+rtos::Thread * Init();
+
+} // namespace rpc
+} // namespace chip

examples/common/pigweed/rpc_services/Locking.h

@@ -34,14 +34,14 @@ class Locking final : public generated::Locking<Locking>
 
     virtual pw::Status Set(ServerContext &, const chip_rpc_LockingState & request, pw_protobuf_Empty & response)
     {
-        uint8_t locked = request.locked;
+        bool locked = request.locked;
         RETURN_STATUS_IF_NOT_OK(app::Clusters::OnOff::Attributes::OnOff::Set(kEndpoint, locked));
         return pw::OkStatus();
     }
 
     virtual pw::Status Get(ServerContext &, const pw_protobuf_Empty & request, chip_rpc_LockingState & response)
     {
-        uint8_t locked;
+        bool locked;
         RETURN_STATUS_IF_NOT_OK(app::Clusters::OnOff::Attributes::OnOff::Get(kEndpoint, &locked));
         response.locked = locked;
         return pw::OkStatus();

examples/lighting-app/mbed/config.in

@@ -2,4 +2,5 @@ CONFIG_CHIP_BUILD_TESTS=n
 CONFIG_CHIP_WITH_EXTERNAL_MBEDTLS=y
 CONFIG_CHIP_PROJECT_CONFIG=main/include/CHIPProjectConfig.h
 CONFIG_CHIP_BYPASS_RENDEZVOUS=n
-CONFIG_MBED_BSD_SOCKET_TRACE=n
+CONFIG_MBED_BSD_SOCKET_TRACE=n
+CONFIG_CHIP_PW_RPC=y

examples/lighting-app/mbed/main/AppTask.cpp

@@ -75,7 +75,6 @@ static bool sHaveBLEConnections       = false;
 
 static mbed::Timeout sFunctionTimer;
 
-// TODO: change EventQueue default event size
 static events::EventQueue sAppEventQueue;
 
 using namespace ::chip::Credentials;

examples/lighting-app/mbed/main/include/AppTask.h

@@ -31,6 +31,8 @@ class AppTask
     void PostEvent(AppEvent * aEvent);
     void UpdateClusterState(void);
 
+    void ButtonEventHandler(uint32_t id, bool pushed);
+
 private:
     friend AppTask & GetAppTask(void);
 
@@ -50,7 +52,6 @@ class AppTask
     void LightingButtonPressEventHandler(void);
     void FunctionButtonPressEventHandler(void);
     void FunctionButtonReleaseEventHandler(void);
-    void ButtonEventHandler(uint32_t id, bool pushed);
     void SliderEventHandler(int slider_pos);
     void TimerEventHandler(void);