Revision 38:bc2b10351ee3, committed 2014-11-27

Comitter:

dan_ackme

Date:

Thu Nov 27 10:27:18 2014 +0000

Parent:

37:5ee74d72efe4

Child:

39:a963f69cb2de

Commit message:

updated for latest wiconnect

Changed in this revision

--- a/NetworkWebSetup.cpp	Thu Nov 27 01:11:12 2014 -0800
+++ b/NetworkWebSetup.cpp	Thu Nov 27 10:27:18 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 "internal/common.h"
@@ -43,7 +43,7 @@
         FS_NETWORK_UP
     };
 
-    CHECK_CALLBACK_AVAILABLE(completeHandler_);
+    //CHECK_CALLBACK_AVAILABLE(completeHandler_);
     CHECK_OTHER_COMMAND_EXECUTING();
 
     if(wiconnect->internalProcessingState == FS_SET_SSID)
@@ -68,16 +68,16 @@
     {
         if(WICONNECT_SUCCEEDED(result, wiconnect->sendCommand("setup web")))
         {
-#ifdef WICONNECT_ASYNC_TIMER_ENABLED
-            if(completeHandler_.isValid())
-            {
-#ifdef WICONNECT_ASYNC_TIMER_ENABLED
-                monitorTimer.stop();
-#endif
-                completeHandler = completeHandler_;
-                monitorTimer.start(this, &NetworkInterface::webSetupStatusMonitor, 1000);
-            }
-#endif
+//#ifdef WICONNECT_ASYNC_TIMER_ENABLED
+//            if(completeHandler_.isValid())
+//            {
+//#ifdef WICONNECT_ASYNC_TIMER_ENABLED
+//                monitorTimer.stop();
+//#endif
+//                completeHandler = completeHandler_;
+//                monitorTimer.start(this, &NetworkInterface::webSetupStatusMonitor, 1000);
+//            }
+//#endif
         }
     }