Merge branch 'master' into fix_27880

.github/workflows/build-cert-bins.yaml

@@ -0,0 +1,21 @@
+name: Build Certification Image
+on:
+    workflow_call:
+    workflow_dispatch:
+jobs:
+    build-cert-bin:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@master
+            - name: Set up Docker Buildx
+              uses: docker/setup-buildx-action@v2
+            - name: Publish to Registry
+              uses: elgohr/Publish-Docker-Github-Action@v5
+              with:
+                  name: ghcr.io/project-chip/chip-cert-bins
+                  tags: latest
+                  dockerfile: ./integrations/docker/images/chip-cert-bins/Dockerfile
+                  username: ${{ github.actor }}
+                  password: ${{ secrets.GITHUB_TOKEN }}
+                  registry: ghcr.io
+                  platforms: linux/amd64,linux/arm64,linux/arm

.github/workflows/build.yaml

@@ -174,6 +174,8 @@ jobs:
                   BUILD_TYPE=gcc_release scripts/build/gn_gen.sh --args="is_debug=false"
                   scripts/run_in_build_env.sh "ninja -C ./out/gcc_release"
                   BUILD_TYPE=gcc_release scripts/tests/gn_tests.sh
+            - name: Clean output
+              run: rm -rf ./out
             - name: Run Tests with sanitizers
               env:
                   LSAN_OPTIONS: detect_leaks=1
@@ -201,6 +203,8 @@ jobs:
                        --file-exclude-regex '/(repo|zzz_generated|lwip/standalone)/' \
                        check \
                     "
+            - name: Clean output
+              run: rm -rf ./out
             - name: Build using build_examples.py
               run: |
                   ./scripts/run_in_build_env.sh \

.gitmodules

@@ -307,7 +307,7 @@
 	path = third_party/perfetto/repo
 	url = https://github.com/google/perfetto.git
 	branch = master
-	platforms = linux,android
+	platforms = linux,android,darwin
 [submodule "third_party/asr/components"]
 	path = third_party/asr/components
 	url = https://github.com/asriot/asriot_components.git

.vscode/c_cpp_properties.json

@@ -5,7 +5,7 @@
             "compileCommands": "${workspaceFolder}/out/debug/compile_commands.gcc.json",
             "compilerPath": "/usr/bin/gcc",
             "cStandard": "c11",
