Skip to content

Block not only uart interrupts #6587

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Block not only uart interrupts #6587

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
94cab96
Merge pull request #1 from esp8266/master
saloid Oct 2, 2019
51be25b
ESP8266wifista.cpp uart interrupts on/off replaced
saloid Oct 2, 2019
a3699ae
Update ESP8266WiFiAP.cpp
saloid Oct 2, 2019
c912fe1
ESP8266WifiGeneric uart interrupts on/off replaced
saloid Oct 2, 2019
6598b20
Merge branch 'master' into block_not_only_uart_interrupts
saloid Oct 13, 2019
c21f4c0
Merge branch 'master' into block_not_only_uart_interrupts
saloid Oct 30, 2019
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
8 changes: 4 additions & 4 deletions libraries/ESP8266WiFi/src/ESP8266WiFiAP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,13 @@ bool ESP8266WiFiAPClass::softAP(const char* ssid, const char* passphrase, int ch

if(!softap_config_equal(conf, conf_compare)) {

ETS_UART_INTR_DISABLE();
ETS_INTR_LOCK();
if(WiFi._persistent) {
ret = wifi_softap_set_config(&conf);
} else {
ret = wifi_softap_set_config_current(&conf);
}
ETS_UART_INTR_ENABLE();
ETS_INTR_UNLOCK();

if(!ret) {
DEBUG_WIFI("[AP] set_config failed!\n");
Expand Down Expand Up @@ -290,13 +290,13 @@ bool ESP8266WiFiAPClass::softAPdisconnect(bool wifioff) {
*conf.ssid = 0;
*conf.password = 0;
conf.authmode = AUTH_OPEN;
ETS_UART_INTR_DISABLE();
ETS_INTR_LOCK();
if(WiFi._persistent) {
ret = wifi_softap_set_config(&conf);
} else {
ret = wifi_softap_set_config_current(&conf);
}
ETS_UART_INTR_ENABLE();
ETS_INTR_UNLOCK();

if(!ret) {
DEBUG_WIFI("[APdisconnect] set_config failed!\n");
Expand Down
4 changes: 2 additions & 2 deletions libraries/ESP8266WiFi/src/ESP8266WiFiGeneric.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,13 +426,13 @@ bool ESP8266WiFiGenericClass::mode(WiFiMode_t m, WiFiState* state) {
}

bool ret = false;
ETS_UART_INTR_DISABLE();
ETS_INTR_LOCK();
if(_persistent) {
ret = wifi_set_opmode(m);
} else {
ret = wifi_set_opmode_current(m);
}
ETS_UART_INTR_ENABLE();
ETS_INTR_UNLOCK();

return ret;
}
Expand Down
20 changes: 10 additions & 10 deletions libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,22 +183,22 @@ wl_status_t ESP8266WiFiSTAClass::begin(const char* ssid, const char *passphrase,
DEBUGV("sta config unchanged");
}
else {
ETS_UART_INTR_DISABLE();
ETS_INTR_LOCK();

if(WiFi._persistent) {
wifi_station_set_config(&conf);
} else {
wifi_station_set_config_current(&conf);
}

ETS_UART_INTR_ENABLE();
ETS_INTR_UNLOCK();
}

ETS_UART_INTR_DISABLE();
ETS_INTR_LOCK();
if(connect) {
wifi_station_connect();
}
ETS_UART_INTR_ENABLE();
ETS_INTR_UNLOCK();

if(channel > 0 && channel <= 13) {
wifi_set_channel(channel);
Expand Down Expand Up @@ -230,9 +230,9 @@ wl_status_t ESP8266WiFiSTAClass::begin() {
return WL_CONNECT_FAILED;
}

ETS_UART_INTR_DISABLE();
ETS_INTR_LOCK();
wifi_station_connect();
ETS_UART_INTR_ENABLE();
ETS_INTR_UNLOCK();

if(!_useStaticIp) {
wifi_station_dhcpc_start();
Expand Down Expand Up @@ -380,14 +380,14 @@ bool ESP8266WiFiSTAClass::disconnect(bool wifioff) {
else
ret = true;

ETS_UART_INTR_DISABLE();
ETS_INTR_LOCK();
if(WiFi._persistent) {
wifi_station_set_config(&conf);
} else {
wifi_station_set_config_current(&conf);
}

ETS_UART_INTR_ENABLE();
ETS_INTR_UNLOCK();

if(wifioff) {
WiFi.enableSTA(false);
Expand All @@ -413,9 +413,9 @@ bool ESP8266WiFiSTAClass::isConnected() {
*/
bool ESP8266WiFiSTAClass::setAutoConnect(bool autoConnect) {
bool ret;
ETS_UART_INTR_DISABLE();
ETS_INTR_LOCK();
ret = wifi_station_set_auto_connect(autoConnect);
ETS_UART_INTR_ENABLE();
ETS_INTR_UNLOCK();
return ret;
}

Expand Down