Merge remote-tracking branch 'origin/master' into feature/add-lwip-ip…

…v4-toggle-support-new
project-chip · Oct 12, 2022 · c8c0395 · c8c0395
2 parents eb9b1e1 + c46da7c
commit c8c0395
Show file tree

Hide file tree

Showing 60 changed files with 2,287 additions and 4,746 deletions.
diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml
@@ -47,4 +47,12 @@ jobs:
             - name: Checkout submodules
               run: scripts/checkout_submodules.py --shallow --platform ameba
             - name: Build example Ameba All Clusters App
-              run: scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target-glob 'ameba-*' build"
+              run: |
+                  ./scripts/run_in_build_env.sh \
+                     "./scripts/build/build_examples.py \
+                        --target ameba-amebad-all-clusters \
+                        --target ameba-amebad-all-clusters-minimal \
+                        --target ameba-amebad-light \
+                        --target ameba-amebad-pigweed \
+                        build \
+                     "
diff --git a/.github/workflows/examples-bouffalolab.yaml b/.github/workflows/examples-bouffalolab.yaml
@@ -56,17 +56,17 @@ jobs:
         timeout-minutes: 30
         run: |
           ./scripts/run_in_build_env.sh \
-            "./scripts/build/build_examples.py --target bouffalolab-BL706-IoT-DVK-light build"
+            "./scripts/build/build_examples.py --target bouffalolab-bl706-iot-dvk-light build"
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py bl702 bl702 lighting-app \
-            out/bouffalolab-BL706-IoT-DVK-light/chip-bl702-lighting-example.out /tmp/bloat_reports/
+            out/bouffalolab-bl706-iot-dvk-light/chip-bl702-lighting-example.out /tmp/bloat_reports/
 
       - name: Build example BL702 Lighting App with RPCs
         timeout-minutes: 30
         run: |
           ./scripts/run_in_build_env.sh \
-            "./scripts/build/build_examples.py --target bouffalolab-BL706-IoT-DVK-light-rpc build"
+            "./scripts/build/build_examples.py --target bouffalolab-bl706-iot-dvk-light-rpc build"
           .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py bl702 bl702+rpc lighting-app \
-            out/bouffalolab-BL706-IoT-DVK-light-rpc/chip-bl702-lighting-example.out /tmp/bloat_reports/
+            out/bouffalolab-bl706-iot-dvk-light-rpc/chip-bl702-lighting-example.out /tmp/bloat_reports/
 
       - name: Uploading Size Reports
         uses: actions/upload-artifact@v2

diff --git a/.github/workflows/examples-cc13x2x7_26x2x7.yaml b/.github/workflows/examples-cc13x2x7_26x2x7.yaml
@@ -68,7 +68,15 @@ jobs:
               timeout-minutes: 60
               run: |
                   scripts/run_in_build_env.sh "\
-                      ./scripts/build/build_examples.py --target-glob cc13x2x7_26x2x7* build \
+                      ./scripts/build/build_examples.py \
+                      --target cc13x2x7_26x2x7-all-clusters-mtd \
+                      --target cc13x2x7_26x2x7-all-clusters-minimal \
+                      --target cc13x2x7_26x2x7-lock-ftd \
+                      --target cc13x2x7_26x2x7-lock-mtd \
+                      --target cc13x2x7_26x2x7-pump \
+                      --target cc13x2x7_26x2x7-pump-controller \
+                      --target cc13x2x7_26x2x7-shell \
+                      build \
                       --copy-artifacts-to out/artifacts \
                   "
             - name: Get lock FTD size stats
@@ -104,7 +112,7 @@ jobs:
               run: |
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     cc13x2_26x2 LP_CC2652R7 all-clusters-app \
-                    out/artifacts/cc13x2x7_26x2x7-all-clusters/chip-LP_CC2652R7-all-clusters-example.out \
+                    out/artifacts/cc13x2x7_26x2x7-all-clusters-mtd/chip-LP_CC2652R7-all-clusters-example.out \
                     /tmp/bloat_reports/
             - name: Get All Clusters Minimal App size stats
               timeout-minutes: 5

diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -77,7 +77,12 @@ jobs:
           ./scripts/run_in_build_env.sh \
              "./scripts/build/build_examples.py \
                 --enable-flashbundle \
-                --target-glob '*-brd4187c-{lock,light,switch,window-covering,unit-test}' \
+                --target efr32-brd4187c-window-covering \
+                --target efr32-brd4187c-switch \
+                --target efr32-brd4187c-unit-test \
+                --target efr32-brd4187c-light \
+                --target efr32-brd4187c-light-rpc \
+                --target efr32-brd4187c-lock-rpc \
                 build \
                 --copy-artifacts-to out/artifacts \
              "

diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
@@ -70,7 +70,9 @@ jobs:
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
                         --enable-flashbundle \
-                        --target-glob '*-m5stack-{all-clusters,all-clusters-minimal,all-clusters-rpc-ipv6only}' \
+                        --target esp32-m5stack-all-clusters \
+                        --target esp32-m5stack-all-clusters-minimal \
+                        --target esp32-m5stack-all-clusters-rpc-ipv6only \
                         build \
                         --copy-artifacts-to out/artifacts \
                      "

diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml
@@ -126,7 +126,9 @@ jobs:
               run: |
                   ./scripts/run_in_build_env.sh \
                     "./scripts/build/build_examples.py \
-                      --target-glob 'cyw30739-cyw930739m2evb_01-{light,lock,ota-requestor-no-progress-logging}' \
+                      --target cyw30739-cyw930739m2evb_01-light \
+                      --target cyw30739-cyw930739m2evb_01-lock \
+                      --target cyw30739-cyw930739m2evb_01-ota-requestor-no-progress-logging \
                       build \
                       --copy-artifacts-to out/artifacts \
                     "

diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml
@@ -71,11 +71,11 @@ jobs:
               run: |
                   scripts/run_in_build_env.sh "\
                       ./scripts/build/build_examples.py \
-                      --target k32w-light-ota-se \
-                      --target k32w-light-release-no-ota \
-                      --target k32w-lock-low-power-release \
-                      --target k32w-contact-low-power-release \
-                      --target k32w-shell-release \
+                      --target k32w-light-no-ble-se05x \
+                      --target k32w-light-no-ota \
+                      --target k32w-lock-low-power-nologs \
+                      --target k32w-contact-low-power-nologs \
+                      --target k32w-shell \
                       build \
                       --copy-artifacts-to out/artifacts \
                   "
@@ -84,21 +84,21 @@ jobs:
               run: |
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     k32w k32w0+release light \
-                    out/artifacts/k32w-light-release-no-ota/chip-k32w0x-light-example \
+                    out/artifacts/k32w-light-no-ota/chip-k32w0x-light-example \
                     /tmp/bloat_reports/
             - name: Get lock size stats
               timeout-minutes: 5
               run: |
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     k32w k32w0+release lock \
-                    out/artifacts/k32w-lock-low-power-release/chip-k32w0x-lock-example \
+                    out/artifacts/k32w-lock-low-power-nologs/chip-k32w0x-lock-example \
                     /tmp/bloat_reports/
             - name: Get contact size stats
               timeout-minutes: 5
               run: |
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     k32w k32w0+release contact \
-                    out/artifacts/k32w-contact-low-power-release/chip-k32w0x-contact-example \
+                    out/artifacts/k32w-contact-low-power-nologs/chip-k32w0x-contact-example \
                     /tmp/bloat_reports/
             - name: Uploading Size Reports
               uses: actions/upload-artifact@v2

diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml
@@ -69,26 +69,26 @@ jobs:
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
-                        --target linux-arm64-clang-all-clusters \
-                        --target linux-arm64-clang-chip-tool-ipv6only \
-                        --target linux-arm64-clang-lock \
-                        --target linux-arm64-clang-minmdns \
-                        --target linux-arm64-clang-thermostat-no-ble \
+                        --target linux-arm64-all-clusters-clang \
+                        --target linux-arm64-chip-tool-ipv6only-clang \
+                        --target linux-arm64-lock-clang \
+                        --target linux-arm64-minmdns-clang \
+                        --target linux-arm64-thermostat-no-ble-clang \
                         build \
                      "
             - name: Bloat report - chip-tool
               timeout-minutes: 5
               run: |
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     linux arm64 chip-tool-ipv6only \
-                    out/linux-arm64-clang-chip-tool-ipv6only/chip-tool \
+                    out/linux-arm64-chip-tool-ipv6only-clang/chip-tool \
                     /tmp/bloat_reports/
             - name: Bloat report - thermostat
               timeout-minutes: 5
               run: |
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     linux arm64 thermostat-no-ble \
-                    out/linux-arm64-clang-thermostat-no-ble/thermostat-app \
+                    out/linux-arm64-thermostat-no-ble-clang/thermostat-app \
                     /tmp/bloat_reports/
             - name: Uploading Size Reports
               uses: actions/upload-artifact@v2

diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
@@ -71,7 +71,11 @@ jobs:
               timeout-minutes: 10
               run: |
                   ./scripts/run_in_build_env.sh \
-                  "./scripts/build/build_examples.py --no-log-timestamps --target-glob '*-chip-cert' build"
+                  "./scripts/build/build_examples.py --no-log-timestamps \
+                      --target linux-x64-chip-cert \
+                      --target linux-arm64-chip-cert \
+                      build \
+                  "
             - name: Build minmdns example with platform dns
               timeout-minutes: 10
               run: |

diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml
@@ -72,7 +72,10 @@ jobs:
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
                         --enable-flashbundle \
-                        --target-glob 'qpg-{lock,light,shell,persistent-storage}' \
+                        --target qpg-qpg6105-lock \
+                        --target qpg-qpg6105-light \
+                        --target qpg-qpg6105-shell \
+                        --target qpg-qpg6105-persistent-storage \
                         build \
                         --copy-artifacts-to out/artifacts \
                      "
@@ -85,11 +88,11 @@ jobs:
               run: |
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     qpg qpg6105+debug lighting-app \
-                    out/qpg-light/chip-qpg6105-lighting-example.out \
+                    out/qpg-qpg6105-light/chip-qpg6105-lighting-example.out \
                     /tmp/bloat_reports/
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     qpg qpg6105+debug lock-app \
-                    out/qpg-lock/chip-qpg6105-lock-example.out \
+                    out/qpg-qpg6105-lock/chip-qpg6105-lock-example.out \
                     /tmp/bloat_reports/
 
             - name: Uploading Size Reports

diff --git a/.github/workflows/examples-tizen.yaml b/.github/workflows/examples-tizen.yaml
@@ -54,7 +54,11 @@ jobs:
                 ./scripts/run_in_build_env.sh \
                     "./scripts/build/build_examples.py \
                         --enable-flashbundle \
-                        --target-glob 'tizen-*' \
+                        --target tizen-arm-all-clusters \
+                        --target tizen-arm-all-clusters-minimal-no-wifi \
+                        --target chip-tool \
+                        --target light \
+                        --target light-no-ble-no-wifi \
                         build \
                         --copy-artifacts-to out/artifacts \
                     "
diff --git a/.github/workflows/full-android.yaml b/.github/workflows/full-android.yaml
@@ -111,4 +111,4 @@ jobs:
             # - name: Build Android Studio build (arm64 only)
             #   run: |
             #     ./scripts/run_in_build_env.sh \
-            #       "./scripts/build/build_examples.py --no-log-timestamps --target-glob 'android-androidstudio-arm64-chip-tool' build"
+            #       "./scripts/build/build_examples.py --no-log-timestamps --target android-androidstudio-arm64-chip-tool  build"
diff --git a/.restyled.yaml b/.restyled.yaml
@@ -75,6 +75,7 @@ exclude:
     - "src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm" # https://github.com/project-chip/connectedhomeip/issues/20236
     - "src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h" # https://github.com/project-chip/connectedhomeip/issues/20236
     - "examples/platform/nxp/k32w/k32w0/scripts/demo_generated_certs/**/*"
+    - "integrations/cloudbuild/*.yaml" # uglier long command line content
 
 
 changed_paths:

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -13,18 +13,6 @@
                 "base": "$gcc"
             }
         },
-        {
-            "label": "Build examples (glob)",
-            "type": "shell",
-            "command": "scripts/run_in_build_env.sh",
-            "args": [
-                "./scripts/build/build_examples.py --target-glob \"${input:exampleGlob}\" build"
-            ],
-            "group": "build",
-            "problemMatcher": {
-                "base": "$gcc"
-            }
-        },
         {
             "label": "Main Build",
             "type": "shell",

diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig
@@ -175,13 +175,6 @@ menu "CHIP Core"
 
     menu "Security Options"
 
-        config MAX_SESSION_KEYS
-            int "Max Session Keys"
-            range 0 65535
-            default 8
-            help
-                The maximum number of simultaneously active session keys.
-
         menu "Debugging"
 
             config SECURITY_TEST_MODE
@@ -193,17 +186,6 @@ menu "CHIP Core"
                     WARNING: This option makes it possible to circumvent basic CHIP security functionality,
                     including message encryption. Because of this it SHOULD NEVER BE ENABLED IN PRODUCTION BUILDS.
 
-            config DISABLE_PROVISIONING_AUTH
-                bool "Disable Provisioning Authentication Checks"
-                default n
-                help
-                    Disable authentication checks for CHIP provisioning operations.  This makes it possible to
-                    perform device provisioning operations (e.g. adding a network or joining a fabric) without
-                    establishing a secure session.
-
-                    WARNING: This option makes it possible to circumvent basic CHIP security functionality.
-                    Because of this it SHOULD NEVER BE ENABLED IN PRODUCTION BUILDS.
-
         endmenu # "Debugging"
 
     endmenu # "Security Options"
@@ -245,14 +227,6 @@ menu "CHIP Device Layer"
             default 25
             help
                 The maximum number of events that can be held in the CHIP Platform event queue.
-
-        config SERVICE_DIRECTORY_CACHE_SIZE
-            int "CHIP Service Directory Cache Size"
-            range 0 65535
-            default 512
-            help
-                The size (in bytes) of the service directory cache.  This limits the maximum size of the directory
-                that can be returned in response to a service directory query.
 
         config ENABLE_EXTENDED_DISCOVERY
             bool "Enable Extended discovery Support"
@@ -570,18 +544,6 @@ menu "CHIP Device Layer"
 
     endmenu
 
-    menu "CHIP Trait Manager"
-
-        config ENABLE_TRAIT_MANAGER
-            bool "Enable Trait Manager"
-            default y
-            help
-                Enable support for the CHIP Trait Manager.
-
-                The Trait Manager is an experimental feature of the CHIP Device Layer.
-
-    endmenu
-
     menu "Time Sync Options"
 
         config ENABLE_SERVICE_DIRECTORY_TIME_SYNC
@@ -811,15 +773,6 @@ menu "CHIP Device Layer"
 
                 This critical production event buffer must exist.
 
-        config EVENT_LOGGING_PROD_BUFFER_SIZE
-            int "Event Logging Production Buffer Size"
-            range 0 65535
-            default 2048
-            help
-                A size, in bytes, of the individual production event logging buffer.
-
-                This critical production event buffer must exist.
-
         config EVENT_LOGGING_INFO_BUFFER_SIZE
             int "Event Logging Info Buffer Size"
             range 0 65535