Revision 26:0d5bcb3903e2, committed 2014-12-30

Comitter:

michaeljkoster

Date:

Tue Dec 30 03:21:33 2014 +0000

Parent:

25:8e2b04473830

Child:

27:9c6cefc12f0c

Commit message:

set baud rate and remove printf from rx handler

Changed in this revision

--- a/ESP8266/ESP8266.cpp	Tue Dec 30 00:16:21 2014 +0000
+++ b/ESP8266/ESP8266.cpp	Tue Dec 30 03:21:33 2014 +0000
@@ -50,7 +50,7 @@
 {
     memset(&state, 0, sizeof(state));
 
-/*    // change all ' ' in '$' in the ssid and the passphrase
+    // change all ' ' in '$' in the ssid and the passphrase
     strcpy(this->ssid, ssid);
     for (int i = 0; i < strlen(ssid); i++) {
         if (this->ssid[i] == ' ')
@@ -61,12 +61,12 @@
         if (this->phrase[i] == ' ')
             this->phrase[i] = '$';
     }
-*/
+
 
     inst = this;
     attach_rx(false);
     
-    wifi.baud(9600); // initial baud rate of the ESP8266 
+    wifi.baud(115200); // initial baud rate of the ESP8266 
     
     state.associated = false;
     state.cmdMode = false;
@@ -170,10 +170,6 @@
     //sendCommand("AT+RST", "ready", NULL, 10000);
     state.associated = false;
 
-    //pc.printf("setting baud rate\r\n");
-    //sendCommand("AT+CIOBAUD=9600", "OK", NULL, 2000);
-    //wifi.baud(9600);
-    //sendCommand("AT", "OK", NULL, 1000);
 }
 
 bool ESP8266::reboot()
@@ -189,8 +185,7 @@
     while (wifi.readable()){
         c=wifi.getc();
         buf_ESP8266.queue(c);
-        if (state.cmdMode) pc.printf("%c",c); //debug echo
-        //pc.printf("%c",c); //debug echo
+        //if (state.cmdMode) pc.printf("%c",c); //debug echo, needs fast serial console to prevent UART overruns
     }
 }
 
@@ -292,6 +287,7 @@
                 return -1;
             } else if (readable()) {
                 read = getc();
+                pc.printf("%c",read); //debug echo
                 if ( read != '\r' && read != '\n') {
                     checking += read;
                     found = checking.find(ACK);
@@ -300,8 +296,8 @@
 
                         //We flush the buffer
                         while (readable())
-                            getc();
-
+                            read = getc();
+                            pc.printf("%c",read); //debug echo
                         break;
                     }
                 }