Revision 22:c4360e61486a, committed 2014-12-02

Comitter:

michaeljkoster

Date:

Tue Dec 02 16:02:21 2014 +0000

Parent:

21:690526f05fe6

Child:

23:de9221771e96

Commit message:

Add state.cmdMode and some cleanup

Changed in this revision

--- a/ESP8266/ESP8266.cpp	Tue Dec 02 04:16:26 2014 +0000
+++ b/ESP8266/ESP8266.cpp	Tue Dec 02 16:02:21 2014 +0000
@@ -66,6 +66,9 @@
     attach_rx(false);
     
     wifi.baud(9600); // initial baud rate of the ESP8266 
+    
+    state.associated = false;
+    state.cmdMode = false;
 }
 
 bool ESP8266::join()
@@ -97,7 +100,9 @@
     
     sendCommand("AT+CIPMODE=1", "OK", NULL, 1000);// go into transparent mode 
     sendCommand("AT+CIPSEND", ">", NULL, 1000);// go into transparent mode 
-
+    pc.printf("Data Mode\r\n");
+    state.cmdMode = false;
+    
     return true;
 }
 
@@ -105,6 +110,7 @@
 {
     send("+++",3);
     wait(1);
+    state.cmdMode = true;
     sendCommand("AT+CIPCLOSE","OK", NULL, 10000);
     return true;
 }
@@ -150,7 +156,12 @@
 
 void ESP8266::reset()
 {
+    send("+++",3);
+    wait(1);
+    state.cmdMode = true;
+    sendCommand("AT", "OK", NULL, 1000);
     sendCommand("AT+RST", "ready", NULL, 10000);
+    state.associated = false;
     /*
     reset_pin = 0;
     wait(0.2);
@@ -172,7 +183,7 @@
     while (wifi.readable()){
         c=wifi.getc();
         buf_ESP8266.queue(c);
-        pc.printf("%c",c); //debug echo
+        if (state.cmdMode) pc.printf("%c",c); //debug echo
     }
 }
 

--- a/ESP8266/ESP8266.h	Tue Dec 02 04:16:26 2014 +0000
+++ b/ESP8266/ESP8266.h	Tue Dec 02 16:02:21 2014 +0000
@@ -187,6 +187,7 @@
 
     typedef struct STATE {
         bool associated;
+        bool cmdMode;
     } State;
 
     State state;

--- a/Socket/UDPSocket.cpp	Tue Dec 02 04:16:26 2014 +0000
+++ b/Socket/UDPSocket.cpp	Tue Dec 02 16:02:21 2014 +0000
@@ -68,7 +68,8 @@
     int idx = 0;
     int nb_available = 0;
     int time = -1;
-
+    tmr.start();
+    
     if (_blocking) {
         while (1) {
             nb_available = wifi->readable();
@@ -78,7 +79,7 @@
         }
     }
     else {
-        tmr.start();
+        tmr.reset();
         
         while (time < _timeout){
             nb_available = wifi->readable();
@@ -90,8 +91,7 @@
         if (nb_available == 0) return nb_available;  
     } 
     
-    tmr.start();
-
+    tmr.reset();
     while (time < _timeout) {
 
         nb_available = wifi->readable();
@@ -106,7 +106,6 @@
         
         time = tmr.read_ms();
     }
-
     readEndpoint(remote);
     return (idx == 0) ? -1 : idx;
 }