Merge branch 'master' into ChipTool_BusyWaitCommand

project-chip · Jan 4, 2023 · 6ba19f1 · 6ba19f1
2 parents f6468fe + 0f3039f
commit 6ba19f1
Show file tree

Hide file tree

Showing 1,240 changed files with 44,406 additions and 23,599 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -7,3 +7,5 @@ src/controller/python/chip/clusters/CHIPClusters.py linguist-generated
 src/controller/python/chip/clusters/Objects.py linguist-generated
 # Let bat file use CRLF linebreak
 **/*.bat eol=crlf
+# Mark Matter operational certificate/key files as binary
+**/*.chip binary
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -54,7 +54,7 @@ AmebaZ
 amebaz2
 announcementReason
 AnnounceOTAProvider
-AnnounceOtaProviderRequest
+AnnounceOTAProviderRequest
 APIs
 apk
 AppConfig
@@ -125,6 +125,7 @@ backtrace
 BallastConfiguration
 BarrierControl
 BasicCHIPRegression
+BasicInformation
 baudrate
 BD
 BDX

diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.yaml b/.github/ISSUE_TEMPLATE/1-bug-report.yaml
@@ -11,12 +11,14 @@ body:
       attributes:
           label: Reproduction steps
           description: "How do you trigger this bug? Please walk us through it step by step."
-          value: |
-              1.
-              2.
-              3.
-              ...
-          render: bash
+          placeholder: |
+            Please list reproduction steps step by step.
+            Place shell commands between ```.
+            Attach logs as files instead of pasting them in.
+            1.
+            2.
+            3.
+            ...
       validations:
           required: true
     - type: input

diff --git a/.github/ISSUE_TEMPLATE/100-documentation-issue.yaml b/.github/ISSUE_TEMPLATE/100-documentation-issue.yaml
@@ -16,7 +16,6 @@ body:
               2.
               3.
               ...
-          render: bash
       validations:
           required: true
     - type: dropdown

diff --git a/.github/ISSUE_TEMPLATE/2-1.0-issue.yaml b/.github/ISSUE_TEMPLATE/2-1.0-issue.yaml
@@ -11,12 +11,14 @@ body:
       attributes:
           label: Reproduction steps
           description: "How do you trigger this bug? Please walk us through it step by step."
-          value: |
-              1.
-              2.
-              3.
-              ...
-          render: bash
+          placeholder: |
+            Please list reproduction steps step by step.
+            Place shell commands between ```.
+            Attach logs as files instead of pasting them in.
+            1.
+            2.
+            3.
+            ...
       validations:
           required: true
     - type: input

diff --git a/.github/ISSUE_TEMPLATE/3-sve-1.0-issue.yaml b/.github/ISSUE_TEMPLATE/3-sve-1.0-issue.yaml
@@ -11,12 +11,14 @@ body:
       attributes:
           label: Reproduction steps
           description: "How do you trigger this bug? Please walk us through it step by step."
-          value: |
-              1.
-              2.
-              3.
-              ...
-          render: bash
+          placeholder: |
+            Please list reproduction steps step by step.
+            Place shell commands between ```.
+            Attach logs as files instead of pasting them in.
+            1.
+            2.
+            3.
+            ...
       validations:
           required: true
     - type: input

diff --git a/.github/ISSUE_TEMPLATE/50-tooling-fix.yaml b/.github/ISSUE_TEMPLATE/50-tooling-fix.yaml
@@ -11,12 +11,14 @@ body:
       attributes:
           label: Reproduction steps / Feature
           description: "How do you trigger this issue and/or can you please explain this new feature? Please walk us through it step by step."
-          value: |
-              1.
-              2.
-              3.
-              ...
-          render: bash
+          placeholder: |
+            Please list reproduction steps step by step.
+            Place shell commands between ```.
+            Attach logs as files instead of pasting them in.
+            1.
+            2.
+            3.
+            ...
       validations:
           required: true
     - type: dropdown

diff --git a/.github/ISSUE_TEMPLATE/60-platform-fix.yaml b/.github/ISSUE_TEMPLATE/60-platform-fix.yaml
@@ -11,12 +11,14 @@ body:
       attributes:
           label: Reproduction steps
           description: "How do you trigger this issue? Please walk us through it step by step."
