Merge branch 'master' into packetbuffer_discontiguous

project-chip · Mar 15, 2023 · 23c457b · 23c457b
2 parents 219bb4f + 12bcb2c
commit 23c457b
Show file tree

Hide file tree

Showing 200 changed files with 9,014 additions and 2,768 deletions.
diff --git a/.flake8 b/.flake8
@@ -27,14 +27,12 @@ exclude = third_party
           scripts/build/builders/gn.py
           scripts/build/builders/imx.py
           scripts/build/builders/infineon.py
-          scripts/build/builders/nrf.py
           scripts/codegen.py
           scripts/codepregen.py
           scripts/error_table.py
           scripts/examples/gn_to_cmakelists.py
           scripts/flashing/bouffalolab_firmware_utils.py
           scripts/flashing/cyw30739_firmware_utils.py
-          scripts/flashing/nrfconnect_firmware_utils.py
           scripts/gen_chip_version.py
           scripts/helpers/bloat_check.py
           scripts/pregenerate/using_codegen.py
@@ -51,15 +49,11 @@ exclude = third_party
           scripts/py_matter_yamltests/test_yaml_loader.py
           scripts/py_matter_yamltests/test_yaml_parser.py
           scripts/run-clang-tidy-on-compile-commands.py
-          scripts/setup/nrfconnect/update_ncs.py
           scripts/tests/chiptest/yamltest_with_chip_repl_tester.py
           scripts/tools/check_zcl_file_sync.py
           scripts/tools/convert_ini.py
           scripts/tools/memory/memdf/__init__.py
           scripts/tools/memory/report_summary.py
-          scripts/tools/nrfconnect/generate_nrfconnect_chip_factory_data.py
-          scripts/tools/nrfconnect/nrfconnect_generate_partition.py
-          scripts/tools/nrfconnect/tests/test_generate_factory_data.py
           scripts/tools/silabs/FactoryDataProvider.py
           scripts/tools/telink/mfg_tool.py
           scripts/tools/zap/generate.py

diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -1205,6 +1205,7 @@ SHA
 ShadeConfiguration
 SHAs
 showDocumentation
+showsdks
 shubhamdp
 SIGINT
 SiLabs
@@ -1480,6 +1481,7 @@ xbef
 xc
 xcd
 Xcode
+xcodebuild
 xcodeproj
 xcworkspace
 xd

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -601,6 +601,54 @@ jobs:
                      --tool-args "onnetwork-long --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \
                      --factoryreset \
                   '
+            - name: Run IM Invoke Test
+              timeout-minutes: 10
+              run: |
+                  scripts/run_in_build_env.sh \
+                  './scripts/tests/run_java_test.py \
+                     --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app \
+                     --app-args "--discriminator 3840 --interface-id -1" \
+                     --tool-path out/linux-x64-java-matter-controller \
+                     --tool-cluster "im" \
+                     --tool-args "onnetwork-long-im-invoke --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \
+                     --factoryreset \
+                  '
+            - name: Run IM Read Test
+              timeout-minutes: 10
+              run: |
+                  scripts/run_in_build_env.sh \
+                  './scripts/tests/run_java_test.py \
+                     --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app \
+                     --app-args "--discriminator 3840 --interface-id -1" \
+                     --tool-path out/linux-x64-java-matter-controller \
+                     --tool-cluster "im" \
+                     --tool-args "onnetwork-long-im-read --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \
+                     --factoryreset \
+                  '
+            - name: Run IM Write Test
+              timeout-minutes: 10
+              run: |
+                  scripts/run_in_build_env.sh \
+                  './scripts/tests/run_java_test.py \
+                     --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app \
+                     --app-args "--discriminator 3840 --interface-id -1" \
+                     --tool-path out/linux-x64-java-matter-controller \
+                     --tool-cluster "im" \
+                     --tool-args "onnetwork-long-im-write --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \
+                     --factoryreset \
+                  '
+            - name: Run IM Subscribe Test
+              timeout-minutes: 10
+              run: |
+                  scripts/run_in_build_env.sh \
+                  './scripts/tests/run_java_test.py \
+                     --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app \
+                     --app-args "--discriminator 3840 --interface-id -1" \
+                     --tool-path out/linux-x64-java-matter-controller \
+                     --tool-cluster "im" \
+                     --tool-args "onnetwork-long-im-subscribe --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \
+                     --factoryreset \
+                  '
             - name: Run Pairing AlreadyDiscovered Test
               timeout-minutes: 10
               run: |

diff --git a/.pullapprove.yml b/.pullapprove.yml
@@ -144,14 +144,20 @@ groups:
             teams: [reviewers-samsung]
         reviews:
             request: 10
-    shared-reviewers-signify:
-        type: optional
-        conditions:
-            - files.include('*')
-        reviewers:
-            teams: [reviewers-signify]
-        reviews:
-            request: 10
+    # shared-reviewers-signify disabled for now, because the reviewers-signify
+    # team is empty and pullapprove seems to mis-handle that badly and treats
+    # _all_ reviewers as being in this group.
+    #
+    # See https://github.com/dropseed/pullapprove/issues/71
+    #
+    # shared-reviewers-signify:
+    #     type: optional
+    #     conditions:
+    #         - files.include('*')
+    #     reviewers:
+    #         teams: [reviewers-signify]
+    #     reviews:
+    #         request: 10
     shared-reviewers-silabs:
         type: optional
         conditions:

