Fix CI

Author: DejinChen

config/esp32/components/chip/Kconfig

@@ -157,6 +157,12 @@ menu "CHIP Core"
             help
                 Option to enable/disable CHIP log level filtering APIs.
 
+        config ENABLE_CHIP_DATA_MODEL
+            bool "Enable CHIP data model"
+            default y
+            help
+                Option to enable/disable CHIP data model.
+
     endmenu # "General Options"
 
     menu "Networking Options"
@@ -1290,7 +1296,7 @@ menu "CHIP Device Layer"
     menu "Network Commissioning Driver Endpoint Id"
         config THREAD_NETWORK_COMMISSIONING_DRIVER
             bool "Use the generic Thread network commissioning driver"
-            depends on ENABLE_MATTER_OVER_THREAD
+            depends on ENABLE_MATTER_OVER_THREAD && ENABLE_CHIP_DATA_MODEL
             default y
             help
                 Option to enable/disable the use of generic Thread network commissioning driver.
@@ -1305,7 +1311,7 @@ menu "CHIP Device Layer"
 
         config WIFI_NETWORK_COMMISSIONING_DRIVER
             bool "Use ESP Wi-Fi network commissioning driver"
-            depends on ENABLE_WIFI_STATION || ENABLE_WIFI_AP
+            depends on (ENABLE_WIFI_STATION || ENABLE_WIFI_AP) && ENABLE_CHIP_DATA_MODEL
             default y
             help
                 Option to enable/disable the use of ESP Wi-Fi network commissioning driver.
@@ -1320,7 +1326,7 @@ menu "CHIP Device Layer"
 
         config ETHERNET_NETWORK_COMMISSIONING_DRIVER
             bool "Use ESP Ethernet network commissioning driver"
-            depends on ENABLE_ETHERNET_TELEMETRY
+            depends on ENABLE_ETHERNET_TELEMETRY && ENABLE_CHIP_DATA_MODEL
             default y
             help
                 Option to enable/disable the use of ESP Ethernet network commissioning driver.

examples/persistent-storage/esp32/sdkconfig.defaults

@@ -32,3 +32,6 @@ CONFIG_DEVICE_PRODUCT_ID=0x8009
 
 # Enable HKDF in mbedtls
 CONFIG_MBEDTLS_HKDF_C=y
+
+# Disable CHIP data model
+CONFIG_ENABLE_CHIP_DATA_MODEL=n

examples/shell/esp32/sdkconfig.defaults

@@ -41,3 +41,6 @@ CONFIG_ENABLE_CHIP_SHELL=y
 
 # Enable HKDF in mbedtls
 CONFIG_MBEDTLS_HKDF_C=y
+
+# Disable CHIP data model
+CONFIG_ENABLE_CHIP_DATA_MODEL=n

src/platform/ESP32/CHIPDevicePlatformConfig.h

@@ -50,9 +50,9 @@
 
 #ifdef CONFIG_ENABLE_MATTER_OVER_THREAD
 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD CONFIG_ENABLE_MATTER_OVER_THREAD
-#if !CONFIG_THREAD_NETWORK_COMMISSIONING_DRIVER
+#ifndef CONFIG_THREAD_NETWORK_COMMISSIONING_DRIVER
 #define _NO_NETWORK_COMMISSIONING_DRIVER_ 1
-#endif // !CONFIG_THREAD_NETWORK_COMMISSIONING_DRIVER
+#endif
 #else
 #define CHIP_DEVICE_CONFIG_ENABLE_THREAD 0
 #endif // CONFIG_ENABLE_MATTER_OVER_THREAD
@@ -167,3 +167,15 @@
 #define CHIP_DEVICE_CONFIG_BG_TASK_PRIORITY CONFIG_BG_CHIP_TASK_PRIORITY
 #define CHIP_DEVICE_CONFIG_BG_MAX_EVENT_QUEUE_SIZE CONFIG_BG_MAX_EVENT_QUEUE_SIZE
 #define CHIP_DEVICE_CONFIG_BG_TASK_STACK_SIZE CONFIG_BG_CHIP_TASK_STACK_SIZE
