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

jimlyall-q · Mar 17, 2021 · e970b2e · e970b2e
2 parents 92cc966 + 3f681e2
commit e970b2e
Show file tree

Hide file tree

Showing 340 changed files with 27,516 additions and 11,693 deletions.
diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
@@ -40,6 +40,8 @@ jobs:
               with:
                   fetch-depth: 0
                   submodules: true
+            - name: Update nRF Connect SDK revision to the currently recommended.
+              run: python3 scripts/setup/nrfconnect/update_ncs.py --update
             # https://github.com/project-chip/connectedhomeip/issues/3100
             # - name: Initialize CodeQL
             #   uses: github/codeql-action/init@v1

diff --git a/.gitmodules b/.gitmodules
@@ -28,8 +28,8 @@
 	branch = master
 [submodule "pigweed"]
 	path = third_party/pigweed/repo
-	url = https://pigweed.googlesource.com/pigweed/pigweed
-	branch = master
+	url = https://github.com/google/pigweed.git
+	branch = main
 [submodule "openthread"]
 	path = third_party/openthread/repo
 	url = https://github.com/openthread/openthread.git

diff --git a/.pullapprove.yml b/.pullapprove.yml
@@ -82,47 +82,47 @@ groups:
         reviewers:
             teams: [reviewers-apple]
         reviews:
-            request: 2
+            request: 1
     shared-reviewers-comcast:
         type: optional
         conditions:
             - files.include('*')
         reviewers:
             teams: [reviewers-comcast]
         reviews:
-            request: 2
+            request: 1
     shared-reviewers-google:
         type: optional
         conditions:
             - files.include('*')
         reviewers:
             teams: [reviewers-google]
         reviews:
-            request: 2
+            request: 1
     shared-reviewers-nordic:
         type: optional
         conditions:
             - files.include('*')
         reviewers:
             teams: [reviewers-nordic]
         reviews:
-            request: 2
+            request: 1
     shared-reviewers-samsung:
         type: optional
         conditions:
             - files.include('*')
         reviewers:
             teams: [reviewers-samsung]
         reviews:
-            request: 2
+            request: 1
     shared-reviewers-silabs:
         type: optional
         conditions:
             - files.include('*')
         reviewers:
             teams: [reviewers-silabs]
         reviews:
-            request: 2
+            request: 1
 
     ############################################################
     #  Base Required Reviewers
@@ -150,7 +150,7 @@ groups:
             teams:
                 - codeowners-android
         reviews:
-            request: 2
+            request: 1
 
     codeowners-app:
         type: optional
@@ -160,7 +160,7 @@ groups:
             teams:
                 - codeowners-app
         reviews:
-            request: 2
+            request: 1
 
     codeowners-ble:
         type: optional
@@ -170,7 +170,7 @@ groups:
             teams:
                 - codeowners-ble
         reviews:
-            request: 2
+            request: 1
 
     codeowners-controller:
         type: optional
@@ -180,7 +180,7 @@ groups:
             teams:
                 - codeowners-controller
         reviews:
-            request: 2
+            request: 1
 
     codeowners-darwin:
         type: optional
@@ -190,7 +190,7 @@ groups:
             teams:
                 - codeowners-darwin
         reviews:
-            request: 2
+            request: 1
 
     codeowners-crypto:
         type: optional
@@ -200,7 +200,7 @@ groups:
             teams:
                 - codeowners-crypto
         reviews:
-            request: 2
+            request: 1
 
     codeowners-inet:
         type: optional
@@ -230,7 +230,7 @@ groups:
             teams:
                 - codeowners-protocols
         reviews:
-            request: 2
+            request: 1
 
     codeowners-shell:
         type: optional
@@ -240,7 +240,7 @@ groups:
             teams:
                 - codeowners-shell
         reviews:
-            request: 2
+            request: 1
 
     codeowners-support:
         type: optional
@@ -250,7 +250,7 @@ groups:
             teams:
                 - codeowners-support
         reviews:
-            request: 2
+            request: 1
 
     codeowners-platform:
         type: optional
@@ -260,7 +260,7 @@ groups:
             teams:
                 - codeowners-platform
         reviews:
