Merge branch 'master' into remove-confmgr-crtp

project-chip · Nov 15, 2021 · 186d097 · 186d097
2 parents 17560fc + eb40a4c
commit 186d097
Show file tree

Hide file tree

Showing 120 changed files with 16,052 additions and 10,764 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -16,7 +16,7 @@
     "build": {
         "dockerfile": "Dockerfile",
         "args": {
-            "BUILD_VERSION": "0.5.27"
+            "BUILD_VERSION": "0.5.28"
         }
     },
     "remoteUser": "vscode",

diff --git a/.github/workflows/android.yaml b/.github/workflows/android.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-android:0.5.27
+            image: connectedhomeip/chip-build-android:0.5.28
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

diff --git a/.github/workflows/bloat_check.yaml b/.github/workflows/bloat_check.yaml
@@ -30,7 +30,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.5.27
+            image: connectedhomeip/chip-build:0.5.28
 
         steps:
             - name: Checkout

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.27
+            image: connectedhomeip/chip-build:0.5.28
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options:
@@ -98,7 +98,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.27
+            image: connectedhomeip/chip-build:0.5.28
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options:
@@ -182,7 +182,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.27
+            image: connectedhomeip/chip-build:0.5.28
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
             options:

diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml
@@ -29,7 +29,7 @@ jobs:
         timeout-minutes: 60
 
         env:
-            DOCKER_RUN_VERSION: 0.5.27
+            DOCKER_RUN_VERSION: 0.5.28
             GITHUB_CACHE_PATH: /tmp/cirque-cache/
 
         runs-on: ubuntu-latest
@@ -38,7 +38,7 @@ jobs:
 # need to run with privilege, which isn't supported by job.XXX.contaner
 #  https://github.com/actions/container-action/issues/2
 #         container:
-#             image: connectedhomeip/chip-build-cirque:0.5.27
+#             image: connectedhomeip/chip-build-cirque:0.5.28
 #             volumes:
 #                 - "/tmp:/tmp"
 #                 - "/dev/pts:/dev/pts"

diff --git a/.github/workflows/docker_img.yaml b/.github/workflows/docker_img.yaml
@@ -43,6 +43,6 @@ jobs:
             - name: Scan for vulnerabilities
               uses: crazy-max/docker-scan-action@master
               with:
-                  image: connectedhomeip/chip-build${{ matrix.img }}:0.5.27
+                  image: connectedhomeip/chip-build${{ matrix.img }}:0.5.28
                   annotations: true
 
diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml
@@ -28,7 +28,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-ameba:0.5.27
+            image: connectedhomeip/chip-build-ameba:0.5.28
             options: --user root
 
         steps:

diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -38,7 +38,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-efr32:0.5.27
+            image: connectedhomeip/chip-build-efr32:0.5.28
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
@@ -38,7 +38,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.5.27
+            image: connectedhomeip/chip-build-esp32:0.5.28
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-infineon:0.5.27
+            image: connectedhomeip/chip-build-infineon:0.5.28
 
         steps:
             - name: Checkout

diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-k32w:0.5.27
+            image: connectedhomeip/chip-build-k32w:0.5.28
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.27
+            image: connectedhomeip/chip-build:0.5.28
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml
@@ -40,7 +40,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-mbed-os:0.5.27
+            image: connectedhomeip/chip-build-mbed-os:0.5.28
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-nrf-platform:0.5.27
+            image: connectedhomeip/chip-build-nrf-platform:0.5.28
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml
@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build:0.5.27
+            image: connectedhomeip/chip-build:0.5.28
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:

diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
@@ -35,7 +35,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-telink:0.5.27
+            image: connectedhomeip/chip-build-telink:0.5.28
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml
@@ -28,7 +28,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-tizen:0.5.27
+            image: connectedhomeip/chip-build-tizen:0.5.28
             options: --user root
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"

diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml
@@ -34,7 +34,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-esp32-qemu:0.5.27
+            image: connectedhomeip/chip-build-esp32-qemu:0.5.28
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

