Merge branch 'master' into window

shchen-Lab · Nov 29, 2023 · 9c1a230 · 9c1a230
2 parents 25098df + e80b184
commit 9c1a230
Show file tree

Hide file tree

Showing 175 changed files with 28,370 additions and 12,234 deletions.
diff --git a/config/nrfconnect/chip-module/CMakeLists.txt b/config/nrfconnect/chip-module/CMakeLists.txt
@@ -136,12 +136,11 @@ matter_add_gn_arg_bool  ("chip_malloc_sys_heap"                   CONFIG_CHIP_MA
 matter_add_gn_arg_bool  ("chip_enable_wifi"                       CONFIG_WIFI_NRF700X)
 matter_add_gn_arg_bool  ("chip_system_config_provide_statistics"  CONFIG_CHIP_STATISTICS)
 matter_add_gn_arg_bool  ("chip_enable_icd_server"                 CONFIG_CHIP_ENABLE_ICD_SUPPORT)
+matter_add_gn_arg_bool  ("chip_enable_factory_data"               CONFIG_CHIP_FACTORY_DATA)
 
-if (CONFIG_CHIP_FACTORY_DATA)
-    matter_add_gn_arg_bool("chip_use_transitional_commissionable_data_provider" FALSE)
-    matter_add_gn_arg_bool("chip_enable_factory_data"                           TRUE)
-elseif (CONFIG_CHIP_FACTORY_DATA_CUSTOM_BACKEND)
-    matter_add_gn_arg_bool("chip_use_transitional_commissionable_data_provider" FALSE)
+if (CONFIG_CHIP_FACTORY_DATA OR CONFIG_CHIP_FACTORY_DATA_CUSTOM_BACKEND)
+    matter_add_gn_arg_bool("chip_use_transitional_commissionable_data_provider"  FALSE)
+    matter_add_gn_arg_bool("chip_use_transitional_device_instance_info_provider" FALSE)
 endif()
 
 if (CONFIG_CHIP_ROTATING_DEVICE_ID)

diff --git a/data_model/clusters/DiagnosticsGeneral.xml b/data_model/clusters/DiagnosticsGeneral.xml
@@ -258,6 +258,9 @@ Davis, CA 95616, USA
       <access read="true" readPrivilege="view"/>
       <mandatoryConform/>
     </attribute>
+    <attribute id="0x0009" name="DoNotUse">
+      <disallowConform/>
+    </attribute>
   </attributes>
   <commands>
     <command id="0x00" name="TestEventTrigger" response="Y">

diff --git a/data_model/spec_sha b/data_model/spec_sha
@@ -1 +1 @@
-8e4f91da4aacda4e799b9979605342a315ac7e43
+0267d8197ec5c00d0220fdef7950750b63e08c1f
diff --git a/docs/ci-cd/index.md b/docs/ci-cd/index.md
@@ -8,12 +8,17 @@ tools/*
 
 ## Project Information
 
--   [Build Guide](../guides/BUILDING.html)
+-   [Build Guide](../guides/BUILDING.md)
 -   Sphinx documentation framework
     -   New directories and individual files must be added to the
         [tree](https://github.com/project-chip/connectedhomeip/blob/master/docs/index.md)
     -   New files under directories must be added to the tree in the index file;
         see above. Glob and regular expressions may be used to include all
+    -   The
+        [documentation page](https://project-chip.github.io/connectedhomeip-doc/)
+        is the end product
+        -   Links can be relative; links ending in ".md" in the code will be
+            reflected as ".html" on that page
 -   Pull Requests
     -   Built in style and spelling checks must be satisfied
     -   Larger changes should go through an approval process; reviewers are
@@ -31,7 +36,7 @@ Work In Progress
 
 ## Tools
 
--   [Daily Fail Summary](tools/daily_fail_summary.html)
+-   [Daily Fail Summary](tools/daily_fail_summary.md)
 
 ## To Do
 

diff --git a/docs/examples/index.md b/docs/examples/index.md
@@ -311,3 +311,12 @@ rvc-app/README
 
 air-purifier-app/**/README
 ```
+
+## Network Infrastructure Manager example
+
+```{toctree}
+:glob:
+:maxdepth: 1
+
+network-manager-app/README
+```