Skip to content

Commit 8cbf43f

Browse files
kounchkounch
authored
Merge pull request #1 from mikebutrimov/master
add support of setting static ip address via method setStaticIP
2 parents fed9046 + 41c5e8c commit 8cbf43f

File tree

2 files changed

+249
-217
lines changed

2 files changed

+249
-217
lines changed

‎ESP8266.cpp

Lines changed: 49 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/**
22
* @file ESP8266.cpp
3-
* @brief The implementation of class ESP8266.
4-
* @author Wu Pengfei<[email protected]>
3+
* @brief The implementation of class ESP8266.
4+
* @author Wu Pengfei<[email protected]>
55
* @date 2015.02
6-
*
6+
*
77
* @par Copyright:
88
* Copyright (c) 2015 ITEAD Intelligent Systems Co., Ltd. \n\n
99
* This program is free software; you can redistribute it and/or
@@ -147,6 +147,10 @@ bool ESP8266::joinAP(String ssid, String pwd)
147147
return sATCWJAP(ssid, pwd);
148148
}
149149

150+
bool ESP8266::setStaticIp(String ip, String gateway, String mask){
151+
return sATCIPSTACUR(ip, gateway, mask);
152+
}
153+
150154
bool ESP8266::enableClientDHCP(uint8_t mode, boolean enabled)
151155
{
152156
return sATCWDHCP(mode, enabled);
@@ -267,7 +271,7 @@ bool ESP8266::enableMDNS(String hostname, String servername, uint32_t port)
267271
{
268272
return sATCMDNS(true, hostname, servername, port);
269273
}
270-
274+
271275
bool ESP8266::disableMDNS(void)
272276
{
273277
return sATCMDNS(false, "", "", 0);
@@ -321,25 +325,25 @@ uint32_t ESP8266::recvPkg(uint8_t *buffer, uint32_t buffer_size, uint32_t *data_
321325
uint32_t ret;
322326
unsigned long start;
323327
uint32_t i;
324-
328+
325329
if (buffer == NULL) {
326330
return 0;
327331
}
328-
332+
329333
start = millis();
330334
while (millis() - start < timeout) {
331335
if(m_puart->available() > 0) {
332336
a = m_puart->read();
333337
data += a;
334338
}
335-
339+
336340
index_PIPDcomma = data.indexOf("+IPD,");
337341
if (index_PIPDcomma != -1) {
338342
index_colon = data.indexOf(':', index_PIPDcomma + 5);
339343
if (index_colon != -1) {
340344
index_comma = data.indexOf(',', index_PIPDcomma + 5);
341345
/* +IPD,id,len:data */
342-
if (index_comma != -1 && index_comma < index_colon) {
346+
if (index_comma != -1 && index_comma < index_colon) {
343347
id = data.substring(index_PIPDcomma + 5, index_comma).toInt();
344348
if (id < 0 || id > 4) {
345349
return 0;
@@ -359,7 +363,7 @@ uint32_t ESP8266::recvPkg(uint8_t *buffer, uint32_t buffer_size, uint32_t *data_
359363
}
360364
}
361365
}
362-
366+
363367
if (has_data) {
364368
i = 0;
365369
ret = len > buffer_size ? buffer_size : len;
@@ -372,7 +376,7 @@ uint32_t ESP8266::recvPkg(uint8_t *buffer, uint32_t buffer_size, uint32_t *data_
372376
if (i == ret) {
373377
rx_empty();
374378
if (data_len) {
375-
*data_len = len;
379+
*data_len = len;
376380
}
377381
if (index_comma != -1 && coming_mux_id) {
378382
*coming_mux_id = id;
@@ -384,7 +388,7 @@ uint32_t ESP8266::recvPkg(uint8_t *buffer, uint32_t buffer_size, uint32_t *data_
384388
return 0;
385389
}
386390

387-
void ESP8266::rx_empty(void)
391+
void ESP8266::rx_empty(void)
388392
{
389393
while(m_puart->available() > 0) {
390394
m_puart->read();
@@ -404,7 +408,7 @@ String ESP8266::recvString(String target, uint32_t timeout)
404408
}
405409
if (data.indexOf(target) != -1) {
406410
break;
407-
}
411+
}
408412
}
409413
return data;
410414
}
@@ -485,7 +489,7 @@ bool ESP8266::eAT(void)
485489
return recvFind("OK");
486490
}
487491

488-
bool ESP8266::eATRST(void)
492+
bool ESP8266::eATRST(void)
489493
{
490494
rx_empty();
491495
m_puart->println("AT+RST");
@@ -496,10 +500,10 @@ bool ESP8266::eATGMR(String &version)
496500
{
497501
rx_empty();
498502
m_puart->println("AT+GMR");
499-
return recvFindAndFilter("OK", "\r\r\n", "\r\n\r\nOK", version);
503+
return recvFindAndFilter("OK", "\r\r\n", "\r\n\r\nOK", version);
500504
}
501505

502-
bool ESP8266::qATCWMODE(uint8_t *mode)
506+
bool ESP8266::qATCWMODE(uint8_t *mode)
503507
{
504508
String str_mode;
505509
bool ret;
@@ -508,7 +512,7 @@ bool ESP8266::qATCWMODE(uint8_t *mode)
508512
}
509513
rx_empty();
510514
m_puart->println("AT+CWMODE?");
511-
ret = recvFindAndFilter("OK", "+CWMODE:", "\r\n\r\nOK", str_mode);
515+
ret = recvFindAndFilter("OK", "+CWMODE:", "\r\n\r\nOK", str_mode);
512516
if (ret) {
513517
*mode = (uint8_t)str_mode.toInt();
514518
return true;
@@ -523,7 +527,7 @@ bool ESP8266::sATCWMODE(uint8_t mode)
523527
rx_empty();
524528
m_puart->print("AT+CWMODE=");
525529
m_puart->println(mode);
526-
530+
527531
data = recvString("OK", "no change");
528532
if (data.indexOf("OK") != -1 || data.indexOf("no change") != -1) {
529533
return true;
@@ -540,7 +544,25 @@ bool ESP8266::sATCWJAP(String ssid, String pwd)
540544
m_puart->print("\",\"");
541545
m_puart->print(pwd);
542546
m_puart->println("\"");
543-
547+
548+
data = recvString("OK", "FAIL", 10000);
549+
if (data.indexOf("OK") != -1) {
550+
return true;
551+
}
552+
return false;
553+
}
554+
555+
bool ESP8266::sATCIPSTACUR(String ip, String gateway, String mask)
556+
{
557+
String data;
558+
rx_empty();
559+
m_puart->print("AT+CIPSTA_CUR=\"");
560+
m_puart->print(ip);
561+
m_puart->print("\",\"");
562+
m_puart->print(gateway);
563+
m_puart->print("\",\"");
564+
m_puart->print(mask);
565+
m_puart->println("\"");
544566
data = recvString("OK", "FAIL", 10000);
545567
if (data.indexOf("OK") != -1) {
546568
return true;
@@ -554,15 +576,15 @@ bool ESP8266::sATCWDHCP(uint8_t mode, boolean enabled)
554576
if (enabled) {
555577
strEn = "1";
556578
}
557-
558-
579+
580+
559581
String data;
560582
rx_empty();
561583
m_puart->print("AT+CWDHCP=");
562584
m_puart->print(strEn);
563585
m_puart->print(",");
564586
m_puart->println(mode);
565-
587+
566588
data = recvString("OK", "FAIL", 10000);
567589
if (data.indexOf("OK") != -1) {
568590
return true;
@@ -598,7 +620,7 @@ bool ESP8266::sATCWSAP(String ssid, String pwd, uint8_t chl, uint8_t ecn)
598620
m_puart->print(chl);
599621
m_puart->print(",");
600622
m_puart->println(ecn);
601-
623+
602624
data = recvString("OK", "ERROR", 5000);
603625
if (data.indexOf("OK") != -1) {
604626
return true;
@@ -631,7 +653,7 @@ bool ESP8266::sATCIPSTARTSingle(String type, String addr, uint32_t port)
631653
m_puart->print(addr);
632654
m_puart->print("\",");
633655
m_puart->println(port);
634-
656+
635657
data = recvString("OK", "ERROR", "ALREADY CONNECT", 10000);
636658
if (data.indexOf("OK") != -1 || data.indexOf("ALREADY CONNECT") != -1) {
637659
return true;
@@ -650,7 +672,7 @@ bool ESP8266::sATCIPSTARTMultiple(uint8_t mux_id, String type, String addr, uint
650672
m_puart->print(addr);
651673
m_puart->print("\",");
652674
m_puart->println(port);
653-
675+
654676
data = recvString("OK", "ERROR", "ALREADY CONNECT", 10000);
655677
if (data.indexOf("OK") != -1 || data.indexOf("ALREADY CONNECT") != -1) {
656678
return true;
@@ -693,7 +715,7 @@ bool ESP8266::sATCIPCLOSEMulitple(uint8_t mux_id)
693715
rx_empty();
694716
m_puart->print("AT+CIPCLOSE=");
695717
m_puart->println(mux_id);
696-
718+
697719
data = recvString("OK", "link is not", 5000);
698720
if (data.indexOf("OK") != -1 || data.indexOf("link is not") != -1) {
699721
return true;
@@ -718,7 +740,7 @@ bool ESP8266::sATCIPMUX(uint8_t mode)
718740
rx_empty();
719741
m_puart->print("AT+CIPMUX=");
720742
m_puart->println(mode);
721-
743+
722744
data = recvString("OK", "Link is builded");
723745
if (data.indexOf("OK") != -1) {
724746
return true;
@@ -732,7 +754,7 @@ bool ESP8266::sATCIPSERVER(uint8_t mode, uint32_t port)
732754
rx_empty();
733755
m_puart->print("AT+CIPSERVER=1,");
734756
m_puart->println(port);
735-
757+
736758
data = recvString("OK", "no change");
737759
if (data.indexOf("OK") != -1 || data.indexOf("no change") != -1) {
738760
return true;
@@ -772,4 +794,3 @@ bool ESP8266::sATCMDNS(bool enable, String hostname, String servername, uint32_t
772794
}
773795
return false;
774796
}
775-

0 commit comments

Comments
 (0)