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

[nrfconnect] Fix WiFiManager singleton implementation #34148

Merged
merged 1 commit into from
Jul 2, 2024
Merged

[nrfconnect] Fix WiFiManager singleton implementation #34148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions src/platform/nrfconnect/wifi/ConnectivityManagerImplWiFi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ ConnectivityManager::WiFiStationMode ConnectivityManagerImplWiFi::_GetWiFiStatio
{
if (mStationMode != ConnectivityManager::WiFiStationMode::kWiFiStationMode_ApplicationControlled)
{
mStationMode = (WiFiManager::StationStatus::DISABLED == WiFiManager().Instance().GetStationStatus())
mStationMode = (WiFiManager::StationStatus::DISABLED == WiFiManager::Instance().GetStationStatus())
? ConnectivityManager::WiFiStationMode::kWiFiStationMode_Disabled
: ConnectivityManager::WiFiStationMode::kWiFiStationMode_Enabled;
}
Expand All @@ -60,7 +60,7 @@ CHIP_ERROR ConnectivityManagerImplWiFi::_SetWiFiStationMode(ConnectivityManager:

bool ConnectivityManagerImplWiFi::_IsWiFiStationEnabled(void)
{
return (WiFiManager::StationStatus::DISABLED <= WiFiManager().Instance().GetStationStatus());
return (WiFiManager::StationStatus::DISABLED <= WiFiManager::Instance().GetStationStatus());
}

bool ConnectivityManagerImplWiFi::_IsWiFiStationApplicationControlled(void)
Expand All @@ -70,7 +70,7 @@ bool ConnectivityManagerImplWiFi::_IsWiFiStationApplicationControlled(void)

bool ConnectivityManagerImplWiFi::_IsWiFiStationConnected(void)
{
return (WiFiManager::StationStatus::CONNECTED == WiFiManager().Instance().GetStationStatus());
return (WiFiManager::StationStatus::CONNECTED == WiFiManager::Instance().GetStationStatus());
}

System::Clock::Timeout ConnectivityManagerImplWiFi::_GetWiFiStationReconnectInterval(void)
Expand All @@ -88,14 +88,14 @@ bool ConnectivityManagerImplWiFi::_IsWiFiStationProvisioned(void)
{
// from Matter perspective `provisioned` means that the supplicant has been provided
// with SSID and password (doesn't matter if valid or not)
return (WiFiManager::StationStatus::CONNECTING <= WiFiManager().Instance().GetStationStatus());
return (WiFiManager::StationStatus::CONNECTING <= WiFiManager::Instance().GetStationStatus());
}

void ConnectivityManagerImplWiFi::_ClearWiFiStationProvision(void)
{
if (_IsWiFiStationProvisioned())
{
if (CHIP_NO_ERROR != WiFiManager().Instance().ClearStationProvisioningData())
if (CHIP_NO_ERROR != WiFiManager::Instance().ClearStationProvisioningData())
{
ChipLogError(DeviceLayer, "Cannot clear WiFi station provisioning data");
}
Expand All @@ -104,9 +104,9 @@ void ConnectivityManagerImplWiFi::_ClearWiFiStationProvision(void)

bool ConnectivityManagerImplWiFi::_CanStartWiFiScan()
{
return (WiFiManager::StationStatus::DISABLED != WiFiManager().Instance().GetStationStatus() &&
WiFiManager::StationStatus::SCANNING != WiFiManager().Instance().GetStationStatus() &&
WiFiManager::StationStatus::CONNECTING != WiFiManager().Instance().GetStationStatus());
return (WiFiManager::StationStatus::DISABLED != WiFiManager::Instance().GetStationStatus() &&
WiFiManager::StationStatus::SCANNING != WiFiManager::Instance().GetStationStatus() &&
WiFiManager::StationStatus::CONNECTING != WiFiManager::Instance().GetStationStatus());
}

void ConnectivityManagerImplWiFi::_OnWiFiStationProvisionChange()
Expand Down
9 changes: 9 additions & 0 deletions src/platform/nrfconnect/wifi/WiFiManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@ class Map
class WiFiManager
{
public:
/* No copy, nor move. */
WiFiManager(const WiFiManager &) = delete;
WiFiManager & operator=(const WiFiManager &) = delete;
WiFiManager(WiFiManager &&) = delete;
WiFiManager & operator=(WiFiManager &&) = delete;

using ScanDoneStatus = decltype(wifi_status::status);
using ScanResultCallback = void (*)(const NetworkCommissioning::WiFiScanResponse &);
using ScanDoneCallback = void (*)(const ScanDoneStatus &);
Expand Down Expand Up @@ -185,6 +191,9 @@ class WiFiManager
private:
using NetEventHandler = void (*)(Platform::UniquePtr<uint8_t>, size_t);

WiFiManager() = default;
~WiFiManager() = default;

struct ConnectionParams
{
wifi_connect_req_params mParams;
Expand Down
Loading