Revision 45:21b7bbaad62b, committed 2013-10-10

Comitter:

WiredHome

Date:

Thu Oct 10 20:37:47 2013 +0000

Parent:

44:dc8ef27bd311

Child:

46:4722f7d72aab

Commit message:

Diagnostic improvements

Changed in this revision

--- a/Wifly/Wifly.cpp	Thu Oct 10 19:01:28 2013 +0000
+++ b/Wifly/Wifly.cpp	Thu Oct 10 20:37:47 2013 +0000
@@ -58,7 +58,6 @@
     wiflyVersionString = NULL;
 }
 
-
 Wifly::~Wifly()
 {
     if (ssid) {
@@ -75,6 +74,12 @@
     }
 }
 
+void Wifly::SetSecurity(const char * ssid, const char * phrase, Security sec)
+{
+    state.sec = sec;
+    FixPhrase(&this->ssid, ssid);
+    FixPhrase(&this->phrase, phrase);
+}
 
 bool Wifly::join()
 {
@@ -448,17 +453,17 @@
         return true;    // already closed
     if (!sendCommand("close\r", "*CLOS*"))
         return false;   // failed to close
-    #if 1
+#if 1
     // It appears that the close exits cmd mode
     // so we won't both trying to close which
     // could cause it to open command mode to
     // send the close (which add more 0.25s
     // delays).
     setCmdMode(false);
-    #else
+#else
     flushIn();
     exit();
-    #endif
+#endif
     state.tcp = false;
     return true;        // succeeded to close
 }
@@ -570,6 +575,7 @@
                     res = NULL;
                 }
                 INFO("timeout awaiting response to %s", str);
+                wait_ms(100);
                 break;
             } else {
                 if (wifi.readable()) {
@@ -583,6 +589,7 @@
         }
         DBG("user str: {%s}", res);
     }
+
     flushIn();
     attach_rx(true);
     return result;
@@ -748,4 +755,5 @@
 void Wifly::setCmdMode(bool newState)
 {
     state.cmd_mode = newState;
-}
\ No newline at end of file
+}
+

--- a/Wifly/Wifly.h	Thu Oct 10 19:01:28 2013 +0000
+++ b/Wifly/Wifly.h	Thu Oct 10 20:37:47 2013 +0000
@@ -75,6 +75,17 @@
     */
     ~Wifly();
     
+    /** Optional means to set/reset the security
+    *
+    * If join() has not been called, then you can revise the security parameters
+    * from those in the constructor.
+    *
+    * @param ssid ssid of the network
+    * @param phrase WEP or WPA key
+    * @param sec Security type (NONE, WEP_128, WPA1, WPA | WPA_MIXED, WPA2_PSK, WEP_64 )
+    */
+    void SetSecurity(const char * ssid, const char * phrase, Security sec);
+
     /**
     * Connect the wifi module to the ssid contained in the constructor.
     *

--- a/WiflyInterface.cpp	Thu Oct 10 19:01:28 2013 +0000
+++ b/WiflyInterface.cpp	Thu Oct 10 20:37:47 2013 +0000
@@ -27,6 +27,11 @@
     return 0;
 }
 
+void WiflyInterface::setSecurity(const char * ssid, const char * phrase, Security sec)
+{
+    Wifly::SetSecurity(ssid, phrase, sec);
+}
+
 int WiflyInterface::connect()
 {
     return join();
@@ -37,6 +42,9 @@
     return Wifly::disconnect();
 }
 
+// typical response might be
+// 192.168.43.107\r
+// <4.00>
 char * WiflyInterface::getIPAddress()
 {
     char * match = 0;
@@ -59,4 +67,4 @@
         ip_set = true;
     }
     return ip_string;
-}
\ No newline at end of file
+}

--- a/WiflyInterface.h	Thu Oct 10 19:01:28 2013 +0000
+++ b/WiflyInterface.h	Thu Oct 10 20:37:47 2013 +0000
@@ -45,15 +45,18 @@
     *
     * @endverbatim
     *
+    * @note The optional ssid, phrase, and sec parameters may be deferred, or
+    *       overridden prior to the connect().
+    *
     * \param tx mbed pin to use for tx line of Serial interface
     * \param rx mbed pin to use for rx line of Serial interface
     * \param reset reset pin of the wifi module ()
     * \param tcp_status connection status pin of the wifi module (GPIO 6)
-    * \param ssid ssid of the network
-    * \param phrase WEP or WPA key
-    * \param sec Security type (NONE, WEP_128 or WPA)
+    * \param ssid optional parameter which is the ssid of the network
+    * \param phrase optional parameter which is the WEP or WPA key/phrase
+    * \param sec optional security type (NONE[default], WEP_128 or WPA)
     */
-    WiflyInterface(PinName tx, PinName rx, PinName reset, PinName tcp_status, const char * ssid, const char * phrase, Security sec = NONE);
+    WiflyInterface(PinName tx, PinName rx, PinName reset, PinName tcp_status, const char * ssid = NULL, const char * phrase = NULL, Security sec = NONE);
 
     /** Initialize the interface with DHCP.
     * Initialize the interface and configure it to use DHCP (no connection at this point).
@@ -62,7 +65,10 @@
     int init(); //With DHCP
 
     /** Initialize the interface with a static IP address.
-    * Initialize the interface and configure it with the following static configuration (no connection at this point).
+    *
+    * Initialize the interface and configure it with the following static
+    * configuration (no connection at this point).
+    *
     * \param ip the IP address to use
     * \param mask the IP address mask
     * \param gateway the gateway to use
@@ -70,6 +76,19 @@
     */
     int init(const char* ip, const char* mask, const char* gateway);
 
+    /** Set security parameters for the interface.
+    *
+    * Prior to connect, this interface permits changing the security parameters. This
+    * can be most useful when the Wifly module may be used where there are multiple access
+    * points to be connected to. With this, the interface can be brought online far
+    * enough to scan for available access points.
+    *
+    * \param ssid optional parameter which is the ssid of the network
+    * \param phrase optional parameter which is the WEP or WPA key/phrase
+    * \param sec optional security type (NONE[default], WEP_128 or WPA)
+    */
+    void setSecurity(const char * ssid = NULL, const char * phrase = NULL, Security sec = NONE);
+
     /** Connect
     * Bring the interface up, start DHCP if needed.
     * \return 0 on success, a negative number on failure