Merge branch 'master' into feature/mdns_cache

.gitattributes

@@ -0,0 +1,2 @@
+# Mark all files in the "gen" folders as auto-generated to hide them in diffs
+**/gen/** linguist-generated

.github/workflows/build.yaml

@@ -87,7 +87,7 @@ jobs:
 
                   scripts/build/gn_gen.sh --args="$GN_ARGS"
             - name: Run Build
-              timeout-minutes: 10
+              timeout-minutes: 20
               run: scripts/build/gn_build.sh
             - name: Run Tests
               timeout-minutes: 2
@@ -114,14 +114,14 @@ jobs:
               run: scripts/build/gn_gen.sh --args="chip_detail_logging=false"
             - name: Run Build Without Detail Logging
               if: ${{ matrix.type == 'gcc_debug' }}
-              timeout-minutes: 10
+              timeout-minutes: 20
               run: scripts/build/gn_build.sh
             - name: Setup Build Without Progress Logging
               if: ${{ matrix.type == 'gcc_debug' }}
               run: scripts/build/gn_gen.sh --args="chip_detail_logging=false chip_progress_logging=false"
             - name: Run Build Without Progress Logging
               if: ${{ matrix.type == 'gcc_debug' }}
-              timeout-minutes: 10
+              timeout-minutes: 20
               run: scripts/build/gn_build.sh
     build_darwin:
         name: Build on Darwin

.github/workflows/cirque.yaml

@@ -64,6 +64,17 @@ jobs:
               with:
                   path: ${{ env.GITHUB_CACHE_PATH }}
                   key: ${{ runner.os }}-cirque-${{ steps.cirque-key.outputs.val }}
+                  restore-keys: |
+                    ${{ runner.os }}-cirque-
+
+            - name: Bootstrap
+              timeout-minutes: 10
+              run: |
+                  integrations/docker/images/chip-build-cirque/run.sh \
+                    --env GITHUB_ACTION_RUN=1 \
+                    --env GITHUB_CACHE_PATH=${{ env.GITHUB_CACHE_PATH }} \
+                    --volume /tmp:/tmp \
+                    -- scripts/build/gn_bootstrap.sh
 
             - name: Cirque Bootstrap
               timeout-minutes: 15
@@ -80,6 +91,18 @@ jobs:
                   cond: ${{ github.event.pull_request.number == '' }}
                   if_true: "${{ github.sha }}"
                   if_false: "pull-${{ github.event.pull_request.number }}"
+            - name: Build Binaries
+              timeout-minutes: 15
+              run: |
+                  integrations/docker/images/chip-build-cirque/run.sh \
+                    --env GITHUB_ACTION_RUN=1 \
+                    --env GITHUB_CACHE_PATH=${{ env.GITHUB_CACHE_PATH }} \
+                    --volume /tmp:/tmp \
+                    -- ./gn_build.sh \
+                    chip_build_tests=false \
+                    enable_host_gcc_build=true \
+                    enable_host_gcc_mbedtls_build=false \
+                    enable_host_clang_build = false
             - name: Run Tests
               timeout-minutes: 25
               run: |

.github/workflows/examples-esp32.yaml

@@ -92,6 +92,14 @@ jobs:
                   mkdir -p example_binaries/$BUILD_TYPE-build
                   cp examples/lock-app/esp32/build/chip-lock-app.elf \
                      example_binaries/$BUILD_TYPE-build/chip-lock-app.elf
+            - name: Build example Bridge App
+              timeout-minutes: 5
+              run: scripts/examples/esp_example.sh bridge-app
+            - name: Copy aside build products
+              run: |
+                  mkdir -p example_binaries/$BUILD_TYPE-build
+                  cp examples/bridge-app/esp32/build/chip-bridge-app.elf \
+                     example_binaries/$BUILD_TYPE-build/chip-bridge-app.elf
             - name: Build example Persistent Storage App
               timeout-minutes: 5
               run: scripts/examples/esp_example.sh persistent-storage sdkconfig.defaults

.vscode/tasks.json

@@ -130,7 +130,7 @@
         {
             "label": "Build EFR32 Lock Example",
             "type": "shell",
-            "command": "scripts/examples/gn_build_example.sh examples/lock-app/efr32 out/efr32_lock_app",
+            "command": "scripts/examples/gn_efr32_example.sh examples/lock-app/efr32 out/efr32_lock_app ${input:efr32_board}",
             "group": "build",
             "problemMatcher": {
                 "base": "$gcc",
@@ -143,7 +143,7 @@
         {
             "label": "Build EFR32 Light Example",
             "type": "shell",
-            "command": "scripts/examples/gn_build_example.sh examples/lighting-app/efr32 out/efr32_lighting_app",
+            "command": "scripts/examples/gn_efr32_example.sh examples/lighting-app/efr32 out/efr32_lighting_app ${input:efr32_board}",
             "group": "build",
             "problemMatcher": {
                 "base": "$gcc",
@@ -356,6 +356,21 @@
             "description": "What mbed profile do you want to use?",
             "options": ["develop", "release", "debug"],
             "default": "develop"
+        },
+        {
+            "id": "efr32_board",
+            "type": "pickString",
+            "description": "What's the type of your EFR32 board?",
+            "options": [
+                "BRD4304A",
+                "BRD4161A",
+                "BRD4163A",
+                "BRD4164A",
+                "BRD4166A",
+                "BRD4170A",
+                "BRD4180A"
+            ],
+            "default": "BRD4166A"
         }
     ]
 }

config/esp32/components/chip/Kconfig

@@ -385,7 +385,7 @@ menu "CHIP Device Layer"
         config DEFAULT_DEVICE_PRODUCT_REVISION
             int "Default Device Product Revision"
             range 0 65535
-            default 1
+            default 0
             help
                 The default device product revision.
 
@@ -488,7 +488,7 @@ menu "CHIP Device Layer"
 
         config WIFI_AP_IDLE_TIMEOUT
             int "WiFi AP Idle Timeout (ms)"
-            range 0 65535
+            range 0 600000
             default 120000
             help
                 The amount of time (in milliseconds) after which the CHIP platform will deactivate the soft-AP

config/esp32/components/chip/component.mk

@@ -101,6 +101,7 @@ COMPONENT_ADD_INCLUDEDIRS +=   $(REL_OUTPUT_DIR)/src/include \
 COMPONENT_OWNBUILDTARGET 	 = 1
 COMPONENT_OWNCLEANTARGET 	 = 1
 
+is_debug ?= true
 
 # ==================================================
 # Build Rules

credentials/test/attestation/Chip-Test-PAA-FFF1-Cert.pem

@@ -1,11 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIBmTCCAT+gAwIBAgIIaDhPq7kZ/N8wCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
+MIIBnTCCAUKgAwIBAgIIPkgLCCqFJx8wCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
 TWF0dGVyIFRlc3QgUEFBIEZGRjEwIBcNMjEwNjI4MTQyMzQzWhgPOTk5OTEyMzEy
 MzU5NTlaMB8xHTAbBgNVBAMMFE1hdHRlciBUZXN0IFBBQSBGRkYxMFkwEwYHKoZI
 zj0CAQYIKoZIzj0DAQcDQgAEG5isW7wR3GoXVaBbCsXha6AsRu5vwrvnb/fPbKeq
-Tp/R15jcvvtP6uIl03c8kTSMwm1JMTHjCWMtXp7zHRLek6NjMGEwDwYDVR0TAQH/
-BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFO8Y4OzUZgQ03w28kR7U
-UhaZZoOfMB8GA1UdIwQYMBaAFO8Y4OzUZgQ03w28kR7UUhaZZoOfMAoGCCqGSM49
-BAMCA0gAMEUCIQCn+l+nZv/3tf0VjNNPYl1IkSAOBYUO8SX23udWVPmXNgIgI7Ub
-bkJTKCjbCZIDNwUNcPC2tyzNPLeB5nGsIl31Rys=
+Tp/R15jcvvtP6uIl03c8kTSMwm1JMTHjCWMtXp7zHRLek6NmMGQwEgYDVR0TAQH/
+BAgwBgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFO8Y4OzUZgQ03w28
+kR7UUhaZZoOfMB8GA1UdIwQYMBaAFO8Y4OzUZgQ03w28kR7UUhaZZoOfMAoGCCqG
+SM49BAMCA0kAMEYCIQDHQclgaMyReHFBbWrBPNiduu+Y+umYSwdnYoLTA7ksBgIh
+AKnXTWyUsSlCjlMtA1NSh6ay249U8Jy0xzHWv0PLW8pC
 -----END CERTIFICATE-----

credentials/test/attestation/Chip-Test-PAA-FFF2-Cert.pem

@@ -1,11 +1,11 @@
 -----BEGIN CERTIFICATE-----
-MIIBmDCCAT+gAwIBAgIIabTWq+iZPl0wCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
+MIIBnTCCAUKgAwIBAgIIA5KnZVo+bHcwCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
 TWF0dGVyIFRlc3QgUEFBIEZGRjIwIBcNMjEwNjI4MTQyMzQzWhgPOTk5OTEyMzEy
 MzU5NTlaMB8xHTAbBgNVBAMMFE1hdHRlciBUZXN0IFBBQSBGRkYyMFkwEwYHKoZI
 zj0CAQYIKoZIzj0DAQcDQgAEdW4YkvnpULAOlQqilfM1sEhLh20i4m+WZZLKweUQ
-1f6Zsx1cmIgWeorWUDd+dRD7dYI8fluYuMAG7F8Gz66FSqNjMGEwDwYDVR0TAQH/
-BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFOfv6sMzXF/Qw+Y0Up8W
-cEbEvKVcMB8GA1UdIwQYMBaAFOfv6sMzXF/Qw+Y0Up8WcEbEvKVcMAoGCCqGSM49
-BAMCA0cAMEQCIGq8jf1kG2hXC38ut2/BhpFh2BeMh8VQcrUzG/E+dDVcAiBysDJW
-TQIA/ursIC1aKt0Tr0daZxQo10z6Z5flgbQKUA==
+1f6Zsx1cmIgWeorWUDd+dRD7dYI8fluYuMAG7F8Gz66FSqNmMGQwEgYDVR0TAQH/
+BAgwBgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFOfv6sMzXF/Qw+Y0
+Up8WcEbEvKVcMB8GA1UdIwQYMBaAFOfv6sMzXF/Qw+Y0Up8WcEbEvKVcMAoGCCqG
+SM49BAMCA0kAMEYCIQCSUQ0dYCFfARvaLqeV/ssklO+QppeHrQr8IGxhjAnMUgIh
+AKA2sK+D40VcCTi5S/9HdRlyuNy+cZyfYbVW7LTqF8xX
 -----END CERTIFICATE-----

credentials/test/attestation/Chip-Test-PAI-FFF1-8000-Cert.pem

@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWagAwIBAgIIfpkqTYmEBRUwCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
+MIIBxDCCAWmgAwIBAgIIBXAmqJAFs6UwCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
 TWF0dGVyIFRlc3QgUEFBIEZGRjEwIBcNMjEwNjI4MTQyMzQzWhgPOTk5OTEyMzEy
 MzU5NTlaMEYxGDAWBgNVBAMMD01hdHRlciBUZXN0IFBBSTEUMBIGCisGAQQBgqJ8
 AgEMBEZGRjExFDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZI
 zj0DAQcDQgAEynPORkG/CDtKM42gQxoKMjB/ZtFgV0tmEi8lBs9q03Djf2XWNHrn
-l6GXJlBQl200rHtjezvaC1vYQ+2OXV6b8qNjMGEwDwYDVR0TAQH/BAUwAwEB/zAO
-BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFIT1Hf+ezNopNZRIUg6F8Skto+3XMB8G
-A1UdIwQYMBaAFO8Y4OzUZgQ03w28kR7UUhaZZoOfMAoGCCqGSM49BAMCA0cAMEQC
-IFlGfLWq/BpStUOJbdI73kXQgGxTpzec5xLkqAqtZ6taAiA/mv80v+8mVtOb+tF2
-WCRrNllsMubAajV+yukQb3k0dQ==
+l6GXJlBQl200rHtjezvaC1vYQ+2OXV6b8qNmMGQwEgYDVR0TAQH/BAgwBgEB/wIB
+ADAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFIT1Hf+ezNopNZRIUg6F8Skto+3X
+MB8GA1UdIwQYMBaAFO8Y4OzUZgQ03w28kR7UUhaZZoOfMAoGCCqGSM49BAMCA0kA
+MEYCIQCZOYY4qq/OMNuma0XvCumxHeticRSrWCzbghtPf/+52AIhALMhsOr2dfqj
+LAR0nHmPYGs7IsEmZd/UE/nWxCSo/868
 -----END CERTIFICATE-----

credentials/test/attestation/Chip-Test-PAI-FFF1-8001-Cert.pem

@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBwDCCAWagAwIBAgIIOfa+AYgJN3gwCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
+MIIBwzCCAWmgAwIBAgIITSplyxPvQE0wCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
 TWF0dGVyIFRlc3QgUEFBIEZGRjEwIBcNMjEwNjI4MTQyMzQzWhgPOTk5OTEyMzEy
 MzU5NTlaMEYxGDAWBgNVBAMMD01hdHRlciBUZXN0IFBBSTEUMBIGCisGAQQBgqJ8
 AgEMBEZGRjExFDASBgorBgEEAYKifAICDAQ4MDAxMFkwEwYHKoZIzj0CAQYIKoZI
 zj0DAQcDQgAE63okUnxFcFGPmgZLDvKIBFt0V9AMgpKGYTLXvvkYxovjGrSDfa1n
-hmDdxJaJVVQGBhOz9jKIaxOj1sp+68PMs6NjMGEwDwYDVR0TAQH/BAUwAwEB/zAO
-BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJlJAzbtRDWhtz2JXcPWyRaxdE40MB8G
-A1UdIwQYMBaAFO8Y4OzUZgQ03w28kR7UUhaZZoOfMAoGCCqGSM49BAMCA0gAMEUC
-IQD1Vgrcf09s7NwDcFje6LOHQVDPrC4VkNSDMVZBJ5H6wQIgVo8JuexQ4KwZc7z9
-8h/g4QHlLBv2T0U++woATn6biTs=
+hmDdxJaJVVQGBhOz9jKIaxOj1sp+68PMs6NmMGQwEgYDVR0TAQH/BAgwBgEB/wIB
+ADAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJlJAzbtRDWhtz2JXcPWyRaxdE40
+MB8GA1UdIwQYMBaAFO8Y4OzUZgQ03w28kR7UUhaZZoOfMAoGCCqGSM49BAMCA0gA
+MEUCIQCbz5xONSJDdLLgWIbER5/Zd3thISF9ElaGubVPHSHFtAIgbHoTzwcuFCNS
+Ksb6CjhujsZxa8AdTZlaAbBAcAMMH3M=
 -----END CERTIFICATE-----

credentials/test/attestation/Chip-Test-PAI-FFF2-8000-Cert.pem

@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBvzCCAWagAwIBAgIINH+acwAlToMwCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
+MIIBxDCCAWmgAwIBAgIICDRqlhDWSBAwCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
 TWF0dGVyIFRlc3QgUEFBIEZGRjIwIBcNMjEwNjI4MTQyMzQzWhgPOTk5OTEyMzEy
 MzU5NTlaMEYxGDAWBgNVBAMMD01hdHRlciBUZXN0IFBBSTEUMBIGCisGAQQBgqJ8
 AgEMBEZGRjIxFDASBgorBgEEAYKifAICDAQ4MDAwMFkwEwYHKoZIzj0CAQYIKoZI
 zj0DAQcDQgAE9WxJasCpj9Yqwmqkvju6KOAwD+jC5NeLMbz8aDYbVBTzZdkkabYH
-LcOt8Kgqop8jKMHE/htCZeQfH5lDLl9JIqNjMGEwDwYDVR0TAQH/BAUwAwEB/zAO
-BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFFpwXHDpF99K1qV3cHUT/2I5KEm7MB8G
-A1UdIwQYMBaAFOfv6sMzXF/Qw+Y0Up8WcEbEvKVcMAoGCCqGSM49BAMCA0cAMEQC
-IClLpYmn/TUFvGnjZZcSpawyTUptd+wYKtzEZG2880pfAiBci4uQHo2uQcAykAVo
-XqUDF5Fsmkrn8Ah8l+zQaAH39Q==
+LcOt8Kgqop8jKMHE/htCZeQfH5lDLl9JIqNmMGQwEgYDVR0TAQH/BAgwBgEB/wIB
+ADAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFFpwXHDpF99K1qV3cHUT/2I5KEm7
+MB8GA1UdIwQYMBaAFOfv6sMzXF/Qw+Y0Up8WcEbEvKVcMAoGCCqGSM49BAMCA0kA
+MEYCIQCVvpUUWjSa35AwLgbOfz/gNUdvDh71pnRjQCFvyRO9CAIhAOgPn0LXTWkI
+hmOGy9fbpwiqEIKwVtXxnRtobpD58wcP
 -----END CERTIFICATE-----

credentials/test/attestation/Chip-Test-PAI-FFF2-8001-Cert.pem

@@ -1,12 +1,12 @@
 -----BEGIN CERTIFICATE-----
-MIIBwDCCAWagAwIBAgIIRL5f86dv2S8wCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
+MIIBwzCCAWmgAwIBAgIIDaowBF5HxwQwCgYIKoZIzj0EAwIwHzEdMBsGA1UEAwwU
 TWF0dGVyIFRlc3QgUEFBIEZGRjIwIBcNMjEwNjI4MTQyMzQzWhgPOTk5OTEyMzEy
 MzU5NTlaMEYxGDAWBgNVBAMMD01hdHRlciBUZXN0IFBBSTEUMBIGCisGAQQBgqJ8
 AgEMBEZGRjIxFDASBgorBgEEAYKifAICDAQ4MDAxMFkwEwYHKoZIzj0CAQYIKoZI
 zj0DAQcDQgAEzvfsK0V8nY3MrY/1qEyGU86yHAsNrouPx/VKH3v0ilsAmtgFH7Hj
-nKRhfnAC3BhtyZBWF/l7ye1fnudEwnK/06NjMGEwDwYDVR0TAQH/BAUwAwEB/zAO
-BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFO2mD++9Knk8Ml4qbUh43rmpNtBHMB8G
-A1UdIwQYMBaAFOfv6sMzXF/Qw+Y0Up8WcEbEvKVcMAoGCCqGSM49BAMCA0gAMEUC
-IFVt+a9+LTIex49MErhjx21r7Uu9469VVrcClSxR0dTkAiEA2BWdsZzVC8Wcu99e
-fX1FdDs1xrMOwKnZmp4ynWRJPDc=
+nKRhfnAC3BhtyZBWF/l7ye1fnudEwnK/06NmMGQwEgYDVR0TAQH/BAgwBgEB/wIB
+ADAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFO2mD++9Knk8Ml4qbUh43rmpNtBH
+MB8GA1UdIwQYMBaAFOfv6sMzXF/Qw+Y0Up8WcEbEvKVcMAoGCCqGSM49BAMCA0gA
+MEUCIEqWvBko3L7xtlIz0cuRcMtmXCG/NaXMpdQblzpi2OIxAiEAwOEY8dMGbWmy
+3SJfN7PcNJmCrkjJVIodQk2C0AsqpM0=
 -----END CERTIFICATE-----