Skip to content

Commit 90b4701

Browse files
author
Veijo Pesonen
committed
Renaming internal functions
1 parent 1a288c1 commit 90b4701

File tree

3 files changed

+46
-46
lines changed

3 files changed

+46
-46
lines changed

‎ESP8266/ESP8266.cpp

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,12 @@ bool ESP8266::startup(int mode)
171171
}
172172

173173
_smutex.lock();
174-
setTimeout(ESP8266_CONNECT_TIMEOUT);
174+
set_timeout(ESP8266_CONNECT_TIMEOUT);
175175
bool done = _parser.send("AT+CWMODE_CUR=%d", mode)
176176
&& _parser.recv("OK\n")
177177
&&_parser.send("AT+CIPMUX=1")
178178
&& _parser.recv("OK\n");
179-
setTimeout(); //Restore default
179+
set_timeout(); //Restore default
180180
_smutex.unlock();
181181

182182
return done;
@@ -185,7 +185,7 @@ bool ESP8266::startup(int mode)
185185
bool ESP8266::reset(void)
186186
{
187187
_smutex.lock();
188-
setTimeout(ESP8266_CONNECT_TIMEOUT);
188+
set_timeout(ESP8266_CONNECT_TIMEOUT);
189189

190190
for (int i = 0; i < 2; i++) {
191191
if (_parser.send("AT+RST")
@@ -196,7 +196,7 @@ bool ESP8266::reset(void)
196196
return true;
197197
}
198198
}
199-
setTimeout();
199+
set_timeout();
200200
_smutex.unlock();
201201

202202
return false;
@@ -237,7 +237,7 @@ bool ESP8266::cond_enable_tcp_passive_mode()
237237
nsapi_error_t ESP8266::connect(const char *ap, const char *passPhrase)
238238
{
239239
_smutex.lock();
240-
setTimeout(ESP8266_CONNECT_TIMEOUT);
240+
set_timeout(ESP8266_CONNECT_TIMEOUT);
241241
_connection_status = NSAPI_STATUS_CONNECTING;
242242
if(_connection_status_cb)
243243
_connection_status_cb(NSAPI_EVENT_CONNECTION_STATUS_CHANGE, _connection_status);
@@ -261,7 +261,7 @@ nsapi_error_t ESP8266::connect(const char *ap, const char *passPhrase)
261261
return ret;
262262
}
263263
}
264-
setTimeout();
264+
set_timeout();
265265
_smutex.unlock();
266266

267267
return NSAPI_ERROR_OK;
@@ -276,23 +276,23 @@ bool ESP8266::disconnect(void)
276276
return done;
277277
}
278278

279-
const char *ESP8266::getIPAddress(void)
279+
const char *ESP8266::ip_addr(void)
280280
{
281281
_smutex.lock();
282-
setTimeout(ESP8266_CONNECT_TIMEOUT);
282+
set_timeout(ESP8266_CONNECT_TIMEOUT);
283283
if (!(_parser.send("AT+CIFSR")
284284
&& _parser.recv("+CIFSR:STAIP,\"%15[^\"]\"", _ip_buffer)
285285
&& _parser.recv("OK\n"))) {
286286
_smutex.unlock();
287287
return 0;
288288
}
289-
setTimeout();
289+
set_timeout();
290290
_smutex.unlock();
291291

292292
return _ip_buffer;
293293
}
294294

