Merge branch 'master' of github.com:project-chip/connectedhomeip into…

… bug-13122

.github/.wordlist.txt

@@ -727,6 +727,7 @@ OTARequesterImpl
 OTARequestor
 OTARequestorDriver
 OTARequestorSerialPort
+otasoftwareupdaterequestor
 OTBR
 otcli
 PAA
@@ -995,6 +996,7 @@ TransportMgrBase
 TrustedRootCertificates
 TSG
 tsv
+TTL
 tty
 ttyACM
 ttyACMx

.github/workflows/docker_img.yaml

@@ -49,6 +49,7 @@ jobs:
                     - "-tizen"
                     # NOTE: vscode image consumes ~52 GB disk space but GitHub-hosted runners provide ~10 GB free disk space(https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources)
                     #- "-vscode"
+                    - "-zap"
         steps:
             - name: Checkout
               uses: actions/checkout@v2

.github/workflows/tests.yaml

@@ -68,8 +68,7 @@ jobs:
               if: ${{ always() }} && ${{ !env.ACT }}
               with:
                   name:
-                      bootstrap-logs-linux-${{ matrix.type }}-${{
-                      matrix.eventloop }}
+                      bootstrap-logs-linux-${{ matrix.build_variant }}${{ matrix.chip_tool }}
                   path: |
                       .environment/gn_out/.ninja_log
                       .environment/pigweed-venv/*.log
@@ -100,8 +99,7 @@ jobs:
               if: ${{ failure() }} && ${{ !env.ACT }}
               with:
                   name:
-                      crash-core-linux-${{ matrix.type }}-${{ matrix.eventloop
-                      }}
+                      crash-core-linux-${{ matrix.build_variant }}${{ matrix.chip_tool }}
                   path: /tmp/cores/
                   # Cores are big; don't hold on to them too long.
                   retention-days: 5
@@ -110,8 +108,7 @@ jobs:
               if: ${{ failure() }} && ${{ !env.ACT }}
               with:
                   name:
-                      crash-objdir-linux-${{ matrix.type }}-${{ matrix.eventloop
-                      }}
+                      crash-objdir-linux-${{ matrix.build_variant }}${{ matrix.chip_tool }}
                   path: objdir-clone/
                   # objdirs are big; don't hold on to them too long.
                   retention-days: 5
@@ -161,8 +158,7 @@ jobs:
               if: ${{ always() }} && ${{ !env.ACT }}
               with:
                   name:
-                      bootstrap-logs-darwin-${{ matrix.type }}-${{
-                      matrix.eventloop }}
+                      bootstrap-logs-darwin-${{ matrix.build_variant }}${{ matrix.chip_tool }}
                   path: |
                       .environment/gn_out/.ninja_log
                       .environment/pigweed-venv/*.log
@@ -192,8 +188,7 @@ jobs:
               if: ${{ failure() }} && ${{ !env.ACT }}
               with:
                   name:
-                      crash-core-darwin-${{ matrix.type }}-${{ matrix.eventloop
-                      }}
+                      crash-core-darwin-${{ matrix.build_variant }}${{ matrix.chip_tool }}
                   path: /cores/
                   # Cores are big; don't hold on to them too long.
                   retention-days: 5
@@ -202,16 +197,14 @@ jobs:
               if: ${{ failure() }} && ${{ !env.ACT }}
               with:
                   name:
-                      crash-log-darwin-${{ matrix.type }}-${{ matrix.eventloop
-                      }}
+                      crash-log-darwin-${{ matrix.build_variant }}${{ matrix.chip_tool }}
                   path: ~/Library/Logs/DiagnosticReports/
             - name: Uploading objdir for debugging
               uses: actions/upload-artifact@v2
               if: ${{ failure() }} && ${{ !env.ACT }}
               with:
                   name:
-                      crash-objdir-darwin-${{ matrix.type }}-${{
-                      matrix.eventloop }}
+                      crash-objdir-darwin-${{ matrix.build_variant }}${{ matrix.chip_tool }}
                   path: objdir-clone/
                   # objdirs are big; don't hold on to them too long.
                   retention-days: 5

.gitmodules

@@ -161,4 +161,4 @@
 	branch  = stable
 [submodule "p6/lwip"]
 	path = third_party/p6/p6_sdk/libs/lwip
-	url = https://git.savannah.nongnu.org/git/lwip
+	url = https://github.com/lwip-tcpip/lwip.git

config/ameba/args.gni

@@ -36,3 +36,4 @@ custom_toolchain = "//third_party/connectedhomeip/config/ameba/toolchain:ameba"
 
 pw_build_PIP_CONSTRAINTS =
     [ "//third_party/connectedhomeip/scripts/constraints.txt" ]
+cpp_standard = "c++17"

config/ameba/chip.cmake

@@ -41,6 +41,8 @@ list(
     -Wno-deprecated-declarations
     -Wno-unused-parameter
     -Wno-format
+    -Wno-stringop-truncation
+    -std=c++17
 )
 
 list(
@@ -98,6 +100,15 @@ string(APPEND CHIP_GN_ARGS "ameba_cc = \"arm-none-eabi-gcc\"\n")
 string(APPEND CHIP_GN_ARGS "ameba_cxx = \"arm-none-eabi-c++\"\n")
 string(APPEND CHIP_GN_ARGS "ameba_cpu = \"ameba\"\n")
 
+# Build RPC
+#string(APPEND CHIP_GN_ARGS "remove_default_configs = [\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_build:cpp17\"]\n")
+string(APPEND CHIP_GN_ARGS "chip_build_pw_rpc_lib = true\n")
+string(APPEND CHIP_GN_ARGS "pw_log_BACKEND = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_log_basic\"\n")
+string(APPEND CHIP_GN_ARGS "pw_assert_BACKEND = \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert_log\"\n")
+string(APPEND CHIP_GN_ARGS "pw_sys_io_BACKEND = \"//third_party/connectedhomeip/examples/platform/ameba/pw_sys_io:pw_sys_io_ameba\"\n")
+string(APPEND CHIP_GN_ARGS "dir_pw_third_party_nanopb = \"//third_party/connectedhomeip/third_party/nanopb/repo\"\n")
+string(APPEND CHIP_GN_ARGS "pw_build_LINK_DEPS = [\"//third_party/connectedhomeip/third_party/pigweed/repo/pw_assert:impl\", \"//third_party/connectedhomeip/third_party/pigweed/repo/pw_log:impl\"]\n")
+
 file(GENERATE OUTPUT ${CHIP_OUTPUT}/args.gn CONTENT ${CHIP_GN_ARGS})
 
 ExternalProject_Add(
@@ -106,9 +117,9 @@ ExternalProject_Add(
     SOURCE_DIR              ${CHIP_ROOT}
     BINARY_DIR              ${CMAKE_CURRENT_BINARY_DIR}
     CONFIGURE_COMMAND       gn --root=${CHIP_ROOT}/config/ameba gen --check --fail-on-unused-args ${CHIP_OUTPUT}
-    BUILD_COMMAND           ninja -C ${CHIP_OUTPUT}
+    BUILD_COMMAND           ninja -C ${CHIP_OUTPUT} :ameba
     INSTALL_COMMAND         ""
-    BUILD_BYPRODUCTS        -lCHIP
+    BUILD_BYPRODUCTS        -lCHIP -lPwRpc
     CONFIGURE_ALWAYS        TRUE
     BUILD_ALWAYS            TRUE
     USES_TERMINAL_CONFIGURE TRUE

config/ameba/lib/pw_rpc/BUILD.gn

@@ -0,0 +1,38 @@
+# 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.
+
+import("//build_overrides/chip.gni")
+import("//build_overrides/pigweed.gni")
+import("$dir_pw_build/target_types.gni")
+
+static_library("pw_rpc") {
+  output_name = "libPwRpc"
+
+  public_configs = [ "${dir_pigweed}/pw_hdlc:default_config" ]
+  deps = [
+    "$dir_pw_rpc:server",
+    "$dir_pw_rpc/nanopb:echo_service",
+    "${chip_root}/examples/platform/ameba/pw_sys_io:pw_sys_io_ameba",
+    "${dir_pigweed}/pw_hdlc:pw_rpc",
+    dir_pw_assert,
+    dir_pw_hdlc,
+    dir_pw_log,
+  ]
+
+  deps += pw_build_LINK_DEPS
+
+  output_dir = "${root_out_dir}/lib"
+
+  complete_static_lib = true
+}

config/zephyr/Kconfig

@@ -108,6 +108,16 @@ config CHIP_OTA_REQUESTOR
 	  Device Firmware Upgrade by quering and downloading a new firmware image
 	  from an external OTA Provider node.
 
+config CHIP_OPERATIONAL_TIME_SAVE_INTERVAL
+	int "Interval of saving node operation time to flash in hours unit"
+	default 10
+	range 1 4294967295
+	help
+	  Interval in hours with which the node operation time is saved to the flash
+	  memory. Selected value is a trade off between performing frequent saves to know
+	  precisely operation time in case of device reboot and maximizing flash memory
+	  lifetime.
+
 config APP_LINK_WITH_CHIP
 	bool "Link 'app' with Connected Home over IP"
 	default y

docs/guides/nrfconnect_examples_software_update.md

@@ -69,7 +69,7 @@ Complete the following steps to perform DFU using mcumgr:
 4.  Upload the application firmware image to the device by running the following
     command in your example directory:
 
-        $ sudo mcumgr --conntype ble --hci ble-hci-number --connstring peer_name='ble-device-name' image upload build/zephyr/app_update.bin -n 0
+        $ sudo mcumgr --conntype ble --hci ble-hci-number --connstring peer_name='ble-device-name' image upload build/zephyr/app_update.bin -n 0 -w 1
 
     The operation can take a few minutes. Wait until the progress bar reaches
     100%.
@@ -125,7 +125,7 @@ Complete the following steps to perform DFU using mcumgr:
 7.  Upload the network core firmware image to the device by running the
     following command in your example directory:
 
-        $ sudo mcumgr --conntype ble --hci ble-hci-number --connstring peer_name='ble-device-name' image upload build/zephyr/net_core_app_update.bin -n 1
+        $ sudo mcumgr --conntype ble --hci ble-hci-number --connstring peer_name='ble-device-name' image upload build/zephyr/net_core_app_update.bin -n 1 -w 1
 
     The operation can take a few minutes. Wait until the progress bar reaches
     100%.