From 82fb21ddf22ffd2795def2ebdf6d6bfded676a4b Mon Sep 17 00:00:00 2001 From: WanqQixiang Date: Tue, 21 Jan 2025 10:22:36 +0800 Subject: [PATCH 1/2] ESP32: remove the nogncheck in platform source --- src/platform/ESP32/NetworkCommissioningDriver.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/platform/ESP32/NetworkCommissioningDriver.cpp b/src/platform/ESP32/NetworkCommissioningDriver.cpp index 77394d17f4e49a..1ded189218ce82 100644 --- a/src/platform/ESP32/NetworkCommissioningDriver.cpp +++ b/src/platform/ESP32/NetworkCommissioningDriver.cpp @@ -15,7 +15,6 @@ * limitations under the License. */ -#include // nogncheck #include #include #include @@ -459,9 +458,6 @@ void ESPWiFiDriver::OnScanWiFiNetworkDone() void ESPWiFiDriver::OnNetworkStatusChange() { - // This function reports the status to the data model provider, so skip it if the provider is not ready. - VerifyOrReturn(app::InteractionModelEngine::GetInstance() && - app::InteractionModelEngine::GetInstance()->GetDataModelProvider()); Network configuredNetwork; bool staEnabled = false, staConnected = false; VerifyOrReturn(ESP32Utils::IsStationEnabled(staEnabled) == CHIP_NO_ERROR); From e7503bcfb90c64912ae993dc0849132ce3782536 Mon Sep 17 00:00:00 2001 From: WanqQixiang Date: Tue, 21 Jan 2025 12:03:32 +0800 Subject: [PATCH 2/2] remove the workaround changes in ESP32 platform --- src/platform/ESP32/BUILD.gn | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/platform/ESP32/BUILD.gn b/src/platform/ESP32/BUILD.gn index 424cde44f0637c..77cbc94bb43650 100644 --- a/src/platform/ESP32/BUILD.gn +++ b/src/platform/ESP32/BUILD.gn @@ -124,13 +124,6 @@ static_library("ESP32") { "NetworkCommissioningDriver.cpp", "NetworkCommissioningDriver.h", ] - - # TODO: this is NOT ok, however we added a layering dependecy - # in NetworkCommissioningDriver accessing app/InteractionModelEngine.h - # - # Should be removed after https://github.com/project-chip/connectedhomeip/issues/37126 - # is fixed - deps += [ "${chip_root}/src/access:access_config" ] } if (chip_mdns == "platform") {