Merge branch 'master' into granbery/atomic_write

Author: hasty

config/esp32/components/chip/CMakeLists.txt

@@ -466,7 +466,11 @@ if (CONFIG_ENABLE_ENCRYPTED_OTA)
     list(APPEND chip_libraries $<TARGET_FILE:${esp_encrypted_img_lib}>)
 endif()
 
-idf_component_get_property(main_lib main COMPONENT_LIB)
+# Let user set EXECUTABLE_COMPONENT_NAME and defaults to main if not specified
+if (NOT EXECUTABLE_COMPONENT_NAME)
+  set(EXECUTABLE_COMPONENT_NAME "main")
+endif()
+idf_component_get_property(main_lib ${EXECUTABLE_COMPONENT_NAME} COMPONENT_LIB)
 list(APPEND chip_libraries $<TARGET_FILE:${main_lib}>)
 
 if (CONFIG_SEC_CERT_DAC_PROVIDER)

config/telink/chip-module/Kconfig.defaults

@@ -286,10 +286,10 @@ config NET_IPV6_NBR_CACHE
     default n
 
 config NET_MAX_CONN
-    default 1
+    default 1 if !WIFI
 
 config NET_MAX_CONTEXTS
-    default 1
+    default 1 if !WIFI
 
 config NET_CONFIG_INIT_TIMEOUT
     default 0

docs/guides/esp32/config_options.md

@@ -11,3 +11,18 @@ Configure below options through `idf.py menuconfig` and build the app.
 CONFIG_DISABLE_IPV4=y
 CONFIG_LWIP_IPV4=n
 ```
+
+### Executable component not in "main" component
+
+The ESP-IDF framework allows renaming the main component, which can be useful if
+you want to place the app_main() function in a different component.
+
+For required changes in the executable component, please refer to the
+[esp-idf documentation](https://docs.espressif.com/projects/esp-idf/en/stable/esp32/api-guides/build-system.html#renaming-main-component).
+
+If you're building applications that support Matter and want to place app_main()
+in a component other than main, use the following command:
+
+```
+idf.py -DEXECUTABLE_COMPONENT_NAME="your_component" build
+```

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

@@ -9389,6 +9389,41 @@ endpoint 3 {
     ram      attribute clusterRevision default = 2;
   }
 }
+endpoint 4 {
+  device type ma_genericswitch = 15, version 3;
+
+
+  server cluster Identify {
+    ram      attribute identifyTime default = 0x0000;
+    ram      attribute identifyType default = 0x00;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0;
+    ram      attribute clusterRevision default = 4;
+  }
+
+  server cluster Descriptor {
+    callback attribute deviceTypeList;
+    callback attribute serverList;
+    callback attribute clientList;
+    callback attribute partsList;
+    callback attribute tagList;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute attributeList;
+    callback attribute featureMap;
+    callback attribute clusterRevision;
+  }
+
+  server cluster Switch {
+    ram      attribute numberOfPositions default = 2;
+    ram      attribute currentPosition default = 0;
+    ram      attribute multiPressMax default = 3;
+    ram      attribute featureMap default = 30;
+    ram      attribute clusterRevision default = 2;
+  }
+}
 endpoint 65534 {
   device type ma_secondary_network_interface = 25, version 1;