295-
const char *ESP8266::getMACAddress(void)
295+
const char *ESP8266::mac_addr(void)
296296
{
297297
_smutex.lock();
298298
if (!(_parser.send("AT+CIFSR")
@@ -306,7 +306,7 @@ const char *ESP8266::getMACAddress(void)
306306
return _mac_buffer;
307307
}
308308

309-
const char *ESP8266::getGateway()
309+
const char *ESP8266::gateway()
310310
{
311311
_smutex.lock();
312312
if (!(_parser.send("AT+CIPSTA_CUR?")
@@ -320,7 +320,7 @@ const char *ESP8266::getGateway()
320320
return _gateway_buffer;
321321
}
322322

323-
const char *ESP8266::getNetmask()
323+
const char *ESP8266::netmask()
324324
{
325325
_smutex.lock();
326326
if (!(_parser.send("AT+CIPSTA_CUR?")
@@ -334,31 +334,31 @@ const char *ESP8266::getNetmask()
334334
return _netmask_buffer;
335335
}
336336

337-
int8_t ESP8266::getRSSI()
337+
int8_t ESP8266::rssi()
338338
{
339339
int8_t rssi;
340340
char bssid[18];
341341

342342
_smutex.lock();
343-
setTimeout(ESP8266_CONNECT_TIMEOUT);
343+
set_timeout(ESP8266_CONNECT_TIMEOUT);
344344
if (!(_parser.send("AT+CWJAP_CUR?")
345345
&& _parser.recv("+CWJAP_CUR:\"%*[^\"]\",\"%17[^\"]\"", bssid)
346346
&& _parser.recv("OK\n"))) {
347347
_smutex.unlock();
348348
return 0;
349349
}
350-
setTimeout();
350+
set_timeout();
351351
_smutex.unlock();
352352

353353
_smutex.lock();
354-
setTimeout(ESP8266_CONNECT_TIMEOUT);
354+
set_timeout(ESP8266_CONNECT_TIMEOUT);
355355
if (!(_parser.send("AT+CWLAP=\"\",\"%s\",", bssid)
356356
&& _parser.recv("+CWLAP:(%*d,\"%*[^\"]\",%hhd,", &rssi)
357357
&& _parser.recv("OK\n"))) {
358358
_smutex.unlock();
359359
return 0;
360360
}
361-
setTimeout();
361+
set_timeout();
362362
_smutex.unlock();
363363

364364
return rssi;
@@ -370,7 +370,7 @@ int ESP8266::scan(WiFiAccessPoint *res, unsigned limit)
370370
nsapi_wifi_ap_t ap;
371371

372372
_smutex.lock();
373-
setTimeout(ESP8266_CONNECT_TIMEOUT);
373+
set_timeout(ESP8266_CONNECT_TIMEOUT);
374374

375375
if (!_parser.send("AT+CWLAP")) {
376376
_smutex.unlock();
@@ -387,7 +387,7 @@ int ESP8266::scan(WiFiAccessPoint *res, unsigned limit)
387387
break;
388388
}
389389
}
390-
setTimeout();
390+
set_timeout();
391391
_smutex.unlock();
392392

393393
return cnt;
@@ -491,7 +491,7 @@ nsapi_error_t ESP8266::send(int id, const void *data, uint32_t amount)
491491
//May take a second try if device is busy
492492
for (unsigned i = 0; i < 2; i++) {
493493
_smutex.lock();
494-
setTimeout(ESP8266_SEND_TIMEOUT);
494+
set_timeout(ESP8266_SEND_TIMEOUT);
495495
if (_parser.send("AT+CIPSEND=%d,%lu", id, amount)
496496
&& _parser.recv(">")
497497
&& _parser.write((char*)data, (int)amount) >= 0) {
@@ -502,7 +502,7 @@ nsapi_error_t ESP8266::send(int id, const void *data, uint32_t amount)
502502
_smutex.unlock();
503503
return NSAPI_ERROR_OK;
504504
}
505-
setTimeout();
505+
set_timeout();
506506
_smutex.unlock();
507507
}
508508

@@ -566,11 +566,11 @@ void ESP8266::_packet_handler()
566566
}
567567

568568
void ESP8266::process_oob(uint32_t timeout, bool all) {
569-
setTimeout(timeout);
569+
set_timeout(timeout);
570570
// Poll for inbound packets
571571
while (_parser.process_oob() && all) {
572572
}
573-
setTimeout();
573+
set_timeout();
574574
}
575575

576576
int32_t ESP8266::_recv_tcp_passive(int id, void *data, uint32_t amount, uint32_t timeout)
@@ -666,14 +666,14 @@ int32_t ESP8266::recv_tcp(int id, void *data, uint32_t amount, uint32_t timeout)
666666
int32_t ESP8266::recv_udp(int id, void *data, uint32_t amount, uint32_t timeout)
667667
{
668668
_smutex.lock();
669-
setTimeout(timeout);
669+
set_timeout(timeout);
670670

671671
// No flow control, drain the USART receive register ASAP to avoid data overrun
672672
if (_serial_rts == NC) {
673673
process_oob(timeout, true);
674674
}
675675

676-
setTimeout();
676+
set_timeout();
677677

678678
// check if any packets are ready for us
679679
for (struct packet **p = &_packets; *p; p = &(*p)->next) {
@@ -758,7 +758,7 @@ bool ESP8266::close(int id)
758758
return false;
759759
}
760760

761-
void ESP8266::setTimeout(uint32_t timeout_ms)
761+
void ESP8266::set_timeout(uint32_t timeout_ms)
762762
{
763763
_parser.set_timeout(timeout_ms);
764764
}
@@ -868,7 +868,7 @@ void ESP8266::_connection_status_handler()
868868
}
869869
}
870870

871-
int8_t ESP8266::get_default_wifi_mode()
871+
int8_t ESP8266::default_wifi_mode()
872872
{
873873
int8_t mode;
874874

@@ -894,7 +894,7 @@ bool ESP8266::set_default_wifi_mode(const int8_t mode)
894894
return done;
895895
}
896896

897-
nsapi_connection_status_t ESP8266::get_connection_status() const
897+
nsapi_connection_status_t ESP8266::connection_status() const
898898
{
899899
return _connection_status;
900900
}

‎ESP8266/ESP8266.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -148,34 +148,34 @@ class ESP8266
148148
*
149149
* @return null-teriminated IP address or null if no IP address is assigned
150150
*/
151-
const char *getIPAddress(void);
151+
const char *ip_addr(void);
152152

153153
/**
154154
* Get the MAC address of ESP8266
155155
*
156156
* @return null-terminated MAC address or null if no MAC address is assigned
157157
*/
158-
const char *getMACAddress(void);
158+
const char *mac_addr(void);
159159

160160
/** Get the local gateway
161161
*
162162
* @return Null-terminated representation of the local gateway
163163
* or null if no network mask has been recieved
164164
*/
165-
const char *getGateway();
165+
const char *gateway();
166166

167167
/** Get the local network mask
168168
*
169169
* @return Null-terminated representation of the local network mask
170170
* or null if no network mask has been recieved
171171
*/
172-
const char *getNetmask();
172+
const char *netmask();
173173

174174
/* Return RSSI for active connection
175175
*
176176
* @return Measured RSSI
177177
*/
178-
int8_t getRSSI();
178+
int8_t rssi();
179179

180180
/** Scan for available networks
181181
*
@@ -263,7 +263,7 @@ class ESP8266
263263
*
264264
* @param timeout_ms timeout of the connection
265265
*/
266-
void setTimeout(uint32_t timeout_ms=ESP8266_MISC_TIMEOUT);
266+
void set_timeout(uint32_t timeout_ms=ESP8266_MISC_TIMEOUT);
267267

268268
/**
269269
* Checks if data is available
@@ -305,18 +305,18 @@ class ESP8266
305305
*
306306
* return Station, SoftAP or SoftAP+Station - 0 on failure
307307
*/
308-
int8_t get_default_wifi_mode();
308+
int8_t default_wifi_mode();
309309

310310
/**
311-
* Write default Wifi mode to flash
311+
* Default Wifi mode written to flash only if changes
312312
*/
313313
bool set_default_wifi_mode(const int8_t mode);
314314

315315
/** Get the connection status
316316
*
317317
* @return The connection status according to ConnectionStatusType
318318
*/
319-
nsapi_connection_status_t get_connection_status() const;
319+
nsapi_connection_status_t connection_status() const;
320320

321321
/**
322322
* Start board's and ESP8266's UART flow control

‎ESP8266Interface.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ ESP8266Interface::ESP8266Interface()
5050
ap_sec = NSAPI_SECURITY_UNKNOWN;
5151

5252
_esp.sigio(this, &ESP8266Interface::event);
53-
_esp.setTimeout();
53+
_esp.set_timeout();
5454
}
5555

5656
// ESP8266Interface implementation
@@ -67,7 +67,7 @@ ESP8266Interface::ESP8266Interface(PinName tx, PinName rx, bool debug, PinName r
6767
ap_sec = NSAPI_SECURITY_UNKNOWN;
6868

6969
_esp.sigio(this, &ESP8266Interface::event);
70-
_esp.setTimeout();
70+
_esp.set_timeout();
7171
}
7272

7373
int ESP8266Interface::connect(const char *ssid, const char *pass, nsapi_security_t security,
@@ -189,7 +189,7 @@ const char *ESP8266Interface::get_ip_address()
189189
return NULL;
190190
}
191191

192-
const char *ip_buff = _esp.getIPAddress();
192+
const char *ip_buff = _esp.ip_addr();
193193
if(!ip_buff || std::strcmp(ip_buff, "0.0.0.0") == 0) {
194194
return NULL;
195195
}
@@ -199,22 +199,22 @@ const char *ESP8266Interface::get_ip_address()
199199

200200
const char *ESP8266Interface::get_mac_address()
201201
{
202-
return _esp.getMACAddress();
202+
return _esp.mac_addr();
203203
}
204204

205205
const char *ESP8266Interface::get_gateway()
206206
{
207-
return _started ? _esp.getGateway() : NULL;
207+
return _started ? _esp.gateway() : NULL;
208208
}
209209

210210
const char *ESP8266Interface::get_netmask()
211211
{
212-
return _started ? _esp.getNetmask() : NULL;
212+
return _started ? _esp.netmask() : NULL;
213213
}
214214

215215
int8_t ESP8266Interface::get_rssi()
216216
{
217-
return _started ? _esp.getRSSI() : 0;
217+
return _started ? _esp.rssi() : 0;
218218
}
219219

220220
int ESP8266Interface::scan(WiFiAccessPoint *res, unsigned count)
@@ -256,7 +256,7 @@ bool ESP8266Interface::_disable_default_softap()
256256
{
257257
static int disabled = false;
258258

259-
if (disabled || _esp.get_default_wifi_mode() == ESP8266::WIFIMODE_STATION) {
259+
if (disabled || _esp.default_wifi_mode() == ESP8266::WIFIMODE_STATION) {
260260
disabled = true;
261261
return true;
262262
}
@@ -586,7 +586,7 @@ void ESP8266Interface::attach(mbed::Callback<void(nsapi_event_t, intptr_t)> stat
586586

587587
nsapi_connection_status_t ESP8266Interface::get_connection_status() const
588588
{
589-
return _esp.get_connection_status();
589+
return _esp.connection_status();
590590
}
591591

592592
#if MBED_CONF_ESP8266_PROVIDE_DEFAULT

0 commit comments

Comments
 (0)