+
+#ifdef CONFIG_WIFI_NETWORK_COMMISSIONING_DRIVER
+#define CHIP_DEVICE_CONFIG_WIFI_NETWORK_DRIVER CONFIG_WIFI_NETWORK_COMMISSIONING_DRIVER
+#else
+#define CHIP_DEVICE_CONFIG_WIFI_NETWORK_DRIVER 0
+#endif // CONFIG_WIFI_NETWORK_COMMISSIONING_DRIVER
+
+#ifdef CONFIG_ETHERNET_NETWORK_COMMISSIONING_DRIVER
+#define CHIP_DEVICE_CONFIG_ETHERNET_NETWORK_DRIVER CONFIG_ETHERNET_NETWORK_COMMISSIONING_DRIVER
+#else
+#define CHIP_DEVICE_CONFIG_ETHERNET_NETWORK_DRIVER 0
+#endif // CONFIG_ETHERNET_NETWORK_COMMISSIONING_DRIVER

src/platform/ESP32/ConnectivityManagerImpl.cpp

@@ -56,13 +56,13 @@ namespace DeviceLayer {
 
 ConnectivityManagerImpl ConnectivityManagerImpl::sInstance;
 
-#if CHIP_DEVICE_CONFIG_ENABLE_WIFI && CONFIG_WIFI_NETWORK_COMMISSIONING_DRIVER
+#if CHIP_DEVICE_CONFIG_ENABLE_WIFI && CHIP_DEVICE_CONFIG_WIFI_NETWORK_DRIVER
 app::Clusters::NetworkCommissioning::Instance
     sWiFiNetworkCommissioningInstance(CONFIG_WIFI_NETWORK_ENDPOINT_ID /* Endpoint Id */,
                                       &(NetworkCommissioning::ESPWiFiDriver::GetInstance()));
 #endif
 
-#if CHIP_DEVICE_CONFIG_ENABLE_ETHERNET && CONFIG_ETHERNET_NETWORK_COMMISSIONING_DRIVER
+#if CHIP_DEVICE_CONFIG_ENABLE_ETHERNET && CHIP_DEVICE_CONFIG_ETHERNET_NETWORK_DRIVER
 app::Clusters::NetworkCommissioning::Instance
     sEthernetNetworkCommissioningInstance(CONFIG_ETHERNET_NETWORK_ENDPOINT_ID /* Endpoint Id */,
                                           &(NetworkCommissioning::ESPEthernetDriver::GetInstance()));
@@ -76,15 +76,15 @@ CHIP_ERROR ConnectivityManagerImpl::_Init()
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFI
     InitWiFi();
-#if CONFIG_WIFI_NETWORK_COMMISSIONING_DRIVER
+#if CHIP_DEVICE_CONFIG_WIFI_NETWORK_DRIVER
     sWiFiNetworkCommissioningInstance.Init();
-#endif // CONFIG_WIFI_NETWORK_COMMISSIONING_DRIVER
+#endif // CHIP_DEVICE_CONFIG_WIFI_NETWORK_DRIVER
 #endif
 #if CHIP_DEVICE_CONFIG_ENABLE_ETHERNET
     InitEthernet();
-#if CONFIG_ETHERNET_NETWORK_COMMISSIONING_DRIVER
+#if CHIP_DEVICE_CONFIG_ETHERNET_NETWORK_DRIVER
     sEthernetNetworkCommissioningInstance.Init();
-#endif // CONFIG_ETHERNET_NETWORK_COMMISSIONING_DRIVER
+#endif // CHIP_DEVICE_CONFIG_ETHERNET_NETWORK_DRIVER
 #endif
 
 #if defined(CONFIG_WIFI_NETWORK_ENDPOINT_ID) && defined(CONFIG_THREAD_NETWORK_ENDPOINT_ID)