Merge branch 'master' into manual-pw-roll

docs/guides/esp32/setup_idf_chip.md

@@ -13,27 +13,27 @@ step.
 
 ### Install Prerequisites
 
--   [Linux](https://docs.espressif.com/projects/esp-idf/en/v4.4.3/esp32/get-started/linux-setup.html)
--   [macOS](https://docs.espressif.com/projects/esp-idf/en/v4.4.3/esp32/get-started/macos-setup.html)
+-   [Linux](https://docs.espressif.com/projects/esp-idf/en/v4.4.4/esp32/get-started/linux-setup.html)
+-   [macOS](https://docs.espressif.com/projects/esp-idf/en/v4.4.4/esp32/get-started/macos-setup.html)
 
-### Get IDF v4.4.3
+### Get IDF v4.4.4
 
 -   Clone ESP-IDF
-    [v4.4.3 release](https://github.com/espressif/esp-idf/releases/tag/v4.4.3)
+    [v4.4.4 release](https://github.com/espressif/esp-idf/releases/tag/v4.4.4)
 
     ```
-    $ git clone -b v4.4.3 --recursive https://github.com/espressif/esp-idf.git
+    $ git clone -b v4.4.4 --recursive https://github.com/espressif/esp-idf.git
     $ cd esp-idf
     $ ./install.sh
     ```
 
--   To update an existing esp-idf toolchain to v4.4.3:
+-   To update an existing esp-idf toolchain to v4.4.4:
 
     ```
     $ cd path/to/esp-idf
     $ git fetch origin
-    $ git checkout v4.4.3
-    $ git reset --hard origin/v4.4.3
+    $ git checkout v4.4.4
+    $ git reset --hard origin/v4.4.4
     $ git submodule update --recursive --init
     $ git clean -fdx
     $ ./install.sh

examples/chef/chef.py

@@ -615,10 +615,11 @@ def main() -> int:
                     f"\"{truncated_sw_ver_string}\" due to 64 bytes limitation")
                 sw_ver_string = truncated_sw_ver_string
 
-        flush_print("Building...")
-
+        flush_print(f"Software Version String: \"{sw_ver_string}\"")
         flush_print(
             f"Product ID 0x{options.pid:02X} / Vendor ID 0x{options.vid:02X}")
+        flush_print("Building...")
+
         shell.run_cmd(f"cd {_CHEF_SCRIPT_PATH}")
 
         if (options.build_target == "esp32") or (options.build_target == "nrfconnect") or (options.build_target == "ameba"):

examples/chef/esp32/CMakeLists.txt

@@ -46,8 +46,10 @@ idf_build_set_property(COMPILE_OPTIONS "-DCHIP_DEVICE_CONFIG_DEVICE_PRODUCT_ID=$
 if(NOT ${CONFIG_DEVICE_PRODUCT_NAME} STREQUAL "")
     idf_build_set_property(COMPILE_OPTIONS "-DCHIP_DEVICE_CONFIG_DEVICE_PRODUCT_NAME=\"${CONFIG_DEVICE_PRODUCT_NAME}\"" APPEND)
 endif()
+# Forwarding the customized software version string to the ESP32 firmware image
 if(NOT ${CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING} STREQUAL "")
     idf_build_set_property(COMPILE_OPTIONS "-DCHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING=\"${CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING}\"" APPEND)
+    set(PROJECT_VER ${CHIP_DEVICE_CONFIG_DEVICE_SOFTWARE_VERSION_STRING})
 endif()
 idf_build_set_property(COMPILE_OPTIONS "-DCHIP_PLATFORM_ESP32=1" APPEND)
 

examples/darwin-framework-tool/templates/commands.zapt

@@ -17,13 +17,13 @@
 
 {{> clusters_header}}
 
-{{#all_user_clusters side='client'}}
-{{#unless (wasRemoved (asUpperCamelCase name preserveAcronyms=true))}}
+{{#zcl_clusters}}
+{{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
 {{> cluster_header}}
 
 {{#zcl_commands}}
 {{#if (is_str_equal source 'client')}}
-{{#unless (wasRemoved (asUpperCamelCase parent.name preserveAcronyms=true) command=(asUpperCamelCase name preserveAcronyms=true))}}
+{{#if (isSupported (asUpperCamelCase parent.name preserveAcronyms=true) command=(asUpperCamelCase name preserveAcronyms=true))}}
 /*
  * Command {{asUpperCamelCase name}}
  */
@@ -90,12 +90,12 @@ private:
     {{/zcl_command_arguments}}
 };
 
-{{/unless}}
+{{/if}}
 {{/if}}
 {{/zcl_commands}}
 
 {{#zcl_attributes_server removeKeys='isOptional'}}
-{{#unless (wasRemoved (asUpperCamelCase parent.name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true))}}
+{{#if (isSupported (asUpperCamelCase parent.name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true))}}
 {{#*inline "cluster"}}Cluster{{asUpperCamelCase parent.name preserveAcronyms=true}}{{/inline}}
 {{#*inline "attribute"}}Attribute{{asUpperCamelCase name preserveAcronyms=true}}{{/inline}}
 
@@ -247,16 +247,16 @@ public:
 };
 
 {{/if}}
-{{/unless}}
+{{/if}}
 {{/zcl_attributes_server}}
-{{/unless}}
-{{/all_user_clusters}}
+{{/if}}
+{{/zcl_clusters}}
 
 /*----------------------------------------------------------------------------*\
 | Register all Clusters commands                                               |
 \*----------------------------------------------------------------------------*/
-{{#all_user_clusters side='client'}}
-{{#unless (wasRemoved (asUpperCamelCase name preserveAcronyms=true))}}
+{{#zcl_clusters}}
+{{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
 void registerCluster{{asUpperCamelCase name}}(Commands & commands)
 {
     using namespace chip::app::Clusters::{{asUpperCamelCase name}};
@@ -267,34 +267,34 @@ void registerCluster{{asUpperCamelCase name}}(Commands & commands)
         make_unique<ClusterCommand>(Id), //
         {{#zcl_commands}}
         {{#if (is_str_equal source 'client')}}
-        {{#unless (wasRemoved (asUpperCamelCase parent.name preserveAcronyms=true) command=(asUpperCamelCase name preserveAcronyms=true))}}
+        {{#if (isSupported (asUpperCamelCase parent.name preserveAcronyms=true) command=(asUpperCamelCase name preserveAcronyms=true))}}
         make_unique<{{asUpperCamelCase parent.name}}{{asUpperCamelCase name}}>(), //
-        {{/unless}}
+        {{/if}}
         {{/if}}
         {{/zcl_commands}}
         {{#zcl_attributes_server removeKeys='isOptional'}}
         {{#first}}
          make_unique<ReadAttribute>(Id), //
         {{/first}}
-        {{#unless (wasRemoved (asUpperCamelCase parent.name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true))}}
+        {{#if (isSupported (asUpperCamelCase parent.name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true))}}
         make_unique<Read{{asUpperCamelCase parent.name}}{{asUpperCamelCase name}}>(), //
-        {{/unless}}
+        {{/if}}
         {{#first}}
         make_unique<WriteAttribute>(Id), //
         {{/first}}
-        {{#unless (wasRemoved (asUpperCamelCase parent.name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true))}}
+        {{#if (isSupported (asUpperCamelCase parent.name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true))}}
         {{#if isWritableAttribute}}
         make_unique<Write{{asUpperCamelCase parent.name}}{{asUpperCamelCase name}}>(), //
         {{/if}}
-        {{/unless}}
+        {{/if}}
         {{#first}}
         make_unique<SubscribeAttribute>(Id), //
         {{/first}}
-        {{#unless (wasRemoved (asUpperCamelCase parent.name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true))}}
+        {{#if (isSupported (asUpperCamelCase parent.name preserveAcronyms=true) attribute=(asUpperCamelCase name preserveAcronyms=true))}}
         {{#if isReportableAttribute}}
         make_unique<SubscribeAttribute{{asUpperCamelCase parent.name}}{{asUpperCamelCase name}}>(), //
         {{/if}}
-        {{/unless}}
+        {{/if}}
         {{/zcl_attributes_server}}
         {{#zcl_events}}
         {{#first}}
@@ -306,8 +306,8 @@ void registerCluster{{asUpperCamelCase name}}(Commands & commands)
 
     commands.Register(clusterName, clusterCommands);
 }
-{{/unless}}
-{{/all_user_clusters}}
+{{/if}}
+{{/zcl_clusters}}
 
 void registerClusterAny(Commands & commands)
 {
@@ -329,9 +329,9 @@ void registerClusterAny(Commands & commands)
 void registerClusters(Commands & commands)
 {
     registerClusterAny(commands);
-{{#all_user_clusters side='client'}}
-    {{#unless (wasRemoved (asUpperCamelCase name preserveAcronyms=true))}}
+{{#zcl_clusters}}
+    {{#if (isSupported (asUpperCamelCase name preserveAcronyms=true))}}
     registerCluster{{asUpperCamelCase name}}(commands);
-    {{/unless}}
-{{/all_user_clusters}}
+    {{/if}}
+{{/zcl_clusters}}
 }

examples/platform/silabs/SiWx917/LEDWidget.h

@@ -19,9 +19,11 @@
 
 #pragma once
 
-#include "rsi_board.h"
 #include <stdint.h>
 
+extern "C" void RSI_Board_LED_Set(int, int);
+extern "C" void RSI_Board_LED_Toggle(int);
+
 class LEDWidget
 {
 public:

integrations/docker/images/chip-build-esp32/Dockerfile

@@ -10,7 +10,7 @@ RUN set -x \
     && : # last line
 
 RUN set -x \
-    && git clone --recursive -b v4.4.3 --depth 1 --shallow-submodule https://github.com/espressif/esp-idf.git /tmp/esp-idf \
+    && git clone --recursive -b v4.4.4 --depth 1 --shallow-submodule https://github.com/espressif/esp-idf.git /tmp/esp-idf \
     && : # last line
 
 FROM connectedhomeip/chip-build:${VERSION}

integrations/docker/images/chip-build-telink/Dockerfile

@@ -23,7 +23,7 @@ RUN set -x \
     && : # last line
 
 # Setup Zephyr
-ARG ZEPHYR_REVISION=79e02527e04b369180ceef7c4cd682b24889801e
+ARG ZEPHYR_REVISION=abb88b989a7ee31c04d99615cd91c946c81c0aa5
 WORKDIR /opt/telink/zephyrproject
 RUN set -x \
     && python3 -m pip install -U --no-cache-dir \

integrations/docker/images/chip-build/version

@@ -1 +1 @@
-0.7.0 Version bump reason: [Android] Use NDK r23c and OpenSSL 1.1.1t
+0.7.2 Version bump reason: [Telink] Update Telink Docker image (Zephyr update)

integrations/docker/images/chip-cert-bins/Dockerfile

@@ -7,7 +7,7 @@ ARG COMMITHASH=7b99e6399c6069037c613782d78132c69b9dcabb
 # ZAP Development install, so that it runs on both x64 and arm64
 # Generally this should match with the ZAP version that is used for codegen within the
 # specified SHA
-ARG ZAP_VERSION=v2023.04.05-nightly
+ARG ZAP_VERSION=v2023.04.18-nightly
 
 # Ensure TARGETPLATFORM is set
 RUN case ${TARGETPLATFORM} in \

scripts/setup/zap.json

@@ -8,7 +8,7 @@
                 "mac-arm64",
                 "windows-amd64"
             ],
-            "tags": ["version:[email protected].05-nightly.1"]
+            "tags": ["version:[email protected].18-nightly.1"]
         }
     ]
 }

scripts/tools/zap/zap_execution.py

@@ -23,7 +23,7 @@
 # Use scripts/tools/zap/version_update.py to manage ZAP versioning as many
 # files may need updating for versions
 #
-MIN_ZAP_VERSION = '2023.4.5'
+MIN_ZAP_VERSION = '2023.4.18'
 
 
 class ZapTool:

src/darwin/Framework/CHIP/MTRBaseDevice.h

@@ -41,6 +41,20 @@ NS_ASSUME_NONNULL_BEGIN
  *                MTRDataKey: Data-value NSDictionary object.
  *                              Included when there is data and when there is no error.
  *                              The data-value is described below.
+ *                MTREventNumberKey : NSNumber-wrapped uint64_t value. Monotonically increasing, and consecutive event reports
+ *                                    should have consecutive numbers unless device reboots, or if events are lost.
+ *                                    Only present when both MTREventPathKey and MTRDataKey are present.
+ *                MTREventPriorityKey : NSNumber-wrapped MTREventPriority value.
+ *                                      Only present when both MTREventPathKey and MTRDataKey are present.
+ *                MTREventTimeTypeKey : NSNumber-wrapped MTREventTimeType value.
+ *                                      Only present when both MTREventPathKey and MTRDataKey are present.
+ *                MTREventSystemUpTimeKey : NSNumber-wrapped NSTimeInterval value.
+ *                                          Only present when MTREventTimeTypeKey is MTREventTimeTypeSystemUpTime.
+ *                MTREventTimestampDateKey : NSDate object.
+ *                                           Only present when MTREventTimeTypeKey is MTREventTimeTypeTimestampDate.
+ *
+ *                Only one of MTREventTimestampDateKey and MTREventSystemUpTimeKey will be present, depending on the value for
+ *                MTREventTimeTypeKey.
  *
  *                A data-value is an NSDictionary object with the following key values:
  *
@@ -117,6 +131,11 @@ extern NSString * const MTRDoubleValueType;
 extern NSString * const MTRNullValueType;
 extern NSString * const MTRStructureValueType;
 extern NSString * const MTRArrayValueType;
+extern NSString * const MTREventNumberKey API_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5));
+extern NSString * const MTREventPriorityKey API_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5));
+extern NSString * const MTREventTimeTypeKey API_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5));
+extern NSString * const MTREventSystemUpTimeKey API_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5));
+extern NSString * const MTREventTimestampDateKey API_AVAILABLE(ios(16.5), macos(13.4), watchos(9.5), tvos(16.5));
 
 @class MTRClusterStateCacheContainer;
 @class MTRAttributeCacheContainer;