-            request: 2
+            request: 1
 
     codeowners-qrcode:
         type: optional
@@ -270,7 +270,7 @@ groups:
             teams:
                 - codeowners-qrcode
         reviews:
-            request: 2
+            request: 1
 
     codeowners-setup-payload:
         type: optional
@@ -280,7 +280,7 @@ groups:
             teams:
                 - codeowners-setup-payload
         reviews:
-            request: 2
+            request: 1
 
     codeowners-system:
         type: optional
@@ -290,7 +290,7 @@ groups:
             teams:
                 - codeowners-system
         reviews:
-            request: 2
+            request: 1
 
     codeowners-test-driver:
         type: optional
@@ -300,7 +300,7 @@ groups:
             teams:
                 - codeowners-test-driver
         reviews:
-            request: 2
+            request: 1
 
     codeowners-github:
         type: optional
@@ -310,7 +310,7 @@ groups:
             teams:
                 - codeowners-github
         reviews:
-            request: 2
+            request: 1
 
     codeowners-vscode:
         type: optional
@@ -330,7 +330,7 @@ groups:
             teams:
                 - codeowners-integrations
         reviews:
-            request: 2
+            request: 1
 
     codeowners-transport:
         type: optional
@@ -340,7 +340,7 @@ groups:
             teams:
                 - codeowners-transport
         reviews:
-            request: 2
+            request: 1
 
     codeowners-scripts:
         type: optional
@@ -350,7 +350,7 @@ groups:
             teams:
                 - codeowners-scripts
         reviews:
-            request: 2
+            request: 1
 
     codeowners-documentation:
         type: optional
@@ -360,7 +360,7 @@ groups:
             teams:
                 - codeowners-documentation
         reviews:
-            request: 2
+            request: 1
 
     codeowners-gn:
         type: optional
@@ -370,4 +370,4 @@ groups:
             teams:
                 - codeowners-gn
         reviews:
-            request: 2
+            request: 1
diff --git a/config/nrfconnect/.nrfconnect-recommended-revision b/config/nrfconnect/.nrfconnect-recommended-revision
@@ -0,0 +1 @@
+8e8c60897eac40f61db9f578ce521970fff8e4d2
diff --git a/config/nrfconnect/app/check-nrfconnect-version.cmake b/config/nrfconnect/app/check-nrfconnect-version.cmake
@@ -0,0 +1,21 @@
+#
+#   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.
+#
+
+find_package(Python3 REQUIRED)
+add_custom_target(check-nrfconnect-version ALL
+    WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../../..
+    COMMAND ${Python3_EXECUTABLE} scripts/setup/nrfconnect/update_ncs.py --check --quiet || (exit 0)
+    USES_TERMINAL)
diff --git a/config/nrfconnect/chip-module/CMakeLists.txt b/config/nrfconnect/chip-module/CMakeLists.txt
@@ -202,6 +202,10 @@ chip_gn_arg_bool  ("chip_inet_config_enable_dns_resolver"   CONFIG_CHIP_BUILD_TE
 chip_gn_arg_bool  ("chip_build_libshell"                    CONFIG_CHIP_LIB_SHELL)
 chip_gn_arg_bool  ("chip_build_pw_rpc_lib"                  CONFIG_CHIP_PW_RPC)
 
+if (CONFIG_CHIP_ENABLE_DNSSD_SRP)
+    chip_gn_arg_string("chip_mdns" "platform")
+endif()
+
 if (CHIP_PROJECT_CONFIG)
     chip_gn_arg_string("chip_project_config_include"        ${CHIP_PROJECT_CONFIG})
     chip_gn_arg_string("chip_system_project_config_include" ${CHIP_PROJECT_CONFIG})

diff --git a/docs/BUILDING.md b/docs/BUILDING.md
@@ -43,7 +43,7 @@ On Debian-based Linux distributions such as Ubuntu, these dependencies can be
 satisfied with the following:
 
 ```
-sudo apt-get install git gcc g++ python pkg-config libssl-dev libdbus-1-dev libglib2.0-dev libavahi-client-dev ninja-build python3-venv python3-dev unzip
+sudo apt-get install git gcc g++ python pkg-config libssl-dev libdbus-1-dev libglib2.0-dev libavahi-client-dev ninja-build python3-venv python3-dev python3-pip unzip
 ```
 
 #### How to install prerequisites on macOS
@@ -86,6 +86,38 @@ sudo apt-get install pi-bluetooth
 
 You need to reboot your RPi after install `pi-bluetooth`.
 
+By default, wpa_supplicant is not allowed to update (overwrite) configuration,
+if you want chip app to be able to store the configuration changes permanently,
+we need to make the following changes.
+
+1. Edit the dbus-fi.w1.wpa_supplicant1.service file to use configuration file
+   instead.
+
+```
+sudo nano /etc/systemd/system/dbus-fi.w1.wpa_supplicant1.service
+```
+
+Change the wpa_supplicant start parameters to:
+
+```
+ExecStart=/sbin/wpa_supplicant -u -s -i wlan0 -c /etc/wpa_supplicant/wpa_supplicant.conf
+```
+
+2. Add the wpa-supplicant configuration file
+
+```
+sudo nano /etc/wpa_supplicant/wpa_supplicant.conf
+```
+
+And add the following content to the file:
+
+```
+ctrl_interface=DIR=/run/wpa_supplicant
+update_config=1
+```
+
+Finally, reboot your RPi.
+
 ### Build Preparation
 
 Before running any other build command, the `scripts/activate.sh` environment

diff --git a/docs/dots/Rendezvous/RendezvousSessionGeneral.dot b/docs/dots/Rendezvous/RendezvousSessionGeneral.dot
@@ -6,7 +6,7 @@ digraph RendezvousSession
   subgraph cluster_controller {
     label=<<b>Controller</b>>
 
-    ChipDeviceController [shape=record label=<{ChipDeviceController|<font point-size="11">RendezvousSessionDelegate</font>}>, URL="@ref chip::DeviceController::ChipDeviceController"]
+    DeviceCommissioner [shape=record label=<{DeviceCommissioner|<font point-size="11">RendezvousSessionDelegate</font>}>, URL="@ref chip::Controller::DeviceCommissioner"]
   }
 
   # This section represents device-only elements
@@ -29,9 +29,9 @@ digraph RendezvousSession
   # Main relationships
   #############################
   RendezvousParameters [shape=ellipse, URL="@ref chip::RendezvousParameters"]
-  RendezvousParameters -> { ChipDeviceController, RendezvousDeviceDelegate} [arrowhead=none]
+  RendezvousParameters -> { DeviceCommissioner, RendezvousDeviceDelegate} [arrowhead=none]
 
-  {ChipDeviceController, RendezvousDeviceDelegate} -> RendezvousSession
+  {DeviceCommissioner, RendezvousDeviceDelegate} -> RendezvousSession
   RendezvousSession -> TransportBle
   RendezvousSession -> TransportInet [style=dashed, color=gray]
 }
diff --git a/docs/dots/Rendezvous/RendezvousSessionInit.dot b/docs/dots/Rendezvous/RendezvousSessionInit.dot
@@ -7,7 +7,7 @@ digraph RendezvousSession
     label=<<b>Controller</b>>
     node [fillcolor="white:gray", gradientangle=90]
 
-    ChipDeviceController [shape=record label=<{ChipDeviceController|<font point-size="11">RendezvousSessionDelegate</font>}>, URL="@ref chip::DeviceController::ChipDeviceController"]
+    DeviceCommissioner [shape=record label=<{DeviceCommissioner|<font point-size="11">RendezvousSessionDelegate</font>}>, URL="@ref chip::Controller::DeviceCommissioner"]
   }
 
   # This section represents device-only elements
@@ -66,7 +66,7 @@ digraph RendezvousSession
   #############################
   # Main relationships
   #############################
-  {ChipDeviceController, RendezvousDeviceDelegate} -> RendezvousSession
+  {DeviceCommissioner, RendezvousDeviceDelegate} -> RendezvousSession
 
   RendezvousSession -> HasDiscriminator