diff --git a/.github/workflows/release_artifacts.yaml b/.github/workflows/release_artifacts.yaml
@@ -29,7 +29,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-esp32:0.5.27
+            image: connectedhomeip/chip-build-esp32:0.5.28
 
         steps:
             - name: Checkout
@@ -70,7 +70,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build-efr32:0.5.27
+            image: connectedhomeip/chip-build-efr32:0.5.28
         steps:
             - name: Checkout
               uses: actions/checkout@v2

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -40,7 +40,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.5.27
+            image: connectedhomeip/chip-build:0.5.28
             options:
                 --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
@@ -86,11 +86,11 @@ jobs:
             - name: Run Tests
               timeout-minutes: 20
               run: |
-                  scripts/tests/test_suites.sh
+                  scripts/tests/test_suites.sh -n
             - name: Run TV Tests
               timeout-minutes: 10
               run: |
-                  scripts/tests/test_suites.sh  -a tv
+                  scripts/tests/test_suites.sh -n -a tv
             - name: Uploading core files
               uses: actions/upload-artifact@v2
               if: ${{ failure() }} && ${{ !env.ACT }}

diff --git a/.github/workflows/unit_integration_test.yaml b/.github/workflows/unit_integration_test.yaml
@@ -37,7 +37,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: connectedhomeip/chip-build:0.5.27
+            image: connectedhomeip/chip-build:0.5.28
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
                 - "/tmp/happy_test_logs:/tmp/happy_test_logs"

diff --git a/.restyled.yaml b/.restyled.yaml
@@ -67,6 +67,7 @@ exclude:
     - "third_party/nanopb/repo/**/*"
     - "src/android/CHIPTool/gradlew" # gradle wrapper generated file
     - "third_party/android_deps/gradlew" # gradle wrapper generated file
+    - "scripts/tests/test_suites.sh" # overly agressive shell harden
 
 
 changed_paths:

diff --git a/config/telink/chip-module/CMakeLists.txt b/config/telink/chip-module/CMakeLists.txt
@@ -198,7 +198,6 @@ chip_gn_arg_bool  ("chip_inet_config_enable_ipv4"           CONFIG_NET_IPV4)
 chip_gn_arg_bool  ("chip_build_tests"                       CONFIG_CHIP_BUILD_TESTS)
 chip_gn_arg_bool  ("chip_inet_config_enable_tcp_endpoint"   CONFIG_CHIP_BUILD_TESTS)
 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 (BOARD STREQUAL "native_posix")
     chip_gn_arg_string("target_cpu" "x86")
@@ -246,6 +245,9 @@ target_include_directories(chip INTERFACE
     ${CMAKE_CURRENT_BINARY_DIR}/gen/include
 )
 target_link_directories(chip INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/lib)
+if (CONFIG_CHIP_LIB_SHELL)
+    target_link_options(chip INTERFACE -Wl,--whole-archive -lCHIPShell -Wl,--no-whole-archive)
+endif()
 target_link_libraries(chip INTERFACE -Wl,--start-group ${CHIP_LIBRARIES} -Wl,--end-group)
 add_dependencies(chip chip-gn)
 

diff --git a/docs/discussion/lwip_ipv6.md b/docs/discussion/lwip_ipv6.md
@@ -17,6 +17,7 @@ need to incorporate this into their own middleware
 
 -   write a RIO patch, upstream to lwip
     -   Ensure patch is RFC compliant (especially re: expiry)
+-   UPDATE: Patch is available at https://savannah.nongnu.org/patch/?10114
 
 ## Address Scopes
 

