Skip to content

Commit 661f292

Browse files
authored
esp32: remove unused Wi-Fi AP settings (project-chip#39734)
1 parent c16ef0f commit 661f292

6 files changed

Lines changed: 11 additions & 425 deletions

File tree

src/platform/ESP32/CHIPDevicePlatformConfig.h

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,13 @@
7575
#define CHIP_DEVICE_CONFIG_ENABLE_ETHERNET 0
7676
#endif // CONFIG_ENABLE_ETHERNET_TELEMETRY
7777

78-
#define CHIP_DEVICE_CONFIG_ENABLE_WIFI CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP | CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
78+
#define CHIP_DEVICE_CONFIG_ENABLE_WIFI CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
7979
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI
8080
#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_TELEMETRY CONFIG_ENABLE_WIFI_TELEMETRY
8181
#define CHIP_DEVICE_CONFIG_WIFI_STATION_RECONNECT_INTERVAL CONFIG_WIFI_STATION_RECONNECT_INTERVAL
8282
#define CHIP_DEVICE_CONFIG_MAX_SCAN_NETWORKS_RESULTS CONFIG_MAX_SCAN_NETWORKS_RESULTS
8383
#define CHIP_DEVICE_CONFIG_WIFI_SCAN_COMPLETION_TIMEOUT CONFIG_WIFI_SCAN_COMPLETION_TIMEOUT
8484
#define CHIP_DEVICE_CONFIG_WIFI_CONNECTIVITY_TIMEOUT CONFIG_WIFI_CONNECTIVITY_TIMEOUT
85-
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
86-
#define CHIP_DEVICE_CONFIG_WIFI_AP_SSID_PREFIX CONFIG_WIFI_AP_SSID_PREFIX
87-
#define CHIP_DEVICE_CONFIG_WIFI_AP_CHANNEL CONFIG_WIFI_AP_CHANNEL
88-
#define CHIP_DEVICE_CONFIG_WIFI_AP_MAX_STATIONS CONFIG_WIFI_AP_MAX_STATIONS
89-
#define CHIP_DEVICE_CONFIG_WIFI_AP_BEACON_INTERVAL CONFIG_WIFI_AP_BEACON_INTERVAL
90-
#define CHIP_DEVICE_CONFIG_WIFI_AP_IDLE_TIMEOUT CONFIG_WIFI_AP_IDLE_TIMEOUT
91-
#endif /* CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP */
9285
#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
9386

9487
#ifdef CONFIG_ENABLE_ICD_SERVER

src/platform/ESP32/CHIPPlatformConfig.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,6 @@
8787
#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION 0
8888
#endif
8989

90-
#ifdef CONFIG_ENABLE_WIFI_AP
91-
#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 1
92-
#else
93-
#define CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP 0
94-
#endif
95-
9690
#ifdef CONFIG_ENABLE_ICD_SERVER
9791

9892
#ifndef CHIP_CONFIG_ICD_IDLE_MODE_DURATION_SEC

src/platform/ESP32/ConnectivityManagerImpl.h

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -139,28 +139,6 @@ class ConnectivityManagerImpl final : public ConnectivityManager,
139139
void ChangeWiFiStationState(WiFiStationState newState);
140140
static void DriveStationState(::chip::System::Layer * aLayer, void * aAppState);
141141

142-
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
143-
WiFiAPMode _GetWiFiAPMode(void);
144-
CHIP_ERROR _SetWiFiAPMode(WiFiAPMode val);
145-
bool _IsWiFiAPActive(void);
146-
void _DemandStartWiFiAP(void);
147-
void _StopOnDemandWiFiAP(void);
148-
void _MaintainOnDemandWiFiAP(void);
149-
System::Clock::Timeout _GetWiFiAPIdleTimeout(void);
150-
void _SetWiFiAPIdleTimeout(System::Clock::Timeout val);
151-
bool _IsWiFiAPApplicationControlled(void);
152-
153-
System::Clock::Timestamp mLastAPDemandTime;
154-
WiFiAPMode mWiFiAPMode;
155-
WiFiAPState mWiFiAPState;
156-
System::Clock::Timeout mWiFiAPIdleTimeout;
157-
158-
void DriveAPState(void);
159-
CHIP_ERROR ConfigureWiFiAP(void);
160-
void ChangeWiFiAPState(WiFiAPState newState);
161-
static void DriveAPState(::chip::System::Layer * aLayer, void * aAppState);
162-
#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
163-
164142
void UpdateInternetConnectivityState(void);
165143
void OnStationIPv4AddressAvailable(const ip_event_got_ip_t & got_ip);
166144
void OnStationIPv4AddressLost(void);
@@ -197,28 +175,6 @@ inline System::Clock::Timeout ConnectivityManagerImpl::_GetWiFiStationReconnectI
197175
return mWiFiStationReconnectInterval;
198176
}
199177

200-
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
201-
inline ConnectivityManager::WiFiAPMode ConnectivityManagerImpl::_GetWiFiAPMode(void)
202-
{
203-
return mWiFiAPMode;
204-
}
205-
206-
inline bool ConnectivityManagerImpl::_IsWiFiAPActive(void)
207-
{
208-
return mWiFiAPState == kWiFiAPState_Active;
209-
}
210-
211-
inline System::Clock::Timeout ConnectivityManagerImpl::_GetWiFiAPIdleTimeout(void)
212-
{
213-
return mWiFiAPIdleTimeout;
214-
}
215-
216-
inline bool ConnectivityManagerImpl::_IsWiFiAPApplicationControlled(void)
217-
{
218-
return mWiFiAPMode == kWiFiAPMode_ApplicationControlled;
219-
}
220-
#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI_AP
221-
222178
#endif // CHIP_DEVICE_CONFIG_ENABLE_WIFI
223179

224180
/**

0 commit comments

Comments
 (0)