Diff: ESP8266/ESP8266.cpp

Revision:

32:cf071dc33972

Parent:

30:c035696b9397

Child:

34:7ccda5d68a00

Child:

36:e1545c6c2cb3

diff -r fd0eaf273b11 -r cf071dc33972 ESP8266/ESP8266.cpp
--- a/ESP8266/ESP8266.cpp	Thu Apr 30 04:53:21 2015 +0000
+++ b/ESP8266/ESP8266.cpp	Thu Apr 30 19:07:37 2015 +0000
@@ -115,10 +115,10 @@
         sprintf(portstr, "%d", port);
         switch(type) {
             case ESP_UDP_TYPE : //UDP
-                check[0] = sendCommand(( "AT+CIPSTART=" + (string) idstr + ",\"UDP\",\"" + (string) ip + "\"," + (string) portstr ).c_str(), "OK", NULL, 10000);
+                check[0] = sendCommand(( "AT+CIPSTART=\"UDP\",\"" + (string) ip + "\"," + (string) portstr ).c_str(), "OK", NULL, 10000);
                 break;
             case ESP_TCP_TYPE : //TCP
-                check[0] = sendCommand(( "AT+CIPSTART=" + (string) idstr + ",\"TCP\",\"" + (string) ip + "\"," + (string) portstr ).c_str(), "OK", NULL, 10000);
+                check[0] = sendCommand(( "AT+CIPSTART=\"TCP\",\"" + (string) ip + "\"," + (string) portstr ).c_str(), "OK", NULL, 10000);
                 break;
             default:
                 ERR("Default hit for starting connection, this shouldnt be possible!!");
@@ -127,8 +127,8 @@
         check[1] = sendCommand("AT+CIPMODE=1", "OK", NULL, 1000);// go into transparent mode
         check[2] = sendCommand("AT+CIPSEND", ">", NULL, 1000);// go into transparent mode
         // check that all commands were sucessful
-        if(check[0] && check[1] && check[2]) {
-            pc.printf("Data Mode\r\n");
+        if(check[0] and check[1] and check[2]) {
+            DBG("Data Mode\r\n");
             state.cmdMode = false;
             return true;
         } else {
@@ -141,6 +141,24 @@
         //TODO: impliment Multi Connection Mode
         ERR("Not currently Supported!");
         return false;
+        
+//        DBG("Start Multi Connection Mode");
+//        char portstr[5];
+//        char idstr[2];
+//        bool check [3] = {0};
+//        sprintf(idstr,"%d",id);
+//        sprintf(portstr, "%d", port);
+//        switch(type) {
+//            case ESP_UDP_TYPE : //UDP
+//                check[0] = sendCommand(( "AT+CIPSTART=" + (string) idstr + ",\"UDP\",\"" + (string) ip + "\"," + (string) portstr ).c_str(), "OK", NULL, 10000);
+//                break;
+//            case ESP_TCP_TYPE : //TCP
+//                check[0] = sendCommand(( "AT+CIPSTART=" + (string) idstr + ",\"TCP\",\"" + (string) ip + "\"," + (string) portstr ).c_str(), "OK", NULL, 10000);
+//                break;
+//            default:
+//                ERR("Default hit for starting connection, this shouldnt be possible!!");
+//                break;
+//        }
     }
 }
 
@@ -308,7 +326,7 @@
 
 int ESP8266::send(const char * buf, int len)
 {
-
+    //TODO: need to add handler for data > 2048B, this is the max packet size of the ESP8266.
     const char* bufptr=buf;
     for(int i=0; i<len; i++) {
         putc((int)*bufptr++);