Skip to content

Commit a884c7c

Browse files
authored
Merge pull request #11302 from desmond-blue/feature-config-esp8266-baud-rate
Enable json overriding ESP8266 default baud rate
2 parents a5af86d + 77d403b commit a884c7c

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

components/wifi/esp8266-driver/ESP8266/ESP8266.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
#define TRACE_GROUP "ESPA" // ESP8266 AT layer
3535

36-
#define ESP8266_DEFAULT_BAUD_RATE 115200
3736
#define ESP8266_ALL_SOCKET_IDS -1
3837

3938
using namespace mbed;
@@ -43,7 +42,7 @@ ESP8266::ESP8266(PinName tx, PinName rx, bool debug, PinName rts, PinName cts)
4342
_at_v(-1, -1, -1),
4443
_tcp_passive(false),
4544
_callback(0),
46-
_serial(tx, rx, ESP8266_DEFAULT_BAUD_RATE),
45+
_serial(tx, rx, MBED_CONF_ESP8266_SERIAL_BAUDRATE),
4746
_serial_rts(rts),
4847
_serial_cts(cts),
4948
_parser(&_serial),
@@ -62,7 +61,7 @@ ESP8266::ESP8266(PinName tx, PinName rx, bool debug, PinName rts, PinName cts)
6261
_reset_done(false),
6362
_conn_status(NSAPI_STATUS_DISCONNECTED)
6463
{
65-
_serial.set_baud(ESP8266_DEFAULT_BAUD_RATE);
64+
_serial.set_baud(MBED_CONF_ESP8266_SERIAL_BAUDRATE);
6665
_parser.debug_on(debug);
6766
_parser.set_delimiter("\r\n");
6867
_parser.oob("+IPD", callback(this, &ESP8266::_oob_packet_hdlr));
@@ -185,7 +184,7 @@ bool ESP8266::stop_uart_hw_flow_ctrl(void)
185184
_serial.set_flow_control(SerialBase::Disabled, _serial_rts, _serial_cts);
186185

187186
// Stop ESP8266's flow control
188-
done = _parser.send("AT+UART_CUR=%u,8,1,0,0", ESP8266_DEFAULT_BAUD_RATE)
187+
done = _parser.send("AT+UART_CUR=%u,8,1,0,0", MBED_CONF_ESP8266_SERIAL_BAUDRATE)
189188
&& _parser.recv("OK\n");
190189
}
191190

@@ -201,7 +200,7 @@ bool ESP8266::start_uart_hw_flow_ctrl(void)
201200
_smutex.lock();
202201
if (_serial_rts != NC && _serial_cts != NC) {
203202
// Start ESP8266's flow control
204-
done = _parser.send("AT+UART_CUR=%u,8,1,0,3", ESP8266_DEFAULT_BAUD_RATE)
203+
done = _parser.send("AT+UART_CUR=%u,8,1,0,3", MBED_CONF_ESP8266_SERIAL_BAUDRATE)
205204
&& _parser.recv("OK\n");
206205

207206
if (done) {
@@ -213,12 +212,12 @@ bool ESP8266::start_uart_hw_flow_ctrl(void)
213212
_serial.set_flow_control(SerialBase::RTS, _serial_rts, NC);
214213

215214
// Enable ESP8266's CTS pin
216-
done = _parser.send("AT+UART_CUR=%u,8,1,0,2", ESP8266_DEFAULT_BAUD_RATE)
215+
done = _parser.send("AT+UART_CUR=%u,8,1,0,2", MBED_CONF_ESP8266_SERIAL_BAUDRATE)
217216
&& _parser.recv("OK\n");
218217

219218
} else if (_serial_cts != NC) {
220219
// Enable ESP8266's RTS pin
221-
done = _parser.send("AT+UART_CUR=%u,8,1,0,1", ESP8266_DEFAULT_BAUD_RATE)
220+
done = _parser.send("AT+UART_CUR=%u,8,1,0,1", MBED_CONF_ESP8266_SERIAL_BAUDRATE)
222221
&& _parser.recv("OK\n");
223222

224223
if (done) {

components/wifi/esp8266-driver/mbed_lib.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
"help": "CTS pin for serial connection, defaults to Not Connected",
1818
"value": null
1919
},
20+
"serial-baudrate": {
21+
"help": "Serial baudrate for ESP8266, defaults to 115200",
22+
"value": 115200
23+
},
2024
"rst": {
2125
"help": "RESET pin for the modem, defaults to Not Connected",
2226
"value": null

0 commit comments

Comments
 (0)