diff --git a/examples/all-clusters-app/esp32/main/main.cpp b/examples/all-clusters-app/esp32/main/main.cpp
@@ -498,7 +498,6 @@ WiFiWidget pairingWindowLED;
 class AppCallbacks : public AppDelegate
 {
 public:
-    void OnReceiveError() override { statusLED1.BlinkOnError(); }
     void OnRendezvousStarted() override { bluetoothLED.Set(true); }
     void OnRendezvousStopped() override
     {

diff --git a/examples/chip-tool-darwin/main.m b/examples/chip-tool-darwin/main.m
@@ -16,14 +16,7 @@
  *
  */
 
-#import <CHIP/CHIPDevice.h>
-#import <CHIP/CHIPDeviceController.h>
-#import <CHIP/CHIPDevicePairingDelegate.h>
-#import <CHIP/CHIPManualSetupPayloadParser.h>
-#import <CHIP/CHIPPersistentStorageDelegate.h>
-#import <CHIP/CHIPQRCodeSetupPayloadParser.h>
-#import <CHIP/CHIPSetupPayload.h>
-#import <CHIP/zap-generated/CHIPClustersObjc.h>
+#import <CHIP/CHIP.h>
 #import <Foundation/Foundation.h>
 
 int main(int argc, const char * argv[]) { return EXIT_SUCCESS; }
diff --git a/examples/chip-tool/commands/pairing/PairingCommand.cpp b/examples/chip-tool/commands/pairing/PairingCommand.cpp
@@ -425,11 +425,13 @@ CHIP_ERROR PairingCommand::UpdateNetworkAddress()
 void PairingCommand::OnAddressUpdateComplete(NodeId nodeId, CHIP_ERROR err)
 {
     ChipLogProgress(chipTool, "OnAddressUpdateComplete: %" PRIx64 ": %s", nodeId, ErrorStr(err));
-    if (err != CHIP_NO_ERROR && nodeId == mNodeId)
+    if (err != CHIP_NO_ERROR)
     {
-        // Set exit status only if the address update failed.
-        // Otherwise wait for OnCommissioningComplete() callback.
-        SetCommandExitStatus(err);
+        // For some devices, it may take more time to appear on the network and become discoverable
+        // over DNS-SD, so don't give up on failure and restart the address update. Note that this
+        // will not be repeated endlessly as each chip-tool command has a timeout (in the case of
+        // the `pairing` command it equals 120s).
+        UpdateNetworkAddress();
     }
 }
 

diff --git a/examples/lighting-app/telink/prj.conf b/examples/lighting-app/telink/prj.conf
@@ -44,4 +44,8 @@ CONFIG_THREAD_NAME=y
 CONFIG_CHIP_PROJECT_CONFIG="include/CHIPProjectConfig.h"
 CONFIG_CHIP_OPENTHREAD_CONFIG="../../platform/telink/project_include/OpenThreadConfig.h"
 
-CONFIG_DEBUG=n
+# CHIP shell
+CONFIG_CHIP_LIB_SHELL=y
+CONFIG_SHELL_BACKEND_SERIAL_RX_RING_BUFFER_SIZE=255
+
+CONFIG_DEBUG=n
diff --git a/integrations/cloudbuild/build-all.yaml b/integrations/cloudbuild/build-all.yaml
@@ -1,5 +1,5 @@
 steps:
-    - name: "connectedhomeip/chip-build-vscode:0.5.27"
+    - name: "connectedhomeip/chip-build-vscode:0.5.28"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -12,7 +12,7 @@ steps:
             path: /pwenv
       timeout: 900s
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.27"
+    - name: "connectedhomeip/chip-build-vscode:0.5.28"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:

diff --git a/integrations/cloudbuild/smoke-test.yaml b/integrations/cloudbuild/smoke-test.yaml
@@ -1,5 +1,5 @@
 steps:
-    - name: "connectedhomeip/chip-build-vscode:0.5.27"
+    - name: "connectedhomeip/chip-build-vscode:0.5.28"
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
       args:
@@ -12,7 +12,7 @@ steps:
             path: /pwenv
       timeout: 900s
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.27"
+    - name: "connectedhomeip/chip-build-vscode:0.5.28"
       id: ESP32
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -28,7 +28,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.27"
+    - name: "connectedhomeip/chip-build-vscode:0.5.28"
       id: NRFConnect
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -45,7 +45,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.27"
+    - name: "connectedhomeip/chip-build-vscode:0.5.28"
       id: EFR32
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -62,7 +62,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.27"
+    - name: "connectedhomeip/chip-build-vscode:0.5.28"
       id: Linux
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv
@@ -79,7 +79,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "connectedhomeip/chip-build-vscode:0.5.27"
+    - name: "connectedhomeip/chip-build-vscode:0.5.28"
       id: Android
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv