Merge branch 'master' into tizen-glib-one-thread-v2

project-chip · Mar 30, 2023 · 6a2c8c9 · 6a2c8c9
2 parents 1206d27 + a27bc8c
commit 6a2c8c9
Show file tree

Hide file tree

Showing 171 changed files with 6,113 additions and 5,749 deletions.
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -434,6 +434,7 @@ Dnsmasq
 dnsmasqd
 DNSSD
 DNSStubListener
+docbuild
 Dockerfile
 Dockerfiles
 Don'ts

diff --git a/.github/workflows/darwin-tests.yaml b/.github/workflows/darwin-tests.yaml
@@ -121,6 +121,19 @@ jobs:
                      --tv-app ./out/darwin-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \
                      --bridge-app ./out/darwin-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \
                   "
+            - name: Run OTA Test
+              timeout-minutes: 5
+              run: |
+                  ./scripts/run_in_build_env.sh \
+                  "./scripts/tests/run_darwin_framework_ota_test.py \
+                     run \
+                     --darwin-framework-tool ./out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT}/darwin-framework-tool \
+                     --ota-requestor-app ./out/darwin-x64-ota-requestor-${BUILD_VARIANT}/chip-ota-requestor-app \
+                     --ota-data-file /tmp/rawImage \
+                     --ota-image-file /tmp/otaImage \
+                     --ota-destination-file /tmp/downloadedImage \
+                     --ota-candidate-file /tmp/otaCandidateJSON \
+                  "
             - name: Uploading core files
               uses: actions/upload-artifact@v3
               if: ${{ failure() && !env.ACT }}

diff --git a/.github/workflows/darwin.yaml b/.github/workflows/darwin.yaml
@@ -139,6 +139,9 @@ jobs:
               run: |
                   mkdir -p /tmp/darwin/framework-tests
                   ../../../out/debug/chip-all-clusters-app --interface-id -1 > >(tee /tmp/darwin/framework-tests/all-cluster-app.log) 2> >(tee /tmp/darwin/framework-tests/all-cluster-app-err.log >&2) &
+                  # Make sure ota-requestor is using a different port, discriminator, and KVS from all-clusters-app.
+                  # And a different one from the test harness too; the test harness uses port 5541.
+                  ../../../out/debug/chip-ota-requestor-app --interface-id -1 --secured-device-port 5542 --discriminator 1111 --KVS /tmp/chip-ota-requestor-kvs > >(tee /tmp/darwin/framework-tests/ota-requestor-app.log) 2> >(tee /tmp/darwin/framework-tests/ota-requestor-app-err.log >&2) &
                   xcodebuild test -target "Matter" -scheme "Matter Framework Tests" -sdk macosx OTHER_CFLAGS='${inherited} -Werror -Wconversion -Wno-incomplete-umbrella -Wno-unguarded-availability-new' > >(tee /tmp/darwin/framework-tests/darwin-tests.log) 2> >(tee /tmp/darwin/framework-tests/darwin-tests-err.log >&2)
               working-directory: src/darwin/Framework
             - name: Uploading log files

diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -82,7 +82,11 @@ jobs:
           path: |
             .environment/gn_out/.ninja_log
             .environment/pigweed-venv/*.log
-
+      - name: Test SLC gen
+        timeout-minutes: 30
+        run: |
+          scripts/examples/gn_efr32_example.sh examples/lighting-app/silabs/efr32 ./out/light-app BRD4187C --slc_generate --docker
+          rm -rf ./out/
       - name: Build some BRD4187C variants
         timeout-minutes: 90
         run: |

diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 
 [![Builds](https://github.com/project-chip/connectedhomeip/workflows/Builds/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/build.yaml)
 
+**Examples:**
 [![Examples - EFR32](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20EFR32/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-efr32.yaml)
 [![Examples - ESP32](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20ESP32/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-esp32.yaml)
 [![Examples - i.MX Linux](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20i.MX%20Linux/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-linux-imx.yaml)
@@ -14,14 +15,22 @@
 [![Build example - Infineon](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-infineon.yaml/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-infineon.yaml)
 [![Build example - BouffaloLab](https://github.com/project-chip/connectedhomeip/workflows/Build%20example%20-%20BouffaloLab/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/examples-bouffalolab.yaml)
 
+**Platforms:**
 [![Android](https://github.com/project-chip/connectedhomeip/workflows/Android/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/android.yaml)
 
+**Tests:**
 [![Unit / Integration Tests](https://github.com/project-chip/connectedhomeip/workflows/Unit%20/%20Integration%20Tests/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/unit_integration_test.yaml)
 [![Cirque](https://github.com/project-chip/connectedhomeip/workflows/Cirque/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/cirque.yaml)
 [![QEMU](https://github.com/project-chip/connectedhomeip/workflows/QEMU/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/qemu.yaml)
 
+**Tools:**
 [![ZAP Templates](https://github.com/project-chip/connectedhomeip/workflows/ZAP/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/zap_templates.yaml)
 
+**Documentation:**
+[![Documentation Build](https://github.com/project-chip/connectedhomeip/actions/workflows/docbuild.yaml/badge.svg)](https://github.com/project-chip/connectedhomeip/actions/workflows/docbuild.yaml)
+
+-   [Matter SDK documentation page](https://project-chip.github.io/connectedhomeip-doc/index.html)
+
 # About
 
 Matter (formerly Project CHIP) creates more connections between more objects,
@@ -180,26 +189,26 @@ Instructions about how to build Matter can be found [here](./docs/README.md) .
 
 The Matter repository is structured as follows:
 
-| File/Folder        | Content                                                            |
-| ------------------ | ------------------------------------------------------------------ |
-| build              | Build system support content and built output directories          |
-| build_overrides    | Build system parameter customization for different platforms       |
-| config             | Project configurations                                             |
-| credentials        | Development and test credentials                                   |
-| docs               | Documentation, including guides                                    |
-| examples           | Example firmware applications that demonstrate use of Matter       |
-| integrations       | 3rd Party integrations                                             |
-| scripts            | Scripts needed to work with the Matter repository                  |
-| src                | Implementation of Matter                                           |
-| third_party        | 3rd party code used by Matter                                      |
-| zzz_generated      | zap generated template code - Revolving around cluster information |
-| BUILD.gn           | Build file for the gn build system                                 |
-| CODE_OF_CONDUCT.md | Code of conduct for Matter and contribution to it                  |
-| CONTRIBUTING.md    | Guidelines for contributing to Matter                              |
-| LICENSE            | Matter license file                                                |
-| REVIEWERS.md       | PR reviewers                                                       |
-| gn_build.sh        | Build script for specific projects such as Android, EFR32, etc.    |
-| README.md          | This File                                                          |
+| File/Folder        | Content                                                                                                                                               |
+| ------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
+| build              | Build system support content and built output directories                                                                                             |
+| build_overrides    | Build system parameter customization for different platforms                                                                                          |
+| config             | Project configurations                                                                                                                                |
+| credentials        | Development and test credentials                                                                                                                      |
+| docs               | Documentation, including guides. Visit the [Matter SDK documentation page](https://project-chip.github.io/connectedhomeip-doc/index.html) to read it. |
+| examples           | Example firmware applications that demonstrate use of Matter                                                                                          |
+| integrations       | 3rd Party integrations                                                                                                                                |
+| scripts            | Scripts needed to work with the Matter repository                                                                                                     |
+| src                | Implementation of Matter                                                                                                                              |
+| third_party        | 3rd party code used by Matter                                                                                                                         |
+| zzz_generated      | zap generated template code - Revolving around cluster information                                                                                    |
+| BUILD.gn           | Build file for the gn build system                                                                                                                    |
+| CODE_OF_CONDUCT.md | Code of conduct for Matter and contribution to it                                                                                                     |
+| CONTRIBUTING.md    | Guidelines for contributing to Matter                                                                                                                 |
+| LICENSE            | Matter license file                                                                                                                                   |
+| REVIEWERS.md       | PR reviewers                                                                                                                                          |
+| gn_build.sh        | Build script for specific projects such as Android, EFR32, etc.                                                                                       |
+| README.md          | This File                                                                                                                                             |
 
 # License