Merge branch 'master' into update_zap_files_to_spec

.github/workflows/darwin.yaml

@@ -119,13 +119,10 @@ jobs:
               run: |
                   xcodebuild -target "MatterTvCastingBridge" -sdk iphoneos
               working-directory: examples/tv-casting-app/darwin/MatterTvCastingBridge
-            - name: Uploading .ips files in Xcode derived data to debug the failure
-              uses: actions/upload-artifact@v4
-              if: ${{ failure() && !env.ACT }}
-              with:
-                  name: darwin-framework-derived-data
-                  path: ~/Library/Developer/Xcode/DerivedData/**/*.ips
-                  retention-days: 5
+            - name: Collect crash logs
+              run: |
+                  mkdir -p /tmp/darwin/framework-tests
+                  find ~/Library/Developer/Xcode/DerivedData /Library/Logs/DiagnosticReports -name '*.ips' -print0 | xargs -0 -J % cp % /tmp/darwin/framework-tests
             - name: Uploading log files
               uses: actions/upload-artifact@v4
               if: ${{ failure() && !env.ACT }}

.github/workflows/java-tests.yaml

@@ -133,15 +133,15 @@ jobs:
                      --tool-args "onnetwork-long-im-invoke --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \
                      --factoryreset \
                   '                    
-            - name: Run IM Batch Invoke Test
+            - name: Run IM Extendable Invoke Test
               run: |
                   scripts/run_in_python_env.sh out/venv \
                   './scripts/tests/run_java_test.py \
                      --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app \
                      --app-args "--discriminator 3840 --interface-id -1" \
                      --tool-path out/linux-x64-java-matter-controller \
                      --tool-cluster "im" \
-                     --tool-args "onnetwork-long-im-batch-invoke --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \
+                     --tool-args "onnetwork-long-im-extendable-invoke --nodeid 1 --setup-pin-code 20202021 --discriminator 3840 -t 1000" \
                      --factoryreset \
                   '
             - name: Run IM Read Test

.github/workflows/lint.yml

@@ -123,12 +123,10 @@ jobs:
                      --known-failure app/util/generic-callback-stubs.cpp \
                      --known-failure app/util/im-client-callbacks.h \
                      --known-failure app/util/MatterCallbacks.h \
-                     --known-failure app/util/message.cpp \
                      --known-failure app/util/odd-sized-integers.h \
                      --known-failure app/util/util.cpp \
                      --known-failure app/util/util.h \
                      --known-failure app/WriteHandler.h \
-                     --known-failure lib/core/CHIPVendorIdentifiers.hpp \
                      --known-failure platform/DeviceSafeQueue.cpp \
                      --known-failure platform/DeviceSafeQueue.h \
                      --known-failure platform/GLibTypeDeleter.h \

build/chip/chip_codegen.gni

@@ -35,7 +35,7 @@ template("_chip_build_time_codegen") {
     include_dirs = [ target_gen_dir ]
   }
 
