ACKme / WiConnect

Host library for controlling a WiConnect enabled Wi-Fi module.

Dependents:   wiconnect-ota_example wiconnect-web_setup_example wiconnect-test-console wiconnect-tcp_server_example ... more

Files at this revision

API Documentation at this revision

Revision 36:a30cbf4bdb13, committed 2014-11-27

Comitter:
dan_ackme
Date:
Thu Nov 27 00:46:50 2014 -0800
Parent:
35:15725177aa60
Child:
37:5ee74d72efe4
Commit message:
Fix compiler warning

Changed in this revision

Wiconnect.cpp Show annotated file Show diff for this revision Revisions of this file
WiconnectSerial.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/Wiconnect.cpp	Thu Nov 27 00:25:09 2014 -0800
+++ b/Wiconnect.cpp	Thu Nov 27 00:46:50 2014 -0800
@@ -369,7 +369,7 @@
     char *idx = strchr(versionStr, ',');
     if(idx == NULL)
     {
-        return -1;
+        return UINT_MAX;
     }
     *idx = 0;
     idx = versionStr;
@@ -385,7 +385,7 @@
         return ver;
     }
 
-    return -1;
+    return UINT_MAX;
 }
 
 /*************************************************************************************************/

--- a/WiconnectSerial.cpp	Thu Nov 27 00:25:09 2014 -0800
+++ b/WiconnectSerial.cpp	Thu Nov 27 00:46:50 2014 -0800
@@ -91,6 +91,7 @@
 #endif
 }
 
+
 /*************************************************************************************************/
 void WiconnectSerial::initialize(void)
 {
@@ -124,14 +125,14 @@
             {
                 if(timeoutMs == 0)
                 {
-                    if(timeoutTimer.readMs() > 0)
+                    if(timeoutTimer.timedOut(timeoutMs))
                     {
                         goto exit;
                     }
                 }
                 else
                 {
-                    if(timeoutTimer.readMs() >= timeoutMs)
+                    if(timeoutTimer.timedOut(timeoutMs))
                     {
                         goto exit;
                     }
@@ -168,7 +169,7 @@
                 timeoutTimer.reset();
                 while(rxBuffer->count == 0)
                 {
-                    if(timeoutTimer.readMs() >= timeoutMs)
+                    if(timeoutTimer.timedOut(timeoutMs))
                     {
                         goto exit;
                     }