Skip to content

Commit 84399bd

Browse files
authored
ESP32: remove the nogncheck in platform source (#37131)
* ESP32: remove the nogncheck in platform source * remove the workaround changes in ESP32 platform
1 parent 8ffb7b1 commit 84399bd

File tree

2 files changed

+0
-11
lines changed

2 files changed

+0
-11
lines changed

src/platform/ESP32/BUILD.gn

-7
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,6 @@ static_library("ESP32") {
124124
"NetworkCommissioningDriver.cpp",
125125
"NetworkCommissioningDriver.h",
126126
]
127-
128-
# TODO: this is NOT ok, however we added a layering dependecy
129-
# in NetworkCommissioningDriver accessing app/InteractionModelEngine.h
130-
#
131-
# Should be removed after https://github.com/project-chip/connectedhomeip/issues/37126
132-
# is fixed
133-
deps += [ "${chip_root}/src/access:access_config" ]
134127
}
135128

136129
if (chip_mdns == "platform") {

src/platform/ESP32/NetworkCommissioningDriver.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
* limitations under the License.
1616
*/
1717

18-
#include <app/InteractionModelEngine.h> // nogncheck
1918
#include <lib/support/CodeUtils.h>
2019
#include <lib/support/SafeInt.h>
2120
#include <platform/CHIPDeviceLayer.h>
@@ -459,9 +458,6 @@ void ESPWiFiDriver::OnScanWiFiNetworkDone()
459458

460459
void ESPWiFiDriver::OnNetworkStatusChange()
461460
{
462-
// This function reports the status to the data model provider, so skip it if the provider is not ready.
463-
VerifyOrReturn(app::InteractionModelEngine::GetInstance() &&
464-
app::InteractionModelEngine::GetInstance()->GetDataModelProvider());
465461
Network configuredNetwork;
466462
bool staEnabled = false, staConnected = false;
467463
VerifyOrReturn(ESP32Utils::IsStationEnabled(staEnabled) == CHIP_NO_ERROR);

0 commit comments

Comments
 (0)