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 #11302 from desmond-blue/feature-config-esp8266-baud-rate 

Enable json overriding ESP8266 default baud rate
pull/11235/head
Martin Kojtal 2019-08-29 08:37:50 +02:00 committed by GitHub
parent a5af86dcf0 77d403b20a
commit a884c7c090
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,6 @@
#define TRACE_GROUP "ESPA" // ESP8266 AT layer #define TRACE_GROUP "ESPA" // ESP8266 AT layer
#define ESP8266_DEFAULT_BAUD_RATE 115200
#define ESP8266_ALL_SOCKET_IDS -1 #define ESP8266_ALL_SOCKET_IDS -1
using namespace mbed; using namespace mbed;
@ -43,7 +42,7 @@ ESP8266::ESP8266(PinName tx, PinName rx, bool debug, PinName rts, PinName cts)
_at_v(-1, -1, -1), _at_v(-1, -1, -1),
_tcp_passive(false), _tcp_passive(false),
_callback(0), _callback(0),
_serial(tx, rx, ESP8266_DEFAULT_BAUD_RATE), _serial(tx, rx, MBED_CONF_ESP8266_SERIAL_BAUDRATE),
_serial_rts(rts), _serial_rts(rts),
_serial_cts(cts), _serial_cts(cts),
_parser(&_serial), _parser(&_serial),
@ -62,7 +61,7 @@ ESP8266::ESP8266(PinName tx, PinName rx, bool debug, PinName rts, PinName cts)
_reset_done(false), _reset_done(false),
_conn_status(NSAPI_STATUS_DISCONNECTED) _conn_status(NSAPI_STATUS_DISCONNECTED)
{ {
_serial.set_baud(ESP8266_DEFAULT_BAUD_RATE); _serial.set_baud(MBED_CONF_ESP8266_SERIAL_BAUDRATE);
_parser.debug_on(debug); _parser.debug_on(debug);
_parser.set_delimiter("\r\n"); _parser.set_delimiter("\r\n");
_parser.oob("+IPD", callback(this, &ESP8266::_oob_packet_hdlr)); _parser.oob("+IPD", callback(this, &ESP8266::_oob_packet_hdlr));
@ -185,7 +184,7 @@ bool ESP8266::stop_uart_hw_flow_ctrl(void)
_serial.set_flow_control(SerialBase::Disabled, _serial_rts, _serial_cts); _serial.set_flow_control(SerialBase::Disabled, _serial_rts, _serial_cts);
// Stop ESP8266's flow control // Stop ESP8266's flow control
done = _parser.send("AT+UART_CUR=%u,8,1,0,0", ESP8266_DEFAULT_BAUD_RATE) done = _parser.send("AT+UART_CUR=%u,8,1,0,0", MBED_CONF_ESP8266_SERIAL_BAUDRATE)
&& _parser.recv("OK\n"); && _parser.recv("OK\n");
} }
@ -201,7 +200,7 @@ bool ESP8266::start_uart_hw_flow_ctrl(void)
_smutex.lock(); _smutex.lock();
if (_serial_rts != NC && _serial_cts != NC) { if (_serial_rts != NC && _serial_cts != NC) {
// Start ESP8266's flow control // Start ESP8266's flow control
done = _parser.send("AT+UART_CUR=%u,8,1,0,3", ESP8266_DEFAULT_BAUD_RATE) done = _parser.send("AT+UART_CUR=%u,8,1,0,3", MBED_CONF_ESP8266_SERIAL_BAUDRATE)
&& _parser.recv("OK\n"); && _parser.recv("OK\n");
if (done) { if (done) {
@ -213,12 +212,12 @@ bool ESP8266::start_uart_hw_flow_ctrl(void)
_serial.set_flow_control(SerialBase::RTS, _serial_rts, NC); _serial.set_flow_control(SerialBase::RTS, _serial_rts, NC);
// Enable ESP8266's CTS pin // Enable ESP8266's CTS pin
done = _parser.send("AT+UART_CUR=%u,8,1,0,2", ESP8266_DEFAULT_BAUD_RATE) done = _parser.send("AT+UART_CUR=%u,8,1,0,2", MBED_CONF_ESP8266_SERIAL_BAUDRATE)
&& _parser.recv("OK\n"); && _parser.recv("OK\n");
} else if (_serial_cts != NC) { } else if (_serial_cts != NC) {
// Enable ESP8266's RTS pin // Enable ESP8266's RTS pin
done = _parser.send("AT+UART_CUR=%u,8,1,0,1", ESP8266_DEFAULT_BAUD_RATE) done = _parser.send("AT+UART_CUR=%u,8,1,0,1", MBED_CONF_ESP8266_SERIAL_BAUDRATE)
&& _parser.recv("OK\n"); && _parser.recv("OK\n");
if (done) { if (done) {

4
components/wifi/esp8266-driver/mbed_lib.json
View File

@ -17,6 +17,10 @@
"help": "CTS pin for serial connection, defaults to Not Connected", "help": "CTS pin for serial connection, defaults to Not Connected",
"value": null "value": null
}, },
"serial-baudrate": {
"help": "Serial baudrate for ESP8266, defaults to 115200",
"value": 115200
},
"rst": { "rst": {
"help": "RESET pin for the modem, defaults to Not Connected", "help": "RESET pin for the modem, defaults to Not Connected",
"value": null "value": null