Merge remote-tracking branch 'upstream/master' into setupcodepairer_a…

…lways_onnetwork
project-chip · Dec 3, 2021 · c824d0a · c824d0a
2 parents 156fa9f + 1f5ec95
commit c824d0a
Show file tree

Hide file tree

Showing 467 changed files with 34,001 additions and 20,377 deletions.
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -4,11 +4,6 @@ aarch
 abcdef
 abfb
 ABI
-AES
-DMM
-ECDH
-ECDSA
-SHA
 ABIs
 ables
 accessor
@@ -31,6 +26,7 @@ AdvRouterAddr
 AdvSendAdvert
 AE
 aef
+AES
 algs
 alloc
 ameba
@@ -277,6 +273,7 @@ DevKitC
 DevKitM
 df
 dfu
+dhclient
 DHCP
 DHCPC
 DHCPv
@@ -285,6 +282,7 @@ dialout
 diffstat
 diffsyms
 dimmable
+dirname
 dirs
 disambiguated
 discoverable
@@ -296,6 +294,7 @@ DK
 DL
 DM
 DMG
+DMM
 DNS
 Dnsmasq
 dnsmasqd
@@ -318,6 +317,8 @@ eabi
 EB
 ECC
 ECD
+ECDH
+ECDSA
 EchoMessage
 EchoRequests
 EchoResponse
@@ -497,15 +498,15 @@ IPv
 ISCAN
 itemName
 iterable
+JDK
 jinja
 jlink
-jre
-JDK
 JLink
 JLinkExe
 JLinkRTTClient
 JN
 jpg
+jre
 js
 json
 JTAG
@@ -683,11 +684,11 @@ Onboarding
 onboardingcodes
 oneshot
 onnetwork
-openjdk
 OnOff
 OnOffClusterTest
 OnPlatformEvent
 OO
+openjdk
 OpenOCD
 OpenSSL
 OpenThread
@@ -707,9 +708,9 @@ OTAImageProcessorDriver
 OTAProviderIpAddress
 OTAProviderNodeId
 OTAProviderSerialPort
+OTARequesterImpl
 OTARequestor
 OTARequestorDriver
-OTARequesterImpl
 OTARequestorSerialPort
 OTBR
 otcli
@@ -852,8 +853,8 @@ ScriptBinding
 SDC
 SDHC
 SDK
-sdkconfig
 SDK's
+sdkconfig
 SDKs
 SDKTARGETSYSROOT
 sdl
@@ -872,6 +873,7 @@ SetRequestorInstance
 SetUpPINCode
 SetupQRCode
 sexualized
+SHA
 shubhamdp
 SIGINT
 SiLabs
@@ -912,6 +914,7 @@ subcommand
 subcommands
 subdirectories
 subdirectory
+subfolder
 submodule
 submodules
 subprocess
@@ -999,7 +1002,6 @@ unblur
 UNBLUR
 uncommissioned
 unfocus
-userguide
 Unicast
 UniFlash
 unpair
@@ -1011,6 +1013,7 @@ URI
 usbmodem
 USBtoUART
 uscif
+userguide
 USERINTERFACE
 UserLabel
 usermod

diff --git a/.github/workflows/examples-ameba.yaml b/.github/workflows/examples-ameba.yaml
@@ -28,7 +28,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-ameba:0.5.28
+            image: connectedhomeip/chip-build-ameba:0.5.33
             options: --user root
 
         steps:

diff --git a/.github/workflows/examples-efr32.yaml b/.github/workflows/examples-efr32.yaml
@@ -45,6 +45,7 @@ jobs:
                   submodules: true
 
             - name: Set up environment for size reports
+              if: ${{ !env.ACT }}
               env:
                   GH_CONTEXT: ${{ toJson(github) }}
               run: scripts/tools/memory/gh_sizes_environment.py "${GH_CONTEXT}"

diff --git a/.github/workflows/examples-esp32.yaml b/.github/workflows/examples-esp32.yaml
@@ -46,6 +46,7 @@ jobs:
                   submodules: true
 
             - name: Set up environment for size reports