-  pw_python_action("${_name}_codegen") {
+  pw_python_action("${_name}_generate") {
     script = "${chip_root}/scripts/codegen.py"
 
     # TODO: this seems to touch internals. Is this ok? speeds up builds!
@@ -99,7 +99,7 @@ template("_chip_build_time_codegen") {
     if (!defined(deps)) {
       deps = []
     }
-    deps += [ ":${_name}_codegen" ]
+    deps += [ ":${_name}_generate" ]
   }
 }
 
@@ -152,7 +152,7 @@ template("_chip_build_time_zapgen") {
     _output_subdir = "zap-generated"
   }
 
-  pw_python_action("${_name}_zap") {
+  pw_python_action("${_name}_generate") {
     script = "${chip_root}/scripts/tools/zap/generate.py"
 
     # TODO: this seems to touch internals. Is this ok? speeds up builds!
@@ -211,7 +211,7 @@ template("_chip_build_time_zapgen") {
     if (!defined(public_deps)) {
       public_deps = []
     }
-    public_deps += [ ":${_name}_zap" ]
+    public_deps += [ ":${_name}_generate" ]
   }
 }
 

build/config/BUILDCONFIG.gn

@@ -76,11 +76,11 @@ if (_chip_defaults.custom_toolchain != "") {
   } else {
     _target_compiler = "gcc"
   }
-
   _default_toolchain = "${_build_overrides.build_root}/toolchain/linux:linux_${target_cpu}_${_target_compiler}"
-} else if (target_os == host_os &&
-           (target_cpu == host_cpu ||
-            (target_cpu == "arm64e" && host_cpu == "arm64"))) {
+} else if (host_os == "mac" && (target_os == "mac" || target_os == "ios")) {
+  # On Mac the host toolchain supports building for all mac and ios targets
+  _default_toolchain = host_toolchain
+} else if (target_os == host_os && target_cpu == host_cpu) {
   _default_toolchain = host_toolchain
 } else if (target_os == "freertos") {
   if (_chip_defaults.is_clang) {
@@ -113,9 +113,6 @@ if (_chip_defaults.custom_toolchain != "") {
   } else {
     assert(false, "Unsupported target_cpu: ${current_cpu}")
   }
-} else if (target_os == "ios") {
-  _default_toolchain =
-      "${_build_overrides.build_root}/toolchain/ios:ios_${target_cpu}"
 } else if (target_os == "tizen") {
   _default_toolchain =
       "${_build_overrides.build_root}/toolchain/tizen:tizen_${target_cpu}"

build/config/compiler/BUILD.gn

@@ -343,7 +343,7 @@ config("cosmetic_default") {
 }
 
 config("runtime_default") {
-  if (is_clang) {
+  if (is_clang) {  # Using Pigweed clang instead of Darwin host clang
     configs = [
       "$dir_pw_toolchain/host_clang:no_system_libcpp",
       "$dir_pw_toolchain/host_clang:xcode_sysroot",
@@ -402,7 +402,7 @@ config("sanitize_address") {
   ]
   ldflags = cflags
 
-  if (target_os == "mac" || target_os == "ios") {
+  if ((target_os == "mac" || target_os == "ios") && !is_clang) {
     defines += [ "_LIBCPP_HAS_NO_ASAN" ]
   }
 }

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

@@ -7761,7 +7761,7 @@ endpoint 1 {
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0x0001;
-    ram      attribute clusterRevision default = 5;
+    ram      attribute clusterRevision default = 6;
 
     handle command Off;
     handle command On;
@@ -9134,7 +9134,7 @@ endpoint 2 {
     callback attribute eventList;
     callback attribute attributeList;
     ram      attribute featureMap default = 0x0001;
-    ram      attribute clusterRevision default = 5;
+    ram      attribute clusterRevision default = 6;
 
     handle command Off;
     handle command On;

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

@@ -6659,7 +6659,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "5",
+              "defaultValue": "6",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -6895,7 +6895,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "5",
+              "defaultValue": "6",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -23993,7 +23993,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "5",
+              "defaultValue": "6",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,

examples/android/CHIPTool/app/src/main/res/layout/wildcard_fragment.xml

@@ -181,7 +181,7 @@
       android:layout_height="wrap_content"
       android:layout_margin="16dp"
       android:visibility="gone"
-      android:inputType="number" />
+      android:inputType="text" />
 
   <TextView
       android:id="@+id/writeValueTypeLabel"
@@ -235,7 +235,8 @@
       android:layout_height="wrap_content"
       android:layout_margin="16dp"
       android:visibility="gone"
-      android:inputType="number"/>
+      android:inputType="text"
+      android:hint="@string/wildcard_invoke_value_help_label"/>
 
   <androidx.constraintlayout.widget.ConstraintLayout
       android:id="@+id/addLayout"

examples/android/CHIPTool/app/src/main/res/values/strings.xml

@@ -196,7 +196,8 @@
     <string name="wildcard_write_value_text">Write Value</string>
     <string name="wildcard_write_data_version_text">Data Version</string>
     <string name="wildcard_write_data_version_help_label">optional</string>
-    <string name="wildcard_invoke_value_text">Invoke Value</string>
+    <string name="wildcard_invoke_value_text">Invoke Value(Json)</string>
+    <string name="wildcard_invoke_value_help_label">Example: {"0:UINT":1}</string>
     <string name="wildcard_empty_error_toast_message">Please add it to the list using Add Button.</string>
     <string name="wildcard_subscribe_established_toast_message">Subscription established</string>
 

examples/darwin-framework-tool/BUILD.gn

@@ -139,6 +139,7 @@ action("build-darwin-framework") {
 config("config") {
   include_dirs = [
     ".",
+    "include",
     "${chip_root}/examples/common",
     "${chip_root}/examples/darwin-framework-tool/commands/common",
     "${chip_root}/zzz_generated/darwin-framework-tool",

examples/java-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImExtendableInvokeCommand.kt

@@ -38,7 +38,7 @@ class PairOnNetworkLongImExtendableInvokeCommand(
 ) :
   PairingCommand(
     controller,
-    "onnetwork-long-im-batch-invoke",
+    "onnetwork-long-im-extendable-invoke",
     credsIssue,
     PairingModeType.ON_NETWORK,
     PairingNetworkType.NONE,

examples/platform/silabs/display/demo-ui-bitmaps.h

@@ -29,6 +29,10 @@
 #define ZIGBEE_BITMAP_WIDTH 16
 #define ZIGBEE_BITMAP_HEIGHT 16
 
+#define ZIGBEE_BITMAP                                                                                                              \
+    0x3f, 0xfc, 0x07, 0xf0, 0xff, 0xc7, 0xff, 0x9f, 0x01, 0x9c, 0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01, 0xe0, 0x00, 0x70,  \
+        0x80, 0x39, 0x80, 0xf9, 0xff, 0xfb, 0xff, 0x07, 0xe0, 0x1f, 0xfc
+
 #define RAIL_BITMAP_WIDTH 16
 #define RAIL_BITMAP_HEIGHT 16
 

examples/platform/silabs/display/demo-ui.c

@@ -23,6 +23,7 @@
 #include "dmd/dmd.h"
 #include "em_types.h"
 #include "glib.h"
+#include "sl_component_catalog.h"
 #include "sl_memlcd.h"
 #if SL_WIFI && !SIWX_917
 #include "spi_multiplex.h"
@@ -41,28 +42,25 @@
 #define PROT2_ID_X_POSITION 79
 
 // Matter Logo
-#define PROT2_BITMAP_WIDTH MATTER_LOGO_WIDTH
-#define PROT2_BITMAP_HEIGHT MATTER_LOGO_HEIGHT
 #define PROT2_X_POSITION 104
 #define PROT2_Y_POSITION (APP_Y_POSITION + (APP_Y_POSITION / 2))
-#define PROT2_BITMAP (matterLogoBitmap)
-#define PROT2_BITMAP_CONN (matterLogoBitmap)
 
 // Networking Protocol Logo
 #ifdef SL_WIFI
 #define PROT1_BITMAP_WIDTH WIFI_BITMAP_WIDTH
 #define PROT1_BITMAP_HEIGHT WIFI_BITMAP_HEIGHT
 #define PROT1_X_POSITION 8
 #define PROT1_Y_POSITION (APP_Y_POSITION + (APP_Y_POSITION / 2))
-#define PROT1_BITMAP (networkBitMap)
-#define PROT1_BITMAP_CONN (networkBitMap)
 #else
 #define PROT1_BITMAP_WIDTH THREAD_BITMAP_WIDTH
 #define PROT1_BITMAP_HEIGHT THREAD_BITMAP_HEIGHT
 #define PROT1_X_POSITION 8
+#ifdef SL_CATALOG_ZIGBEE_ZCL_FRAMEWORK_CORE_PRESENT
+#define ZIGBEE_POSITION_Y (APP_Y_POSITION + (APP_Y_POSITION / 2) + (ZIGBEE_BITMAP_HEIGHT / 2))
+#define PROT1_Y_POSITION (APP_Y_POSITION + (APP_Y_POSITION / 2) - (ZIGBEE_BITMAP_HEIGHT / 2))
+#else
 #define PROT1_Y_POSITION (APP_Y_POSITION + (APP_Y_POSITION / 2))
-#define PROT1_BITMAP (networkBitMap)
-#define PROT1_BITMAP_CONN (networkBitMap)
+#endif
 #endif
 
 /*******************************************************************************
@@ -82,6 +80,10 @@ static const uint8_t networkBitMap[] = { WIFI_BITMAP };
 static const uint8_t networkBitMap[] = { THREAD_BITMAP };
 #endif
 
+#ifdef SL_CATALOG_ZIGBEE_ZCL_FRAMEWORK_CORE_PRESENT
+static const uint8_t zigbeeBitMap[] = { ZIGBEE_BITMAP };
+#endif
+
 // Future usage
 // static const uint8_t unconnectedBitMap[] = { QUESTION_MARK_BITMAP };
 
@@ -141,14 +143,13 @@ void demoUIDisplayApp(bool on)
     updateDisplay();
 }
 
-void demoUIDisplayProtocol(demoUIProtocol protocol, bool isConnected)
+void demoUIDisplayProtocols()
 {
-    GLIB_drawBitmap(&glibContext, (protocol == DEMO_UI_PROTOCOL1 ? PROT1_X_POSITION : PROT2_X_POSITION),
-                    (protocol == DEMO_UI_PROTOCOL1 ? PROT1_Y_POSITION : PROT2_Y_POSITION),
-                    (protocol == DEMO_UI_PROTOCOL1 ? PROT1_BITMAP_WIDTH : PROT2_BITMAP_WIDTH),
-                    (protocol == DEMO_UI_PROTOCOL1 ? PROT1_BITMAP_HEIGHT : PROT2_BITMAP_HEIGHT),
-                    (protocol == DEMO_UI_PROTOCOL1 ? (isConnected ? PROT1_BITMAP_CONN : PROT1_BITMAP)
-                                                   : (isConnected ? PROT2_BITMAP_CONN : PROT2_BITMAP)));
+    GLIB_drawBitmap(&glibContext, PROT2_X_POSITION, PROT2_Y_POSITION, MATTER_LOGO_WIDTH, MATTER_LOGO_HEIGHT, matterLogoBitmap);
+    GLIB_drawBitmap(&glibContext, PROT1_X_POSITION, PROT1_Y_POSITION, PROT1_BITMAP_WIDTH, PROT1_BITMAP_HEIGHT, networkBitMap);
+#ifdef SL_CATALOG_ZIGBEE_ZCL_FRAMEWORK_CORE_PRESENT
+    GLIB_drawBitmap(&glibContext, PROT1_X_POSITION, ZIGBEE_POSITION_Y, ZIGBEE_BITMAP_WIDTH, ZIGBEE_BITMAP_HEIGHT, zigbeeBitMap);
+#endif
     updateDisplay();
 }
 
@@ -157,6 +158,5 @@ void demoUIClearMainScreen(uint8_t * name)
     GLIB_clear(&glibContext);
     demoUIDisplayHeader((char *) name);
     demoUIDisplayApp(false);
-    demoUIDisplayProtocol(DEMO_UI_PROTOCOL1, false);
-    demoUIDisplayProtocol(DEMO_UI_PROTOCOL2, false);
+    demoUIDisplayProtocols();
 }

examples/platform/silabs/display/demo-ui.h

@@ -126,7 +126,7 @@ void demoUIDisplayApp(bool on);
  * @return
  *      void
  *****************************************************************************/
-void demoUIDisplayProtocol(demoUIProtocol protocol, bool isConnected);
+void demoUIDisplayProtocols();
 
 /**************************************************************************/
 /**