Revision 55:0729959263b7, committed 2014-01-03

Comitter:

WiredHome

Date:

Fri Jan 03 19:53:24 2014 +0000

Parent:

54:f13529746357

Child:

56:eba4aabaad3e

Commit message:

Updated documentation.; Remove unnecessary delay.; Minor code refactoring to improve maintenance.

Changed in this revision

--- a/Socket/Socket.h	Mon Dec 30 22:59:44 2013 +0000
+++ b/Socket/Socket.h	Fri Jan 03 19:53:24 2014 +0000
@@ -32,7 +32,7 @@
         blocking socket operations
     @param blocking  true for blocking mode, false for non-blocking mode.
     @param timeout   timeout in ms [Default: (1500)ms] when non-blocking.
-    @note if timeout is < 10 msec, it is set to 10 to avoid problems
+    @note if timeout is < 1 msec, it is set to 1 to avoid problems
           in other parts of the socket interface.
     */
     void set_blocking(bool blocking, unsigned int timeout=1500);

--- a/Socket/TCPSocketConnection.cpp	Mon Dec 30 22:59:44 2013 +0000
+++ b/Socket/TCPSocketConnection.cpp	Fri Jan 03 19:53:24 2014 +0000
@@ -68,7 +68,6 @@
     return (idx == 0) ? -1 : idx;
 }
 
-// -1 if unsuccessful, else number of bytes received
 int TCPSocketConnection::receive(char* data, int length)
 {
     Timer tmr;
@@ -78,15 +77,17 @@
         tmr.start();
         while (time < _timeout + 20) {
             if (wifi->readable()) {
-                break;
+                break;      // go get the data.
             }
             time = tmr.read_ms();
         }
         if (time >= _timeout + 20) {
             return -1;
         }
+    } else {
+        while(!wifi->readable())
+            ;
     }
-    while(!wifi->readable());
     int nb_available = wifi->readable();
     for (int i = 0; i < min(nb_available, length); i++) {
         data[i] = wifi->getc();
@@ -94,23 +95,20 @@
     return min(nb_available, length);
 }
 
-
-// -1 if unsuccessful, else number of bytes received
 int TCPSocketConnection::receive_all(char* data, int length)
 {
     Timer tmr;
     int idx = 0;
     int time = -1;
 
-    tmr.start();    
-    while (time < _timeout || _blocking) {
+    tmr.start();
+    while ((time < _timeout) || _blocking) {
         int nb_available = wifi->readable();
         for (int i = 0; i < min(nb_available, length); i++) {
             data[idx++] = wifi->getc();
         }
         if (idx == length)
             break;
-
         time = tmr.read_ms();
     }
     return (idx == 0) ? -1 : idx;

--- a/Socket/TCPSocketConnection.h	Mon Dec 30 22:59:44 2013 +0000
+++ b/Socket/TCPSocketConnection.h	Fri Jan 03 19:53:24 2014 +0000
@@ -59,16 +59,29 @@
     int send_all(char* data, int length);
     
     /** Receive data from the remote host.
+
+    When non-blocking, it waits up to the timeout for anything to read.
+    When blocking, it does not wait.
+    In either mode, it can receive up to length bytes.
+    
+    @note This can mean that it receives 0 to just a few chars at a time.
+    
+    @param data The buffer in which to store the data received from the host.
+    @param length The maximum length of the buffer.
+    @return the number of received bytes on success (>=0) or -1 on failure 
+            or closed connection.
+     */
+    int receive(char* data, int length);
+    
+    /** Receive ALL the data from the remote host.
+    
+    When non-blocking, it reads everything it can until the timeout.
+    When blocking, it pauses until it has read the prescribed length.
+
     @param data The buffer in which to store the data received from the host.
     @param length The maximum length of the buffer.
     @return the number of received bytes on success (>=0) or -1 on failure
-     */
-    int receive(char* data, int length);
-    
-    /** Receive all the data from the remote host.
-    @param data The buffer in which to store the data received from the host.
-    @param length The maximum length of the buffer.
-    @return the number of received bytes on success (>=0) or -1 on failure
+            or closed connection.
     */
     int receive_all(char* data, int length);
 };

--- a/Wifly/Wifly.cpp	Mon Dec 30 22:59:44 2013 +0000
+++ b/Wifly/Wifly.cpp	Fri Jan 03 19:53:24 2014 +0000
@@ -430,7 +430,7 @@
 {
     reset_pin = 0;
     wifi.baud(9600);
-    wait_ms(200);
+    wait_ms(400);
     reset_pin = 1;
     GatherLogonInfo();
 }
@@ -551,7 +551,7 @@
         while (1) {
             if (tmr.read_ms() > timeout) {
                 flushIn();
-                WARN("Timeout seeking [%s] from [%s] at %d ms", ACK, str, tmr.read_ms());
+                WARN("Timeout at %d ms seeking [%s] from [\r\n%s\r\n]", tmr.read_ms(), ACK, str);
                 attach_rx(true);
                 return -1;
             } else if (wifi.readable()) {
@@ -582,8 +582,8 @@
                 if (i == 0) {
                     res = NULL;
                 }
-                INFO("timeout awaiting response to %s", str);
-                wait_ms(100);
+                //INFO("timeout awaiting response to %s", str);
+                //wait_ms(100);
                 break;
             } else {
                 if (wifi.readable()) {
@@ -595,9 +595,7 @@
                 }
             }
         }
-        //INFO("user str: {%s}", res);
     }
-
     flushIn();
     attach_rx(true);
     return result;