+              if: ${{ !env.ACT }}
               env:
                   GH_CONTEXT: ${{ toJson(github) }}
               run: scripts/tools/memory/gh_sizes_environment.py "${GH_CONTEXT}"

diff --git a/.github/workflows/examples-infineon.yaml b/.github/workflows/examples-infineon.yaml
@@ -41,6 +41,7 @@ jobs:
                   submodules: true
 
             - name: Set up environment for size reports
+              if: ${{ !env.ACT }}
               env:
                   GH_CONTEXT: ${{ toJson(github) }}
               run: scripts/tools/memory/gh_sizes_environment.py "${GH_CONTEXT}"
@@ -88,3 +89,4 @@ jobs:
                   path: |
                     out/infineon-p6-lock/p6-default-lock-app-sizes.json
                     out/infineon-p6-all-clusters/p6-default-all-clusters-app-sizes.json
+                    out/infineon-p6-light/p6-default-light-app-sizes.json
diff --git a/.github/workflows/examples-k32w.yaml b/.github/workflows/examples-k32w.yaml
@@ -44,6 +44,7 @@ jobs:
                   submodules: true
 
             - name: Set up environment for size reports
+              if: ${{ !env.ACT }}
               env:
                   GH_CONTEXT: ${{ toJson(github) }}
               run: scripts/tools/memory/gh_sizes_environment.py "${GH_CONTEXT}"

diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
@@ -45,6 +45,7 @@ jobs:
                   submodules: true
 
             - name: Set up environment for size reports
+              if: ${{ !env.ACT }}
               env:
                   GH_CONTEXT: ${{ toJson(github) }}
               run: scripts/tools/memory/gh_sizes_environment.py "${GH_CONTEXT}"

diff --git a/.github/workflows/examples-mbed.yaml b/.github/workflows/examples-mbed.yaml
@@ -48,6 +48,7 @@ jobs:
                   submodules: true
 
             - name: Set up environment for size reports
+              if: ${{ !env.ACT }}
               env:
                   GH_CONTEXT: ${{ toJson(github) }}
               run: scripts/tools/memory/gh_sizes_environment.py "${GH_CONTEXT}"

diff --git a/.github/workflows/examples-nrfconnect.yaml b/.github/workflows/examples-nrfconnect.yaml
@@ -45,6 +45,7 @@ jobs:
                   submodules: true
 
             - name: Set up environment for size reports
+              if: ${{ !env.ACT }}
               env:
                   GH_CONTEXT: ${{ toJson(github) }}
               run: scripts/tools/memory/gh_sizes_environment.py "${GH_CONTEXT}"
@@ -148,6 +149,14 @@ jobs:
               run: |
                   scripts/run_in_build_env.sh "scripts/tests/nrfconnect_native_posix_tests.sh native_posix_64"
 
+            - name: Uploading Failed Test Logs
+              uses: actions/upload-artifact@v2
+              if: ${{ failure() }} && ${{ !env.ACT }}
+              with:
+                  name: test-log
+                  path: |
+                      src/test_driver/nrfconnect/build/Testing/Temporary/LastTest.log
+
             - name: Uploading Size Reports
               uses: actions/upload-artifact@v2
               if: ${{ !env.ACT }}

diff --git a/.github/workflows/examples-qpg.yaml b/.github/workflows/examples-qpg.yaml
@@ -44,6 +44,7 @@ jobs:
                   submodules: true
 
             - name: Set up environment for size reports
+              if: ${{ !env.ACT }}
               env:
                   GH_CONTEXT: ${{ toJson(github) }}
               run: scripts/tools/memory/gh_sizes_environment.py "${GH_CONTEXT}"

diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
@@ -43,6 +43,7 @@ jobs:
                   submodules: true
 
             - name: Set up environment for size reports
+              if: ${{ !env.ACT }}
               env:
                   GH_CONTEXT: ${{ toJson(github) }}
               run: scripts/tools/memory/gh_sizes_environment.py "${GH_CONTEXT}"

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -30,11 +30,11 @@ jobs:
 
         strategy:
           matrix:
