Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ESP32: report network status change only when IM engine and the data model provider is ready #36939

Merged
merged 3 commits into from
Jan 7, 2025
Merged

ESP32: report network status change only when IM engine and the data model provider is ready #36939

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbbc77d
ESP32: report network status change only when the data model provider…
wqx6 Dec 27, 2024
10cacdd
skip gn check for the interaction model engine include line
wqx6 Dec 30, 2024
e5786d1
Merge branch 'master' into esp32/network_status_report
wqx6 Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/platform/ESP32/NetworkCommissioningDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
* limitations under the License.
*/

#include <app/InteractionModelEngine.h> // nogncheck
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This breaks layering

#include <lib/support/CodeUtils.h>
#include <lib/support/SafeInt.h>
#include <platform/CHIPDeviceLayer.h>
Expand Down Expand Up @@ -458,6 +459,9 @@ 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);
Expand Down
Loading