Merge branch 'master' into power_source_endpoint_list_check_revision

project-chip · Aug 3, 2023 · dc824a1 · dc824a1
2 parents bd4ffd5 + b3d3685
commit dc824a1
Show file tree

Hide file tree

Showing 186 changed files with 16,360 additions and 4,307 deletions.
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -632,6 +632,7 @@ hci
 hciattach
 hciconfig
 hdlc
+HEPA
 HKDF
 HMAC
 hoc
@@ -641,7 +642,6 @@ HomePods
 hostapd
 hostname
 href
-HEPA
 HTTPS
 HW
 hwadr
@@ -652,6 +652,7 @@ IasWd
 iaszone
 ibb
 ICA
+ICD
 iCloud
 ICMP
 IDF

diff --git a/.github/workflows/examples-openiotsdk.yaml b/.github/workflows/examples-openiotsdk.yaml
@@ -72,6 +72,15 @@ jobs:
                     examples/shell/openiotsdk/build/chip-openiotsdk-shell-example.elf \
                     /tmp/bloat_reports/
 
+            - name: "Test: shell example"
+              if: steps.build_shell.outcome == 'success'
+              run: |
+                  scripts/run_in_python_env.sh out/venv \
+                    'scripts/examples/openiotsdk_example.sh --no-activate -C test shell'
+
+            - name: Clean shell output
+              run: rm -rf examples/shell/openiotsdk/build
+
             - name: Build lock-app example (mbedtls)
               # Disabled being tracked here: https://github.com/project-chip/connectedhomeip/issues/28026
               if: false
@@ -93,6 +102,18 @@ jobs:
                     examples/tv-app/openiotsdk/build/chip-openiotsdk-tv-app-example.elf \
                     /tmp/bloat_reports/
 
+            - name: "Test: tv-app example"
+              if: steps.build_tv_app.outcome == 'success'
+              timeout-minutes: 10
+              run: |
+                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME up
+                  scripts/run_in_python_env.sh out/venv \
+                    'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap tv-app'
+                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
+
+            - name: Clean tv-app output
+              run: rm -rf examples/tv-app/openiotsdk/build
+
             - name: Build all-clusters-app example
               id: build_all_clusters_app
               timeout-minutes: 10
@@ -103,6 +124,18 @@ jobs:
                     examples/all-clusters-app/openiotsdk/build/chip-openiotsdk-all-clusters-app-example.elf \
                     /tmp/bloat_reports/
 
+            - name: "Test: all-clusters-app example"
+              if: steps.build_all_clusters_app.outcome == 'success'
+              timeout-minutes: 5
+              run: |
+                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME up
+                  scripts/run_in_python_env.sh out/venv \
+                    'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap all-clusters-app'
+                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
+
+            - name: Clean all-clusters-app output
+              run: rm -rf examples/all-clusters-app/openiotsdk/build
+
             - name: Build ota-requestor-app example
               id: build_ota_requestor_app
               timeout-minutes: 10
@@ -127,12 +160,6 @@ jobs:
               run: |
                   scripts/examples/gn_build_example.sh examples/ota-provider-app/linux/ out/ota-provider chip_config_network_layer_ble=false
 
-            - name: "Test: shell example"
-              if: steps.build_shell.outcome == 'success'
-              run: |
-                  scripts/run_in_python_env.sh out/venv \
-                    'scripts/examples/openiotsdk_example.sh --no-activate -C test shell'
-
             - name: "Test: lock-app example (mbedtls)"
               if: steps.build_lock_app_mbedtls.outcome == 'success'
               run: |
@@ -141,24 +168,6 @@ jobs:
                     'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap lock-app'
                   scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
 
