Cherry Pick - OTA RPC PRs

examples/common/pigweed/rpc_services/Device.h

@@ -21,6 +21,7 @@
 #include <platform/CHIPDeviceConfig.h>
 #include <platform/CommissionableDataProvider.h>
 
+#include "app/clusters/ota-requestor/OTARequestorInterface.h"
 #include "app/server/OnboardingCodesUtil.h"
 #include "app/server/Server.h"
 #include "credentials/FabricTable.h"
@@ -220,8 +221,20 @@ class Device : public pw_rpc::nanopb::Device::Service<Device>
 
     virtual pw::Status TriggerOta(const pw_protobuf_Empty & request, pw_protobuf_Empty & response)
     {
-        // TODO: auto err = DeviceLayer::SoftwareUpdateMgr().CheckNow();
-        return pw::Status::Unimplemented();
+        chip::DeviceLayer::PlatformMgr().ScheduleWork(
+            [](intptr_t) {
+                chip::OTARequestorInterface * requestor = chip::GetRequestorInstance();
+                if (requestor == nullptr)
+                {
+                    ChipLogError(SoftwareUpdate, "Can't get the CASESessionManager");
+                }
+                else
+                {
+                    requestor->TriggerImmediateQuery();
+                }
+            },
+            reinterpret_cast<intptr_t>(nullptr));
+        return pw::OkStatus();
     }
 
     virtual pw::Status SetPairingState(const chip_rpc_PairingState & request, pw_protobuf_Empty & response)

examples/ota-requestor-app/esp32/CMakeLists.txt

@@ -1,18 +1,18 @@
 #
-#    Copyright (c) 2021 Project CHIP Authors
-#    All rights reserved.
+# 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
+# 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
+# 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.
+# 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.
 
 # The following lines of boilerplate have to be in your project's
 # CMakeLists in this exact order for cmake to work correctly
@@ -27,8 +27,11 @@ set(EXTRA_COMPONENT_DIRS
 )
 
 project(chip-ota-requestor-app)
-idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++14;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
+
+# C++17 is required for RPC build.
+idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-Os;-DLWIP_IPV6_SCOPES=0;-DCHIP_HAVE_CONFIG_H" APPEND)
 idf_build_set_property(C_COMPILE_OPTIONS "-Os;-DLWIP_IPV6_SCOPES=0" APPEND)
+
 # For the C3, project_include.cmake sets -Wno-format, but does not clear various
 # flags that depend on -Wformat
 idf_build_set_property(COMPILE_OPTIONS "-Wno-format-nonliteral;-Wno-format-security" APPEND)
@@ -39,25 +42,24 @@ idf_build_set_property(COMPILE_OPTIONS "-Wno-format-nonliteral;-Wno-format-secur
 # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80635
 idf_build_set_property(COMPILE_OPTIONS "-Wno-error=maybe-uninitialized" APPEND)
 
-if (CONFIG_ENABLE_PW_RPC)
-get_filename_component(CHIP_ROOT ./third_party/connectedhomeip REALPATH)
-include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cmake)
+if(CONFIG_ENABLE_PW_RPC)
+    get_filename_component(CHIP_ROOT ./third_party/connectedhomeip REALPATH)
+    include(third_party/connectedhomeip/third_party/pigweed/repo/pw_build/pigweed.cmake)
 
-pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
-pw_set_backend(pw_log pw_log_basic)
-pw_set_backend(pw_assert.check pw_assert_log.check_backend)
-pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend)
-pw_set_backend(pw_sys_io pw_sys_io.esp32)
+    pw_set_module_config(pw_rpc_CONFIG pw_rpc.disable_global_mutex_config)
+    pw_set_backend(pw_log pw_log_basic)
+    pw_set_backend(pw_assert.check pw_assert_log.check_backend)
+    pw_set_backend(pw_assert.assert pw_assert.assert_compatibility_backend)
+    pw_set_backend(pw_sys_io pw_sys_io.esp32)
 
-add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
-add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
-add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io)
+    add_subdirectory(third_party/connectedhomeip/third_party/pigweed/repo)
+    add_subdirectory(third_party/connectedhomeip/third_party/nanopb/repo)
+    add_subdirectory(third_party/connectedhomeip/examples/platform/esp32/pw_sys_io)
 
-get_target_property(_target_cxx_flags pw_build.cpp17 INTERFACE_COMPILE_OPTIONS)
-list(REMOVE_ITEM _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
-list(APPEND _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>)
-set_target_properties(pw_build.cpp17 PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}")
+    get_target_property(_target_cxx_flags pw_build.cpp17 INTERFACE_COMPILE_OPTIONS)
+    list(REMOVE_ITEM _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
+    list(APPEND _target_cxx_flags $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>)
+    set_target_properties(pw_build.cpp17 PROPERTIES INTERFACE_COMPILE_OPTIONS "${_target_cxx_flags}")
 endif(CONFIG_ENABLE_PW_RPC)
 
-
 flashing_script()

examples/ota-requestor-app/esp32/README.md

@@ -78,3 +78,30 @@ config options for setting software version.
 Matter OTA image can also be generated using
 [ota_image_tool.py](https://github.com/project-chip/connectedhomeip/blob/master/src/app/ota_image_tool.py)
 script.
+
+## Using the RPC console
+
+Enable RPCs in the build using menuconfig:
+
+    $ idf.py menuconfig
+
+Enable the RPC library:
+
+    Component config → CHIP Core → General Options → Enable Pigweed PRC library
+
+After flashing a build with RPCs enabled you can use the rpc console to send
+commands to the device.
+
+Build or install the [rpc console](../../common/pigweed/rpc_console/README.md)
+
+-   Start the console
+
+```
+    chip-console --device /dev/ttyUSB0
+```
+
+-   From within the console you can then invoke rpcs:
+
+```
+    rpcs.chip.rpc.Device.TriggerOta()
+```