Merge branch 'master' into release/v5.5

me-no-dev · web-flow · commit e59f4b5fd000 · 2025-02-20T20:04:31.000+02:00
diff --git a/configs/defconfig.common b/configs/defconfig.common
@@ -134,3 +134,6 @@ CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y
 
 #TinyUSB Config
 CONFIG_TINYUSB_CDC_MAX_PORTS=2
+
+# Zigbee Config
+CONFIG_ZB_ENABLED=y
diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6
@@ -45,7 +45,6 @@ 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
@@ -38,7 +38,6 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
 #
 # Zigbee
 #
-CONFIG_ZB_ENABLED=y
 CONFIG_ZB_ZED=y
 CONFIG_ZB_RADIO_NATIVE=y
 # end of Zigbee

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ CONFIG_ENABLE_MATTER_OVER_THREAD=n`
`45`	`45`	`#`
`46`	`46`	`# Zigbee`
`47`	`47`	`#`
`48`		`-CONFIG_ZB_ENABLED=y`
`49`	`48`	`CONFIG_ZB_ZED=y`
`50`	`49`	`CONFIG_ZB_RADIO_NATIVE=y`
`51`	`50`	`# end of Zigbee`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"`
`38`	`38`	`#`
`39`	`39`	`# Zigbee`
`40`	`40`	`#`
`41`		`-CONFIG_ZB_ENABLED=y`
`42`	`41`	`CONFIG_ZB_ZED=y`
`43`	`42`	`CONFIG_ZB_RADIO_NATIVE=y`
`44`	`43`	`# end of Zigbee`