Revision 14:4639147f2f42, committed 2014-08-13

Comitter:

dan_ackme

Date:

Wed Aug 13 11:55:42 2014 +0000

Parent:

13:779e8b2b50b4

Child:

16:d7e0d890426a

Commit message:

Updated Wiconnect library to latest

Changed in this revision

--- a/Wiconnect.lib	Wed Aug 13 04:45:36 2014 -0700
+++ b/Wiconnect.lib	Wed Aug 13 11:55:42 2014 +0000
@@ -1,1 +1,1 @@
-http://mbed.org/teams/ACKme/code/Wiconnect/#3dfec824715a
+http://mbed.org/teams/ACKme/code/Wiconnect/#7f1d6d359787

--- a/main.cpp	Wed Aug 13 04:45:36 2014 -0700
+++ b/main.cpp	Wed Aug 13 11:55:42 2014 +0000
@@ -1,30 +1,30 @@
-/**
- * ACKme WiConnect Host Library is licensed under the BSD licence: 
- * 
- * Copyright (c)2014 ACKme Networks.
- * All rights reserved. 
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met: 
- * 
- * 1. Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
- * 2. Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
- * 3. The name of the author may not be used to endorse or promote products 
- * derived from this software without specific prior written permission. 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS AND ANY EXPRESS OR IMPLIED 
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
- * OF SUCH DAMAGE.
+/**
+ * ACKme WiConnect Host Library is licensed under the BSD licence: 
+ * 
+ * Copyright (c)2014 ACKme Networks.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met: 
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * 2. Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * 3. The name of the author may not be used to endorse or promote products 
+ * derived from this software without specific prior written permission. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
  */
 #include "Wiconnect.h"
 #include "util/log/log.h"
@@ -67,6 +67,7 @@
 /*************************************************************************************************/
 int main(int argc, char **argv)
 {
+    WiconnectResult result = WICONNECT_SUCCESS;
     consoleSerial.setBaud(CONSOLE_BAUD);
 
     wiconnectIfc.setAssertLogger(LogFunc(wiconnectLogAssert));
@@ -77,7 +78,6 @@
 
     initialize_loop:
     {
-        WiconnectResult result;
         LOG_INFO("\r\n\r\nInitializing WiConnect...");
         if(WICONNECT_FAILED(result, wiconnectIfc.init(true)))
         {
@@ -89,7 +89,6 @@
     }
 
     {
-        WiconnectResult result;
         if(!WICONNECT_FAILED(result, wiconnectIfc.getVersion()))
         {
             LOG_INFO("Version: %s", wiconnectIfc.getResponseBuffer());