-            - name: "Test: tv-app example"
-              if: steps.build_tv_app.outcome == 'success'
-              timeout-minutes: 10
-              run: |
-                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME up
-                  scripts/run_in_python_env.sh out/venv \
-                    'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap tv-app'
-                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
-
-            - name: "Test: all-clusters-app example"
-              if: steps.build_all_clusters_app.outcome == 'success'
-              timeout-minutes: 5
-              run: |
-                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME up
-                  scripts/run_in_python_env.sh out/venv \
-                    'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap all-clusters-app'
-                  scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
-
             - name: "Test: ota-requestor-app example"
               if: steps.build_ota_requestor_app.outcome == 'success' && steps.build_ota_provider_app.outcome == 'success'
               timeout-minutes: 30
@@ -189,11 +198,6 @@ jobs:
                     examples/lock-app/openiotsdk/build/chip-openiotsdk-lock-app-example.elf \
                     /tmp/bloat_reports/
 
-            - name: Build unit tests (psa)
-              id: build_unit_tests_psa
-              run: |
-                  scripts/examples/openiotsdk_example.sh -b psa unit-tests
-
             - name: "Test: lock-app example (psa)"
               if: steps.build_lock_app_psa.outcome == 'success'
               run: |
@@ -202,6 +206,11 @@ jobs:
                     'scripts/run_in_ns.sh ${TEST_NETWORK_NAME}ns scripts/examples/openiotsdk_example.sh --no-activate -C test -n ${TEST_NETWORK_NAME}tap lock-app'
                   scripts/setup/openiotsdk/network_setup.sh -n $TEST_NETWORK_NAME down
 
+            - name: Build unit tests (psa)
+              id: build_unit_tests_psa
+              run: |
+                  scripts/examples/openiotsdk_example.sh -b psa unit-tests
+
             - name: "Test: unit-tests (psa)"
               if: steps.build_unit_tests_psa.outcome == 'success'
               run: |

diff --git a/.github/workflows/kotlin-style.yaml b/.github/workflows/kotlin-style.yaml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: "detekt"
-        uses: natiginfo/action-detekt-all@1.23.0
+        uses: natiginfo/action-detekt-all@1.23.1
         # Detekt seems not to like circular symlinks, so we set up
         # explicit paths below
         with:

diff --git a/build/chip/java/config.gni b/build/chip/java/config.gni
@@ -15,6 +15,9 @@
 java_path = getenv("JAVA_PATH")
 declare_args() {
   java_matter_controller_dependent_paths = []
+
+  # The class of each cluster created by ZAP is added to the library. (e.g., ChipClusters)
+  matter_enable_java_generated_api = true
   matter_enable_java_compilation = false
   if (java_path != "" && current_os == "linux") {
     java_matter_controller_dependent_paths += [ "${java_path}/include/" ]
@@ -27,6 +30,7 @@ declare_args() {
           [ "${java_path}/include/linux/" ]
     }
 
+    matter_enable_java_generated_api = false
     matter_enable_java_compilation = true
   }
 }
diff --git a/docs/guides/chip_tool_guide.md b/docs/guides/chip_tool_guide.md
@@ -980,23 +980,23 @@ Complete the following steps:
    fabric by using the following command pattern:
 
     ```
-    $ ./chip-tool pairing code <payload> <node_id> --commissioner-name <commissioner_name>
+    $ ./chip-tool pairing code <node_id> <payload> --commissioner-name <commissioner_name>
     ```
 
     In this command:
 
-    - _<payload\>_ is the the QR code payload or a manual pairing code generated
-      by the first commissioner instance when opened commissioning window
     - _<node_id\>_ is the user-defined ID of the node being commissioned. It
       doesn't need to be the same ID, as for the first fabric.
+    - _<payload\>_ is the the QR code payload or a manual pairing code generated
+      by the first commissioner instance when opened commissioning window
     - _<commissioner_name\>_ is the name of the second fabric. Valid values are
       "alpha", "beta", "gamma", and integers greater than or equal to 4. The
       default if not specified is "alpha".
 
     **Example of command:**
 
     ```
-    $ ./chip-tool pairing code 36281602573 1 --commissioner-name beta
+    $ ./chip-tool pairing code 1 36281602573 --commissioner-name beta
     ```
 
 #### Step 5: Test reception of commands