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

ESP8266: provides blocking/non-blocking connect 

Implements NetworkInterface::set_blocking() and implements the
functionality to distinguish between the two in connect()
pull/9421/head
Veijo Pesonen 2019-01-21 14:37:19 +02:00
parent 58c1a88348
commit c4d96e6309
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/wifi/esp8266-driver/ESP8266Interface.cpp
View File

@ -55,6 +55,8 @@ ESP8266Interface::ESP8266Interface()
: _esp(MBED_CONF_ESP8266_TX, MBED_CONF_ESP8266_RX, MBED_CONF_ESP8266_DEBUG, MBED_CONF_ESP8266_RTS, MBED_CONF_ESP8266_CTS),
_rst_pin(MBED_CONF_ESP8266_RST), // Notice that Pin7 CH_EN cannot be left floating if used as reset
_ap_sec(NSAPI_SECURITY_UNKNOWN),
_if_blocking(true),
_if_connected(_cmutex),
_initialized(false),
_conn_stat(NSAPI_STATUS_DISCONNECTED),
_conn_stat_cb(NULL),
@ -84,6 +86,8 @@ ESP8266Interface::ESP8266Interface(PinName tx, PinName rx, bool debug, PinName r
: _esp(tx, rx, debug, rts, cts),
_rst_pin(rst),
_ap_sec(NSAPI_SECURITY_UNKNOWN),
_if_blocking(true),
_if_connected(_cmutex),
_initialized(false),
_conn_stat(NSAPI_STATUS_DISCONNECTED),
_conn_stat_cb(NULL),
@ -194,6 +198,7 @@ void ESP8266Interface::_connect_async()
}
} else {
_connect_event_id = 0;
_if_connected.notify_all();
}
_cmutex.unlock();
}
@ -229,14 +234,19 @@ int ESP8266Interface::connect()
}
_cmutex.lock();
MBED_ASSERT(!_connect_event_id);
MBED_ASSERT(!_connect_event_id);
_connect_event_id = _global_event_queue->call(callback(this, &ESP8266Interface::_connect_async));
if (!_connect_event_id) {
MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_DRIVER, MBED_ERROR_CODE_ENOMEM), \
"connect(): unable to add event to queue");
}
while (_if_blocking && (_conn_status_to_error() != NSAPI_ERROR_IS_CONNECTED)) {
_if_connected.wait();
}
_cmutex.unlock();
return NSAPI_ERROR_OK;
@ -795,4 +805,12 @@ nsapi_error_t ESP8266Interface::_conn_status_to_error()
return ret;
}
nsapi_error_t ESP8266Interface::set_blocking(bool blocking)
{
_if_blocking = blocking;
return NSAPI_ERROR_OK;
}
#endif

11
components/wifi/esp8266-driver/ESP8266Interface.h
View File

@ -29,6 +29,7 @@
#include "features/netsocket/WiFiAccessPoint.h"
#include "features/netsocket/WiFiInterface.h"
#include "platform/Callback.h"
#include "rtos/ConditionVariable.h"
#include "rtos/Mutex.h"
#define ESP8266_SOCKET_COUNT 5
@ -317,6 +318,13 @@ protected:
return this;
}
/** Set blocking status of connect() which by default should be blocking.
*
* @param blocking Use true to make connect() blocking.
* @return NSAPI_ERROR_OK on success, negative error code on failure.
*/
virtual nsapi_error_t set_blocking(bool blocking);
private:
// AT layer
ESP8266 _esp;
@ -342,6 +350,9 @@ private:
char ap_pass[ESP8266_PASSPHRASE_MAX_LENGTH + 1]; /* The longest possible passphrase; +1 for the \0 */
nsapi_security_t _ap_sec;
bool _if_blocking; // NetworkInterface, blocking or not
rtos::ConditionVariable _if_connected;
// connect status reporting
nsapi_error_t _conn_status_to_error();