-            "cppStandard": "gnu++14",
+            "cppStandard": "gnu++17",
             "intelliSenseMode": "gcc-x64",
             "browse": {
                 "path": ["${workspaceFolder}/out/debug/"],
@@ -17,7 +17,7 @@
             "compileCommands": "${workspaceFolder}/out/debug/compile_commands.clang.json",
             "compilerPath": "/usr/bin/clang",
             "cStandard": "c11",
-            "cppStandard": "gnu++14",
+            "cppStandard": "gnu++17",
             "intelliSenseMode": "clang-x64",
             "browse": {
                 "path": ["${workspaceFolder}/out/debug/"],
@@ -29,7 +29,7 @@
             "compileCommands": "${workspaceFolder}/out/debug/compile_commands.mbedtls.json",
             "compilerPath": "/usr/bin/gcc",
             "cStandard": "c11",
-            "cppStandard": "gnu++14",
+            "cppStandard": "gnu++17",
             "intelliSenseMode": "gcc-x64",
             "browse": {
                 "path": ["${workspaceFolder}/out/debug/"],
@@ -39,7 +39,7 @@
         {
             "name": "Android x64 debug (GN)",
             "cStandard": "c11",
-            "cppStandard": "c++11",
+            "cppStandard": "gnu++17",
             "intelliSenseMode": "clang-x64",
             "compileCommands": "${workspaceFolder}/out/debug/compile_commands.android_x64.json",
             "compilerPath": "/opt/android/android-ndk-r21b/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android24-clang",
@@ -51,7 +51,7 @@
         {
             "name": "Android arm64 debug (GN)",
             "cStandard": "c11",
-            "cppStandard": "c++11",
+            "cppStandard": "gnu++17",
             "intelliSenseMode": "clang-arm64",
             "compileCommands": "${workspaceFolder}/out/debug/compile_commands.android_arm64.json",
             "compilerPath": "/opt/android/android-ndk-r21b/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android24-clang",
@@ -63,7 +63,7 @@
         {
             "name": "EFR32 examples debug (GN)",
             "cStandard": "c11",
-            "cppStandard": "c++11",
+            "cppStandard": "gnu++17",
             "intelliSenseMode": "gcc-arm",
             "compileCommands": "${workspaceFolder}/out/debug/compile_commands.efr32.json",
             "compilerPath": "/opt/ARM-software/gcc-arm-none-eabi-9-2019-q4-major/bin/arm-none-eabi-gcc",
@@ -75,7 +75,7 @@
         {
             "name": "nRF Connect examples debug (GN)",
             "cStandard": "c11",
-            "cppStandard": "gnu++14",
+            "cppStandard": "gnu++17",
             "intelliSenseMode": "gcc-arm",
             "compilerPath": "/opt/ARM-software/gcc-arm-none-eabi-9-2019-q4-major/bin/arm-none-eabi-gcc",
             "browse": {
@@ -86,7 +86,7 @@
         {
             "name": "Tizen examples debug (GN)",
             "cStandard": "c11",
-            "cppStandard": "gnu++14",
+            "cppStandard": "gnu++17",
             "intelliSenseMode": "gcc-arm",
             "compilerPath": "/opt/tizen-sdk/tools/arm-linux-gnueabi-gcc-9.2/bin/arm-linux-gnueabi-gcc",
             "compileCommands": "${workspaceFolder}/out/debug/compile_commands.tizen_arm.json",

.vscode/settings.json

@@ -166,7 +166,7 @@
     ],
     "clang-format.fallbackStyle": "WebKit",
     "files.trimFinalNewlines": true,
-    "C_Cpp.default.cppStandard": "gnu++14",
+    "C_Cpp.default.cppStandard": "gnu++17",
     "C_Cpp.default.cStandard": "gnu11",
     "cmake.configureOnOpen": false,
     "search.followSymlinks": false,

build/config/compiler/compiler.gni

@@ -43,11 +43,7 @@ declare_args() {
   c_standard = "gnu11"
 
   # C++ standard level (value for -std flag).
-  if (current_os == "android") {
-    cpp_standard = "gnu++17"
-  } else {
-    cpp_standard = "gnu++14"
-  }
+  cpp_standard = "gnu++17"
 
   # enable libfuzzer
   is_libfuzzer = false

config/ameba/args.gni

@@ -37,4 +37,3 @@ custom_toolchain = "//third_party/connectedhomeip/config/ameba/toolchain:ameba"
 
 pw_build_PIP_CONSTRAINTS =
     [ "//third_party/connectedhomeip/scripts/setup/constraints.txt" ]
-cpp_standard = "c++17"

config/mbed/CMakeLists.txt

@@ -106,9 +106,7 @@ matter_get_compiler_flags_from_targets("${CONFIG_CHIP_EXTERNAL_TARGETS}")
 matter_add_flags(-D__LINUX_ERRNO_EXTENSIONS__=1)
 matter_add_flags(-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib/address_resolve/AddressResolve_DefaultImpl.h>)
 
-if (CONFIG_CHIP_PW_RPC)
-    matter_add_gnu_cpp_standard("17")
-endif()
+matter_add_gnu_cpp_standard("17")
 
 if (CONFIG_MBED_BSD_SOCKET_TRACE)
     matter_add_flags(-DMBED_BSD_SOCKET_TRACE=1)

config/telink/app/bootloader.conf

@@ -0,0 +1,30 @@
+#
+#   Copyright (c) 2023 Project CHIP Authors
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+# Enable this option in case if restoring the slot0 partition is expected from slot1 
+# partition in case if slot0 is not bootable or damaged
+CONFIG_BOOT_BOOTSTRAP=n
+
+# Enable this option in case if SWAP_MOVE logic need to be used
+CONFIG_BOOT_SWAP_USING_MOVE=y
+
+# Enable this option in case if SWAP_MOVE using scratch logic need to be used
+# Enabling this option expecting the availability of scratch partition in DTS
+CONFIG_BOOT_SWAP_USING_SCRATCH=n
+
+# Enable this option in case if the whole slot0 image need to be validated
+# With disabled option the only image magic is validated
+CONFIG_BOOT_VALIDATE_SLOT0=y

config/telink/app/zephyr.conf

@@ -15,7 +15,7 @@
 #
 
 CONFIG_CHIP=y
-CONFIG_STD_CPP14=y
+CONFIG_STD_CPP17=y
 
 # Logging (set CONFIG_SERIAL to 'y' to enable logging and 'n' to disable logging)
 CONFIG_SERIAL=y

config/telink/chip-module/CMakeLists.txt

@@ -143,11 +143,17 @@ else()
     unset(GLOBAL_DTC_OVERLAY_FILE)
 endif()
 
+if(EXISTS "${CHIP_ROOT}/config/telink/app/bootloader.conf")
+    set(GLOBAL_BOOTLOADER_CONF_OVERLAY_FILE "${CHIP_ROOT}/config/telink/app/bootloader.conf")
+else()
+    unset(GLOBAL_BOOTLOADER_CONF_OVERLAY_FILE)
+endif()
+
 if (CONFIG_CHIP_OTA_IMAGE_BUILD)
     add_custom_target(build_mcuboot ALL
         COMMAND
         west build -b ${BOARD} -d build_mcuboot ${ZEPHYR_BASE}/../bootloader/mcuboot/boot/zephyr
-            -- -DCONFIG_BOOT_SWAP_USING_MOVE=y -DDTC_OVERLAY_FILE=${GLOBAL_DTC_OVERLAY_FILE}
+            -- -DOVERLAY_CONFIG=${GLOBAL_BOOTLOADER_CONF_OVERLAY_FILE} -DDTC_OVERLAY_FILE=${GLOBAL_DTC_OVERLAY_FILE}
     )
 
     add_custom_target(merge_mcuboot ALL

docs/code_generation.md

@@ -40,10 +40,6 @@ ZAP is generally installed as a third-party tool via CIPD during the build
 environment bootstrap (see `scripts/setup/zap.json`), which makes `zap-cli`
 available in `$PATH` when running in a build environment.
 
-**NOTE**: zap packages are currently NOT available for `arm64` (like when
-compiling on Raspberry PI.). In these cases one should check out zap from source
-and set `$ZAP_DEVELOPMENT_PATH` as described below.
-
 When matter scripts need to invoke `zap-cli` (for code generation) or `zap` (to
 start the UI tool), they make use of the following environment variables to
 figure out where the zap tool is located (in order of precedence):

docs/guides/BUILDING.md

@@ -169,8 +169,8 @@ The ZAP tool scripting uses the following detection, in order of importance:
     -   Use this if you are developing ZAP locally and would like to run ZAP
         with your changes.
 
--   `$ZAP_INSTALL_PATH` to point to where `zap-linux.zip` or `zap-mac.zip` was
-    unpacked.
+-   `$ZAP_INSTALL_PATH` to point to where `zap-linux-x64.zip`,
+    `zap-linux-arm64.zip` or `zap-mac-x64.zip` was unpacked.
 
     -   This allows you to not need to place `zap` or `zap-cli` (or both) in
         `$PATH`.

examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

@@ -2919,6 +2919,47 @@ server cluster SmokeCoAlarm = 92 {
   command SelfTestRequest(): DefaultSuccess = 0;
 }
 
+/** Attributes and commands for configuring the Dishwasher alarm. */
+server cluster DishwasherAlarm = 93 {
+  bitmap AlarmMap : BITMAP32 {
+    kInflowError = 0x1;
+    kDrainError = 0x2;
+    kDoorError = 0x4;
+    kTempTooLow = 0x8;
+    kTempTooHigh = 0x10;
+    kWaterLevelError = 0x20;
+  }
+
+  info event Notify = 0 {
+    AlarmMap active = 0;
+    AlarmMap inactive = 1;
+    AlarmMap state = 2;
+    AlarmMap mask = 3;
+  }
+
+  readonly attribute AlarmMap mask = 0;
+  readonly attribute AlarmMap latch = 1;
+  readonly attribute AlarmMap state = 2;
+  readonly attribute AlarmMap supported = 3;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct ResetRequest {
+    AlarmMap alarms = 0;
+  }
+
+  request struct ModifyEnabledAlarmsRequest {
+    AlarmMap mask = 0;
+  }
+
+  command Reset(ResetRequest): DefaultSuccess = 0;
+  command ModifyEnabledAlarms(ModifyEnabledAlarmsRequest): DefaultSuccess = 1;
+}
+
 /** This cluster supports remotely monitoring and, where supported, changing the operational state of any device where a state machine is a part of the operation. */
 server cluster OperationalState = 96 {
   enum ErrorStateEnum : ENUM8 {
@@ -6676,6 +6717,20 @@ endpoint 1 {
     ram      attribute clusterRevision default = 1;
   }
 
+  server cluster DishwasherAlarm {
+    emits event Notify;
+    ram      attribute mask default = 1;
+    ram      attribute latch default = 1;
+    ram      attribute state default = 0;
+    ram      attribute supported default = 15;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 1;
+    ram      attribute clusterRevision default = 1;
+  }
+
   server cluster OperationalState {
     emits event OperationalError;
     emits event OperationCompletion;