diff --git a/config/esp32/components/chip/CMakeLists.txt b/config/esp32/components/chip/CMakeLists.txt
@@ -143,6 +143,18 @@ else()
     chip_gn_arg_append("chip_enable_wifi"                       "false")
 endif()
 
+if (CONFIG_ENABLE_CHIPOBLE)
+    chip_gn_arg_append("chip_enable_chipoble"                "true")
+endif()
+
+if ((CONFIG_BT_ENABLED) AND (CONFIG_ENABLE_CHIPOBLE))
+	if (CONFIG_BT_NIMBLE_ENABLED)
+          chip_gn_arg_append("chip_bt_nimble_enabled"                "true")
+        else()
+          chip_gn_arg_append("chip_bt_bluedroid_enabled"                "true")
+        endif()
+endif()
+
 if (CONFIG_OPENTHREAD_ENABLED)
     chip_gn_arg_append("chip_enable_openthread"                 "true")
 endif()
@@ -292,9 +304,7 @@ if(CONFIG_BT_ENABLED)
     if("${CONFIG_IDF_TARGET}" STREQUAL "esp32h2")
         idf_component_get_property(bt_dir bt COMPONENT_DIR)
         list(APPEND chip_libraries $<TARGET_FILE:${bt_lib}>)
-        if(CONFIG_IDF_TARGET_ESP32H2_BETA_VERSION_2)
-            list(APPEND chip_libraries ${bt_dir}/controller/lib_esp32h2/esp32h2-bt-lib/beta2/libble_app.a)
-        endif()
+        list(APPEND chip_libraries ${bt_dir}/controller/lib_esp32h2/esp32h2-bt-lib/libble_app.a)
     elseif("${CONFIG_IDF_TARGET}" STREQUAL "esp32c2")
         idf_component_get_property(bt_dir bt COMPONENT_DIR)
         list(APPEND chip_libraries $<TARGET_FILE:${bt_lib}>)

diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig
@@ -886,6 +886,21 @@ menu "CHIP Device Layer"
             default 900 
             help
                 The amount of time (in seconds) after which the CHIP platform will close the Commissioning Window
+    endmenu
+
+    menu "Enable ESP32 as a BLE Commissioner"
+        config ENABLE_ESP32_BLE_CONTROLLER
+            bool "Enable ESP32 as a BLE Commissioner"
+            default n
+            help
+                Enable esp32 as a BLE Commissioner.
+
+        config ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
+            bool "Enable Commissionee and Commissioner mode"
+            default n
+            depends on ENABLE_ESP32_BLE_Controller
+            help
+                Enable including commissioner code (CHIPDeviceController.cpp) in the commissionee (Server.cpp) code.
 
     endmenu
 

diff --git a/config/esp32/components/chip/idf_component.yml b/config/esp32/components/chip/idf_component.yml
@@ -4,3 +4,4 @@ dependencies:
         version: "^1.0.3"
         rules:
             - if: "idf_version >=5.0"
+            - if: "target != esp32h2"
diff --git a/docs/guides/android_building.md b/docs/guides/android_building.md
@@ -45,7 +45,7 @@ directory.
 You need Android SDK 21 & NDK 21.4.7075529 downloaded to your machine. Set the
 `$ANDROID_HOME` environment variable to where the SDK is downloaded and the
 `$ANDROID_NDK_HOME` environment variable to point to where the NDK package is
-downloaded.
+downloaded. The build also requires `kotlinc` to be in your `$PATH`.
 
 1. Install [Android Studio](https://developer.android.com/studio)
 2. Install NDK:

diff --git a/docs/guides/esp32/setup_idf_chip.md b/docs/guides/esp32/setup_idf_chip.md
@@ -39,23 +39,12 @@ step.
     $ ./install.sh
     ```
 
--   For ESP32H2, please checkout tag
-    [v5.0](https://github.com/espressif/esp-idf/tree/v5.0), currently only
-    lighting-app is supported on H2
+-   For ESP32C6 & ESP32H2, please use commit
+    [47852846d3](https://github.com/espressif/esp-idf/tree/47852846d3).
 
     ```
     $ cd esp-idf
-    $ git checkout v5.0-beta1
-    $ git submodule update --init
-    $ ./install.sh
-    ```
-
--   For ESP32C6, please use commit
-    [afbdb0f3e](https://github.com/espressif/esp-idf/tree/afbdb0f3e).
-
-    ```
-    $ cd esp-idf
-    $ git checkout afbdb0f3e
+    $ git checkout 47852846d3
     $ git submodule update --init
     $ ./install.sh
     ```

diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -13451,7 +13451,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0",
-              "reportable": 0,
+              "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
@@ -13547,7 +13547,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "1",
-              "reportable": 0,
+              "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
@@ -13611,7 +13611,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0",
-              "reportable": 0,
+              "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
@@ -13659,7 +13659,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "0",
-              "reportable": 0,
+              "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0
@@ -13691,7 +13691,7 @@
               "singleton": 0,
               "bounded": 0,
               "defaultValue": "",
-              "reportable": 0,
+              "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,
               "reportableChange": 0