Merge branch 'master' into release/v5.3

me-no-dev · web-flow · commit aa2ae9f63031 · 2024-11-04T23:16:32.000+02:00
diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6
@@ -37,3 +37,11 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
 
 # Matter shall use only WiFi
 CONFIG_ENABLE_MATTER_OVER_THREAD=n
+
+#
+# Zigbee
+#
+CONFIG_ZB_ENABLED=y
+CONFIG_ZB_ZED=y
+CONFIG_ZB_RADIO_NATIVE=y
+# end of Zigbee
diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2
@@ -30,3 +30,11 @@ CONFIG_OPENTHREAD_NETWORK_EXTPANID="dead00beef00cafe"
 CONFIG_OPENTHREAD_NETWORK_MASTERKEY="00112233445566778899aabbccddeeff"
 CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
 # end of OpenThread
+
+#
+# Zigbee
+#
+CONFIG_ZB_ENABLED=y
+CONFIG_ZB_ZED=y
+CONFIG_ZB_RADIO_NATIVE=y
+# end of Zigbee