-            type: [tsan]
-            eventloop: [eventloop_same, eventloop_separate]
+             build_variant: [no-ble-tsan]
+             chip_tool: ["", -same-event-loop]
         env:
-            USE_SEPARATE_EVENTLOOP: ${{ matrix.eventloop == 'eventloop_separate' }}
-            USE_TSAN: ${{ matrix.type == 'tsan' }}
+            BUILD_VARIANT: ${{matrix.build_variant}}
+            CHIP_TOOL_VARIANT: ${{matrix.chip_tool}}
 
         if: github.actor != 'restyled-io[bot]'
         runs-on: ubuntu-latest
@@ -66,33 +66,27 @@ jobs:
                   path: |
                    .environment/gn_out/.ninja_log
                    .environment/pigweed-venv/*.log
-            - name: Build all clusters app
-              timeout-minutes: 5
+            - name: Build Apps
+              timeout-minutes: 20
               run: |
-                  scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/debug/standalone/ chip_config_network_layer_ble=false is_tsan=${USE_TSAN}
-            - name: Build TV app
-              timeout-minutes: 5
-              run: |
-                  scripts/examples/gn_build_example.sh examples/tv-app/linux out/debug/standalone/ chip_config_network_layer_ble=false is_tsan=${USE_TSAN}
-            - name: Build chip-tool
-              timeout-minutes: 5
-              run: |
-                  scripts/examples/gn_build_example.sh examples/chip-tool out/debug/standalone/ is_tsan=${USE_TSAN} config_use_separate_eventloop=${USE_SEPARATE_EVENTLOOP}
-            - name: Copy objdir
-              run: |
-                  # The idea is to not upload our objdir unless builds have
-                  # actually succeeded, because that just wastes space.
-                  rsync -a out/debug/standalone/ objdir-clone || true
+                  ./scripts/run_in_build_env.sh \
+                     "./scripts/build/build_examples.py \
+                        --target linux-x64-chip-tool-${BUILD_VARIANT}${CHIP_TOOL_VARIANT} \
+                        --target linux-x64-all-clusters-${BUILD_VARIANT} \
+                        --target linux-x64-tv-app-${BUILD_VARIANT} \
+                        build \
+                        --copy-artifacts-to objdir-clone \
+                     "
             - name: Run Tests
               timeout-minutes: 30
               run: |
                   ./scripts/run_in_build_env.sh \
                   "./scripts/tests/run_test_suite.py \
-                     --chip-tool ./out/debug/standalone/chip-tool \
+                     --chip-tool ./out/linux-x64-chip-tool-${BUILD_VARIANT}${CHIP_TOOL_VARIANT}/chip-tool \
                      run \
-                     --iterations 2 \
-                     --all-clusters-app ./out/debug/standalone/chip-all-clusters-app \
-                     --tv-app ./out/debug/standalone/chip-tv-app \
+                     --iterations 1 \
+                     --all-clusters-app ./out/linux-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
+                     --tv-app ./out/linux-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \
                   "
             - name: Uploading core files
               uses: actions/upload-artifact@v2
@@ -116,13 +110,11 @@ jobs:
 
         strategy:
           matrix:
-            type: [tsan, asan]
-            eventloop: [eventloop_same, eventloop_separate]
+             build_variant: [no-ble-tsan, no-ble-asan]
+             chip_tool: ["", -same-event-loop]
         env:
-            USE_SEPARATE_EVENTLOOP: ${{ matrix.eventloop == 'eventloop_separate' }}
-            USE_TSAN: ${{ matrix.type == 'tsan' }}
-
-            USE_ASAN: ${{ matrix.type == 'asan' }}
+            BUILD_VARIANT: ${{matrix.build_variant}}
+            CHIP_TOOL_VARIANT: ${{matrix.chip_tool}}
 
         if: github.actor != 'restyled-io[bot]'
         runs-on: macos-latest
@@ -159,30 +151,26 @@ jobs:
                   path: |
                    .environment/gn_out/.ninja_log
                    .environment/pigweed-venv/*.log
-            - name: Run Build Test Server
-              timeout-minutes: 10
-              run: |
-                  scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/debug/standalone/ chip_config_network_layer_ble=false is_tsan=${USE_TSAN} is_asan=${USE_ASAN}
-            - name: Build chip-tool
-              timeout-minutes: 10
+            - name: Build Apps
+              timeout-minutes: 20
               run: |
-                  scripts/examples/gn_build_example.sh examples/chip-tool out/debug/standalone/ is_tsan=${USE_TSAN} is_asan=${USE_ASAN} config_use_separate_eventloop=${USE_SEPARATE_EVENTLOOP}
-            - name: Copy objdir
-              run: |
-                  # The idea is to not upload our objdir unless builds have
-                  # actually succeeded, because that just wastes space.
-                  rsync -a out/debug/standalone/ objdir-clone || true
+                  ./scripts/run_in_build_env.sh \
+                     "./scripts/build/build_examples.py \
+                        --target darwin-x64-chip-tool-${BUILD_VARIANT}${CHIP_TOOL_VARIANT} \
+                        --target darwin-x64-all-clusters-${BUILD_VARIANT} \
+                        build \
+                        --copy-artifacts-to objdir-clone \
+                     "
             - name: Run Tests
               timeout-minutes: 45
               run: |
                   ./scripts/run_in_build_env.sh \
                   "./scripts/tests/run_test_suite.py \
-                     --chip-tool ./out/debug/standalone/chip-tool \
-                     --target-skip-glob 'TV_*' \
+                     --chip-tool ./out/darwin-x64-chip-tool-${BUILD_VARIANT}${CHIP_TOOL_VARIANT}/chip-tool \
+                     --target-skip-glob 'TV*' \
                      run \
-                     --iterations 2 \
-                     --all-clusters-app ./out/debug/standalone/chip-all-clusters-app \
-                     --tv-app ./out/debug/standalone/chip-tv-app \
+                     --iterations 1 \
+                     --all-clusters-app ./out/darwin-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
                   "
             - name: Uploading core files
               uses: actions/upload-artifact@v2

diff --git a/config/esp32/components/chip/Kconfig b/config/esp32/components/chip/Kconfig
@@ -67,17 +67,6 @@ menu "CHIP Core"
                 message handlers with the CHIP message layer to direct incoming messages to
                 their code.
 
-        config RMP_TIMER_DEFAULT_PERIOD_SHIFT
-            int "Default WRMP Timer Tick Interval Shift (ms)"
-            range 0 16
-            default 6
-            help
-                The default interval shift, in milliseconds (e.g. 6 bits shift
-                = 64ms), at which items in the WRMP pending message list are
-                processed for the purpose of retransmission or timeout.
-
-                This value can be overridden by the application at runtime.
-
         config ENABLE_PW_RPC
             bool "Enable Pigweed RPC library"
             default n

diff --git a/config/mbed/CMakeLists.txt b/config/mbed/CMakeLists.txt
@@ -371,6 +371,7 @@ target_include_directories(${APP_TARGET} PRIVATE
                     ${PIGWEED_ROOT}/pw_log_basic/public_overrides
                     ${PIGWEED_ROOT}/pw_span/public_overrides
                     ${PIGWEED_ROOT}/pw_span/public
+                    ${PIGWEED_ROOT}/pw_sync/public
                     ${PIGWEED_ROOT}/pw_polyfill/public
                     ${PIGWEED_ROOT}/pw_polyfill/standard_library_public
                     ${PIGWEED_ROOT}/pw_polyfill/public_overrides

diff --git a/config/python/CHIPProjectConfig.h b/config/python/CHIPProjectConfig.h
@@ -25,8 +25,6 @@
 
 #define CHIP_CONFIG_ENABLE_EPHEMERAL_UDP_PORT 1
 
-#define CHIP_CONFIG_EVENT_LOGGING_UTC_TIMESTAMPS 1
-
 #define CHIP_CONFIG_EVENT_LOGGING_NUM_EXTERNAL_CALLBACKS 2
 
 #define CHIP_CONFIG_EVENT_LOGGING_EXTERNAL_EVENT_SUPPORT 1