-          value: |
-              1.
-              2.
-              3.
-              ...
-          render: bash
+          placeholder: |
+            Please list reproduction steps step by step.
+            Place shell commands between ```.
+            Attach logs as files instead of pasting them in.
+            1.
+            2.
+            3.
+            ...
       validations:
           required: true
     - type: dropdown

diff --git a/.github/ISSUE_TEMPLATE/70-trivial-fix.yaml b/.github/ISSUE_TEMPLATE/70-trivial-fix.yaml
@@ -23,12 +23,6 @@ body:
       attributes:
           label: Explanation
           description: "(Optional) If other, why do you think this is trivial?"
-          value: |
-              1.
-              2.
-              3.
-              ...
-          render: bash
       validations:
           required: false
     - type: dropdown

diff --git a/.github/ISSUE_TEMPLATE/80-feature-request.yaml b/.github/ISSUE_TEMPLATE/80-feature-request.yaml
@@ -13,7 +13,6 @@ body:
           description: "What feature are you looking to add? Please walk us through it!"
           value: |
               ...
-          render: bash
       validations:
           required: true
     - type: dropdown

diff --git a/.github/ISSUE_TEMPLATE/99-github-workflow-issue.yaml b/.github/ISSUE_TEMPLATE/99-github-workflow-issue.yaml
@@ -16,7 +16,6 @@ body:
               2.
               3.
               ...
-          render: bash
       validations:
           required: true
     - type: dropdown

diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -113,7 +113,7 @@ jobs:
       - name: Build example EFR32+WF200 WiFi Lock app for BRD4161A
         timeout-minutes: 15
         run: |
-          scripts/examples/gn_efr32_example.sh examples/lock-app/silabs/efr32/ out/lock_app_wifi_wf200 BRD4161A is_debug=false --wifi wf200
+          scripts/examples/gn_efr32_example.sh examples/lock-app/silabs/efr32/ out/lock_app_wifi_wf200 BRD4161A is_debug=false chip_logging=false --wifi wf200
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py efr32 BRD4161A+wf200 lock-app \
             out/lock_app_wifi_wf200/BRD4161A/chip-efr32-lock-example.out /tmp/bloat_reports/
       - name: Clean out build output

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -287,7 +287,7 @@ jobs:
                       .environment/gn_out/.ninja_log
                       .environment/pigweed-venv/*.log
             - name: Build Apps
-              timeout-minutes: 60
+              timeout-minutes: 75
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
@@ -462,7 +462,19 @@ jobs:
                       --target linux-x64-java-matter-controller \
                       build \
                    "
-            - name: Run Tests
+            - name: Run Discover Tests
+              timeout-minutes: 65
+              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 "discover" \
+                     --tool-args "commissionables" \
+                     --factoryreset \
+                  '
+            - name: Run Pairing Tests
               timeout-minutes: 65
               run: |
                   scripts/run_in_build_env.sh \

diff --git a/.github/workflows/zap_regeneration.yaml b/.github/workflows/zap_regeneration.yaml
@@ -28,7 +28,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build:0.6.18
+            image: connectedhomeip/chip-build:0.6.25
         defaults:
             run:
                 shell: sh

diff --git a/.github/workflows/zap_templates.yaml b/.github/workflows/zap_templates.yaml
@@ -29,7 +29,7 @@ jobs:
 
         runs-on: ubuntu-20.04
         container:
-            image: connectedhomeip/chip-build:0.6.18
+            image: connectedhomeip/chip-build:0.6.25
         defaults:
             run:
                 shell: sh

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -621,12 +621,12 @@
                 "mbed-CY8CPROTO_062_4343W-shell-debug",
                 "mbed-CY8CPROTO_062_4343W-shell-develop",
                 "mbed-CY8CPROTO_062_4343W-shell-release",
-                "nrf-nrf52840-light",
-                "nrf-nrf52840-light-rpc",
-                "nrf-nrf52840-lock",
-                "nrf-nrf52840-pump",
-                "nrf-nrf52840-pump-controller",
-                "nrf-nrf52840-shell",
+                "nrf-nrf52840dk-light",
+                "nrf-nrf52840dk-light-rpc",
+                "nrf-nrf52840dk-lock",
+                "nrf-nrf52840dk-pump",
+                "nrf-nrf52840dk-pump-controller",
+                "nrf-nrf52840dk-shell",
                 "nrf-nrf5340-light",
                 "nrf-nrf5340-light-rpc",
                 "nrf-nrf5340-lock",

diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig
@@ -319,7 +319,7 @@ menu "CHIP Device Layer"
         config WIFI_STATION_RECONNECT_INTERVAL
             int "WiFi Station Interface Reconnect Interval (ms)"
             range 0 65535
-            default 5000
+            default 100
             depends on ENABLE_WIFI_STATION
             help
                 The interval at which the CHIP platform will attempt to reconnect to the configured WiFi network (in milliseconds).