Merge branch 'project-chip:master' into ICDHandler

.github/workflows/tests.yaml

@@ -110,6 +110,8 @@ jobs:
                       src/app/zap-templates/zcl/data-model/chip/color-control-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/concentration-measurement-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/content-app-observer-cluster.xml \
+                      src/app/zap-templates/zcl/data-model/chip/content-control-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml \
                       src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml \

.github/workflows/zap_templates.yaml

@@ -53,6 +53,8 @@ jobs:
                 DEBIAN_FRONTEND=noninteractive apt-get install -fy --fix-missing openjdk-17-jre
             - name: Generate all
               run: ./scripts/run_in_build_env.sh scripts/tools/zap_regen_all.py
+            - name: Generate script-maintained items (ERROR_CODES.md)
+              run: ./scripts/run_in_build_env.sh "scripts/error_table.py > docs/ERROR_CODES.md"
             - name: Ensure git works in current working directory
               run: git config --global --add safe.directory `pwd`
             - name: Check for uncommited changes

.restyled.yaml

@@ -84,6 +84,8 @@ exclude:
     - "scripts/setup/bootstrap.sh" # tries to quote loop variable
     - "integrations/docker/build-all.sh" # tries to quote loop variable
     - "scripts/setup/pigweed.json" # TODO(#29547). This file is temporary copy from pigweed repo that has minor edits. No restyle help in diff.
+    - "docs/ERROR_CODES.md" # generated by scripts, not easy to align tables
+    - "docs/clusters.md" # generated by scripts, not easy to align tables
 
 changed_paths:
     maximum: 100000

.spellcheck.yml

@@ -65,6 +65,6 @@ matrix:
       # converts markdown to HTML
       - pyspelling.filters.markdown:
     sources:
-      - '**/*.md|!third_party/**|!examples/common/**/repo/**|!docs/ERROR_CODES.md'
+      - '**/*.md|!third_party/**|!examples/common/**/repo/**|!docs/ERROR_CODES.md|!docs/clusters.md'
     aspell:
       ignore-case: true

build/chip/java/kotlinc_runner.py

@@ -127,6 +127,9 @@ def main():
     if classpath:
         kotlin_args += ["-classpath", classpath]
 
+    kotlin_args += ["-J-Xms256m", "-J-Xmx4096m", "-J-XX:MaxPermSize=350m",
+                    "-J-XX:ReservedCodeCacheSize=225m", "-J-XX:+UseCompressedOops"]
+
     retcode = subprocess.check_call(kotlin_args + args.rest)
     if retcode != EXIT_SUCCESS:
         return retcode

config/esp32/components/chip/CMakeLists.txt

@@ -38,12 +38,9 @@ if(NOT "${IDF_TARGET}" STREQUAL "esp32h2")
 endif()
 
 if (NOT CMAKE_BUILD_EARLY_EXPANSION)
-    if (CONFIG_COMPILER_OPTIMIZATION_DEFAULT OR CONFIG_COMPILER_OPTIMIZATION_NONE)
+    if (CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE)
         set(is_debug TRUE)
     else()
-        if (NOT CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE)
-            message(FATAL_ERROR "CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE shall be set")
-        endif()
         set(is_debug FALSE)
     endif()
 endif()

data_model/clusters/AccountLogin.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
 Copyright (C) Connectivity Standards Alliance (2021). All rights reserved.
 The information within this document is the property of the Connectivity
@@ -54,44 +54,59 @@ This notice and disclaimer must be included on all copies of this document.
 Connectivity Standards Alliance
 508 Second Street, Suite 206
 Davis, CA 95616, USA
--->
-<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050e" name="Account Login" revision="1">
-  <revisionHistory>
-    <revision revision="1" summary="Initial Release"/>
-  </revisionHistory>
-  <classification hierarchy="base" role="application" picsCode="ALOGIN" scope="Endpoint"/>
-  <commands>
-    <command id="0x00" name="GetSetupPIN" response="GetSetupPINResponse">
-      <access invokePrivilege="admin" fabricScoped="true" timed="true"/>
-      <mandatoryConform/>
-      <field id="0" name="TempAccountIdentifier" type="string">
-        <mandatoryConform/>
-        <constraint type="lengthBetween" from="16" to="100"/>
-      </field>
-    </command>
-    <command id="0x01" name="GetSetupPINResponse" direction="responseFromServer">
-      <access invokePrivilege="operate" fabricScoped="true"/>
-      <mandatoryConform/>
-      <field id="0" name="SetupPIN" type="string">
-        <mandatoryConform/>
-        <constraint type="desc"/>
-      </field>
-    </command>
-    <command id="0x02" name="Login" response="Y">
-      <access invokePrivilege="admin" fabricScoped="true" timed="true"/>
-      <mandatoryConform/>
-      <field id="0" name="TempAccountIdentifier" type="string">
-        <mandatoryConform/>
-        <constraint type="lengthBetween" from="16" to="100"/>
-      </field>
-      <field id="1" name="SetupPIN" type="string">
-        <mandatoryConform/>
-        <constraint type="minLength" value="11"/>
-      </field>
-    </command>
-    <command id="0x03" name="Logout" response="Y">
-      <access invokePrivilege="operate" fabricScoped="true" timed="true"/>
-      <mandatoryConform/>
-    </command>
-  </commands>
+-->
+<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x050e" name="Account Login" revision="1">
+  <revisionHistory>
+    <revision revision="1" summary="Initial Release"/>
+  </revisionHistory>
+  <classification hierarchy="base" role="application" picsCode="ALOGIN" scope="Endpoint"/>
+  <commands>
+    <command id="0x00" name="GetSetupPIN" response="GetSetupPINResponse">
+      <access invokePrivilege="admin" fabricScoped="true" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="TempAccountIdentifier" type="string">
+        <mandatoryConform/>
+        <constraint type="lengthBetween" from="16" to="100"/>
+      </field>
+    </command>
+    <command id="0x01" name="GetSetupPINResponse" direction="responseFromServer">
+      <access invokePrivilege="operate" fabricScoped="true"/>
+      <mandatoryConform/>
+      <field id="0" name="SetupPIN" type="string">
+        <mandatoryConform/>
+        <constraint type="desc"/>
+      </field>
+    </command>
+    <command id="0x02" name="Login" response="Y">
+      <access invokePrivilege="admin" fabricScoped="true" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="TempAccountIdentifier" type="string">
+        <mandatoryConform/>
+        <constraint type="lengthBetween" from="16" to="100"/>
+      </field>
+      <field id="1" name="SetupPIN" type="string">
+        <mandatoryConform/>
+        <constraint type="minLength" value="8"/>
+      </field>
+      <field id="2" name="Node" type="node-id">
+        <optionalConform/>
+      </field>
+    </command>
+    <command id="0x03" name="Logout" response="Y">
+      <access invokePrivilege="operate" fabricScoped="true" timed="true"/>
+      <mandatoryConform/>
+      <field id="0" name="Node" type="node-id">
+        <optionalConform/>
+      </field>
+    </command>
+  </commands>
+  <events>
+    <event id="0x00" name="LoggedOut" priority="critical">
+      <access fabricSensitive="true" invokePrivilege="admin"/>
+      <mandatoryConform/>
+      <field id="0" name="Node" type="node-id">
+        <optionalConform/>
+      </field>
+    </event>
+  </events>
 </cluster>