NotificationsYou must be signed in to change notification settings
Fork0
Star1

Commit5049a93

authored

refactor(wifi): Refactor WiFi sleep modes (espressif#12067)

1 parentb55215c commit5049a93Copy full SHA for 5049a93

File tree

2 files changed

+18

-15

lines changed

libraries/WiFi/src
- WiFiGeneric.cpp
- WiFiGeneric.h

2 files changed

+18

-15

lines changed

`‎libraries/WiFi/src/WiFiGeneric.cpp‎`

Lines changed: 18 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -375,7 +375,6 @@ static bool espWiFiStop() {`
`375`	`375`
`376`	`376`	`bool WiFiGenericClass::_persistent =true;`
`377`	`377`	`bool WiFiGenericClass::_long_range =false;`
`378`		`-wifi_mode_t WiFiGenericClass::_forceSleepLastMode = WIFI_MODE_NULL;`
`379`	`378`	`#if CONFIG_IDF_TARGET_ESP32S2`
`380`	`379`	`wifi_ps_type_t WiFiGenericClass::_sleepEnabled = WIFI_PS_NONE;`
`381`	`380`	`#else`
`@@ -666,7 +665,7 @@ bool WiFiGenericClass::enableAP(bool enable) {`
`666`	`665`	`}`
`667`	`666`
`668`	`667`	`/**`
`669`		`- *control modem sleep when only in STA mode`
	`668`	`+ *Enable or disable WiFi modem power save mode`
`670`	`669`	`* @param enable bool`
`671`	`670`	`* @return ok`
`672`	`671`	`*/`
`@@ -675,28 +674,33 @@ bool WiFiGenericClass::setSleep(bool enabled) {`
`675`	`674`	`}`
`676`	`675`
`677`	`676`	`/**`
`678`		`- *controlmodemsleep when only in STA mode`
	`677`	`+ *Set WiFimodempower save mode`
`679`	`678`	`* @param mode wifi_ps_type_t`
`680`	`679`	`* @return ok`
`681`	`680`	`*/`
`682`	`681`	`boolWiFiGenericClass::setSleep(wifi_ps_type_t sleepType) {`
`683`		`-if (sleepType != _sleepEnabled) {`
	`682`	`+if (sleepType > WIFI_PS_MAX_MODEM) {`
	`683`	`+returnfalse;`
	`684`	`+ }`
	`685`	`+`
	`686`	`+if (!WiFi.STA.started()) {`
`684`	`687`	`_sleepEnabled = sleepType;`
`685`		`-if (WiFi.STA.started()) {`
`686`		`-esp_err_t err =esp_wifi_set_ps(_sleepEnabled);`
`687`		`-if (err != ESP_OK) {`
`688`		`-log_e("esp_wifi_set_ps failed!: 0x%x: %s", err,esp_err_to_name(err));`
`689`		`-returnfalse;`
`690`		`- }`
`691`		`- }`
`692`	`688`	`returntrue;`
`693`	`689`	`}`
`694`		`-returnfalse;`
	`690`	`+`
	`691`	`+esp_err_t err =esp_wifi_set_ps(_sleepEnabled);`
	`692`	`+if (err != ESP_OK) {`
	`693`	`+log_e("esp_wifi_set_ps failed!: 0x%x: %s", err,esp_err_to_name(err));`
	`694`	`+returnfalse;`
	`695`	`+ }`
	`696`	`+`
	`697`	`+ _sleepEnabled = sleepType;`
	`698`	`+returntrue;`
`695`	`699`	`}`
`696`	`700`
`697`	`701`	`/**`
`698`		`- *getmodemsleep enabled`
`699`		`- * @returntrue if modem sleep is enabled`
	`702`	`+ *Get WiFimodempower save mode`
	`703`	`+ * @returnwifi_ps_type_t`
`700`	`704`	`*/`
`701`	`705`	`wifi_ps_type_tWiFiGenericClass::getSleep() {`
`702`	`706`	`return _sleepEnabled;`

`‎libraries/WiFi/src/WiFiGeneric.h‎`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,6 @@ class WiFiGenericClass {`
`149`	`149`	`protected:`
`150`	`150`	`staticbool _persistent;`
`151`	`151`	`staticbool _long_range;`
`152`		`-staticwifi_mode_t _forceSleepLastMode;`
`153`	`152`	`staticwifi_ps_type_t _sleepEnabled;`
`154`	`153`	`staticbool _wifiUseStaticBuffers;`
`155`	`154`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit5049a93

File tree

2 files changed

2 files changed

`‎libraries/WiFi/src/WiFiGeneric.cpp‎`

`‎libraries/WiFi/src/WiFiGeneric.h‎`

0 commit comments