ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9893 from VeijoPesonen/wifi_astyle_unignore 

ESP8266: astyle fixes
pull/9914/head
Martin Kojtal 2019-03-14 09:38:49 +01:00 committed by GitHub
parent b21211dd9f c9eaa07236
commit 17f8bc1088
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.astyleignore
View File

@ -21,7 +21,6 @@ rtos/TARGET_CORTEX/rtx5
TESTS/mbed_hal/trng/pithy TESTS/mbed_hal/trng/pithy
targets targets
components/802.15.4_RF components/802.15.4_RF
components/wifi
components/TARGET_PSA/TARGET_TFM components/TARGET_PSA/TARGET_TFM
tools tools
components/TARGET_PSA/TESTS components/TARGET_PSA/TESTS

8
components/wifi/esp8266-driver/ESP8266/ESP8266.cpp
View File

@ -100,7 +100,7 @@ bool ESP8266::at_available()
_smutex.lock(); _smutex.lock();
// Might take a while to respond after HW reset // Might take a while to respond after HW reset
for(int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {
ready = _parser.send("AT") ready = _parser.send("AT")
&& _parser.recv("OK\n"); && _parser.recv("OK\n");
if (ready) { if (ready) {
@ -606,7 +606,7 @@ nsapi_error_t ESP8266::send(int id, const void *data, uint32_t amount)
goto END; goto END;
} }
if(!_parser.recv(">")) { if (!_parser.recv(">")) {
tr_debug("ESP8266::send(): didn't get \">\""); tr_debug("ESP8266::send(): didn't get \">\"");
ret = NSAPI_ERROR_WOULD_BLOCK; ret = NSAPI_ERROR_WOULD_BLOCK;
goto END; goto END;
@ -657,7 +657,7 @@ void ESP8266::_oob_packet_hdlr()
return; return;
} }
if(_tcp_passive && _sock_i[id].open == true && _sock_i[id].proto == NSAPI_TCP) { if (_tcp_passive && _sock_i[id].open == true && _sock_i[id].proto == NSAPI_TCP) {
if (_parser.recv("%d\n", &amount)) { if (_parser.recv("%d\n", &amount)) {
_sock_i[id].tcp_data_avbl = amount; _sock_i[id].tcp_data_avbl = amount;
@ -726,7 +726,7 @@ int32_t ESP8266::_recv_tcp_passive(int id, void *data, uint32_t amount, uint32_t
_process_oob(timeout, true); _process_oob(timeout, true);
if (_sock_i[id].tcp_data_avbl != 0) { if (_sock_i[id].tcp_data_avbl != 0) {
_sock_i[id].tcp_data = (char*)data; _sock_i[id].tcp_data = (char *)data;
_sock_i[id].tcp_data_rcvd = NSAPI_ERROR_WOULD_BLOCK; _sock_i[id].tcp_data_rcvd = NSAPI_ERROR_WOULD_BLOCK;
_sock_active_id = id; _sock_active_id = id;