MODIFIED from mbed official WiflyInterface (interface for Roving Networks Wifly modules). Numerous performance and reliability improvements (see the detailed documentation). Also, tracking changes in mbed official version to retain functional parity.

Dependents:   Smart-WiFly-WebServer PUB_WiflyInterface_Demo

Fork of WiflyInterface by mbed official

Resources

Derivative from mbed Official

  • Documentation update, improved consistency, documented parameters that were inadvertently omitted.
  • Avoid c++ string handling, which causes dynamic allocation and free, side effect, fewer CPU cycles spent for same purpose.
  • Fixed socket APIs to support non-blocking mode.
  • Increase communication baud-rate to Wifly module
  • sendCommand - added retries for improved robustness.
  • setConnectionState - method to force the connection state (used by TCPSocketServer)
  • gethostbyname - added a length parameter to the size of the buffer being written
  • flushIn - a private method to flush the input buffer
  • Changed the timeout from 500 to 2500 msec for commands - measured some at 700 to 850 msec.
  • Performance improvements - reduced some unnecessary delays.
  • Added additional security options for the wi-fi connection (that are supported by the WiFly module).
  • Added setSecurity API which permits revising the security when connecting to, or selecting from, one of several access points.
  • Improved DEBUG interface (slightly more consistent printout).
  • gathers information from the Wifly module on reboot (SW version info), which permits customizing behavior based on Wifly capabilities (like the improved security).
  • Avoid potential for recursive crash (if exit fails, it calls sendcommand, which calls exit...)
  • Update to support permissible SSID and PassCode lengths.

Robustness testing

I've had some mixed behavior with the Wifly module, some of which seems to be traceable to the module itself, and some in my derivative code. The result, after running for minutes, hours, sometimes days, it hangs and I have to reset the module.

To test, I created a fairly simple test program -

  • check for Watchdog induced reset and count it.
  • initialize the Watchdog for 60 sec timeout.
  • Init the Wifly interface and connect to my network.
  • Wait 10 seconds and force mbed_reset().

If the Watchdog induces the restart, then it is pretty clear that either:

  • The communications hung with the Wifly module causing the failure.
  • The Wifly module decided to go unresponsive.

If it gets to the end, it typically takes about 4 to 6 seconds for the boot and connect, then the 10 second delay.

But I can't really pin down the root cause easily. My strongest theory is that the Wifly module has rebooted, and since I don't store the high baud rate I configure it for, it resets back to 9600.

Also, one of the objectives for my revised send( ) is to avoid the c++ string, as that can fragment memory, and it wasn't very well bounded in behavior.

Latest tests:

Warm BootsWatchdog EventsNotes
100's30An early version of my derivative WiflyInterface, including my derivative of "send( )" API. Let's call this version 0.1.
26684My derivative WiflyInterface, but with the mbed official "send( )" API. Much improved. This was over the course of about 12 hours.
24003Most recent derivative - incremental change to "send( )", but this relative number does not rule out the Wifly module itself.

I think with these numbers, +/- 1 means that the changes have had no measurable effect. Which is good, since this incremental change eliminates the c++ string handling.

Test Software

This is pieces of a test program, clipped and copied to here. What I have compiled and run for hours and hours is almost exactly what you see. This uses this simple Watchdog library.

#include "mbed.h"
#include "WiflyInterface.h"
#include "Watchdog.h"

Serial pc(USBTX, USBRX);

Watchdog wd;
extern "C" void mbed_reset();

// Pinout for SmartBoard
WiflyInterface wifly(p9, p10, p30, p29, "ssid", "pass", WPA);

int main() {
    pc.baud(460800);                         // I like a snappy terminal
    
    wd.Configure(60.0);                     // Set time limit for the test to 1 minute
    LPC_RTC->GPREG0++;                      // Count boots here
    if (wd.WatchdogCausedReset()) {
        LPC_RTC->GPREG1++;                  // Count Watchdog events here
        pc.printf("\r\n\r\nWatchdog event.\r\n");
    }
    pc.printf("\r\nWifly Test: %d boots, %d watchdogs. %s %s\r\n", LPC_RTC->GPREG0, LPC_RTC->GPREG1, __DATE__, __TIME__);
    
    wifly.init(); // use DHCP
    pc.printf("Connect...  ");
    while (!wifly.connect());               // join the network
    pc.printf("Address is %s.  ", wifly.getIPAddress());
    pc.printf("Disconnect...  ");
    wifly.disconnect();
    pc.printf("OK. Reset in 10 sec...\r\n");
    wait(10);
    if (pc.readable()) {
        if (pc.getc() == 'r') {             // secret 'r'eset of the counters
            LPC_RTC->GPREG0 = 0;
            LPC_RTC->GPREG1 = 0;
            pc.printf("counters reset\r\n");
        }
    }
    mbed_reset();                           // reset here indicates successful communication
}
Committer:
WiredHome
Date:
Mon Aug 05 01:35:29 2013 +0000
Revision:
30:f500260463b7
Parent:
29:49876a8c445b
Child:
31:e4422f192d25
Add extra access point security methods supported by the Wifly module

Who changed what in which revision?

UserRevisionLine numberNew contents of line
samux 1:fb4494783863 1 /* Copyright (C) 2012 mbed.org, MIT License
samux 1:fb4494783863 2 *
samux 1:fb4494783863 3 * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
samux 1:fb4494783863 4 * and associated documentation files (the "Software"), to deal in the Software without restriction,
samux 1:fb4494783863 5 * including without limitation the rights to use, copy, modify, merge, publish, distribute,
samux 1:fb4494783863 6 * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
samux 1:fb4494783863 7 * furnished to do so, subject to the following conditions:
samux 1:fb4494783863 8 *
samux 1:fb4494783863 9 * The above copyright notice and this permission notice shall be included in all copies or
samux 1:fb4494783863 10 * substantial portions of the Software.
samux 1:fb4494783863 11 *
samux 1:fb4494783863 12 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
samux 1:fb4494783863 13 * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
samux 1:fb4494783863 14 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
samux 1:fb4494783863 15 * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
samux 1:fb4494783863 16 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
samux 1:fb4494783863 17 */
samux 1:fb4494783863 18
samux 1:fb4494783863 19 #include "mbed.h"
samux 1:fb4494783863 20 #include "Wifly.h"
samux 1:fb4494783863 21 #include <string>
samux 1:fb4494783863 22 #include <algorithm>
samux 1:fb4494783863 23
WiredHome 25:a740eb74a86a 24 // Defined to disable remote configuration via telnet which increases security of this device.
WiredHome 25:a740eb74a86a 25 #define INCREASE_SECURITY
WiredHome 25:a740eb74a86a 26
WiredHome 26:78a1a09afdc9 27 //#define DEBUG //Debug is disabled by default
WiredHome 20:906b0f951bc3 28
WiredHome 20:906b0f951bc3 29 #if (defined(DEBUG) && !defined(TARGET_LPC11U24))
WiredHome 20:906b0f951bc3 30 #define DBG(x, ...) std::printf("[DBG Wifly%4d] "x"\r\n", __LINE__, ##__VA_ARGS__);
WiredHome 20:906b0f951bc3 31 #define WARN(x, ...) std::printf("[WRN Wifly%4d] "x"\r\n", __LINE__, ##__VA_ARGS__);
WiredHome 20:906b0f951bc3 32 #define ERR(x, ...) std::printf("[ERR Wifly%4d] "x"\r\n", __LINE__, ##__VA_ARGS__);
WiredHome 20:906b0f951bc3 33 #define INFO(x, ...) std::printf("[INF Wifly%4d] "x"\r\n", __LINE__, ##__VA_ARGS__);
samux 1:fb4494783863 34 #else
samux 1:fb4494783863 35 #define DBG(x, ...)
samux 1:fb4494783863 36 #define WARN(x, ...)
samux 1:fb4494783863 37 #define ERR(x, ...)
WiredHome 20:906b0f951bc3 38 #define INFO(x, ...)
samux 1:fb4494783863 39 #endif
samux 1:fb4494783863 40
samux 1:fb4494783863 41 #define MAX_TRY_JOIN 3
samux 1:fb4494783863 42
samux 1:fb4494783863 43 Wifly * Wifly::inst;
samux 1:fb4494783863 44
samux 1:fb4494783863 45 Wifly::Wifly( PinName tx, PinName rx, PinName _reset, PinName tcp_status, const char * ssid, const char * phrase, Security sec):
WiredHome 20:906b0f951bc3 46 wifi(tx, rx), reset_pin(_reset), tcp_status(tcp_status), baudrate(9600), buf_wifly(256)
samux 1:fb4494783863 47 {
samux 1:fb4494783863 48 memset(&state, 0, sizeof(state));
samux 1:fb4494783863 49 state.sec = sec;
samux 1:fb4494783863 50
WiredHome 24:5012a535b1d5 51 FixPhrase(&this->ssid, ssid);
WiredHome 24:5012a535b1d5 52 FixPhrase(&this->phrase, phrase);
samux 1:fb4494783863 53
samux 1:fb4494783863 54 inst = this;
samux 1:fb4494783863 55 attach_rx(false);
samux 1:fb4494783863 56 state.cmd_mode = false;
WiredHome 25:a740eb74a86a 57 wiflyVersionString = NULL;
samux 1:fb4494783863 58 }
samux 1:fb4494783863 59
WiredHome 25:a740eb74a86a 60
WiredHome 25:a740eb74a86a 61 Wifly::~Wifly()
WiredHome 25:a740eb74a86a 62 {
WiredHome 25:a740eb74a86a 63 if (ssid) {
WiredHome 25:a740eb74a86a 64 free(ssid);
WiredHome 25:a740eb74a86a 65 ssid = NULL;
WiredHome 25:a740eb74a86a 66 }
WiredHome 25:a740eb74a86a 67 if (phrase) {
WiredHome 25:a740eb74a86a 68 free(phrase);
WiredHome 25:a740eb74a86a 69 phrase = NULL;
WiredHome 25:a740eb74a86a 70 }
WiredHome 25:a740eb74a86a 71 if (wiflyVersionString) {
WiredHome 25:a740eb74a86a 72 free(wiflyVersionString);
WiredHome 25:a740eb74a86a 73 wiflyVersionString = NULL;
WiredHome 25:a740eb74a86a 74 }
WiredHome 25:a740eb74a86a 75 }
WiredHome 25:a740eb74a86a 76
WiredHome 25:a740eb74a86a 77
samux 1:fb4494783863 78 bool Wifly::join()
samux 1:fb4494783863 79 {
samux 1:fb4494783863 80 char cmd[20];
samux 1:fb4494783863 81
samux 1:fb4494783863 82 for (int i= 0; i < MAX_TRY_JOIN; i++) {
samux 2:8e54830d0df7 83
samux 2:8e54830d0df7 84 // no auto join
samux 2:8e54830d0df7 85 if (!sendCommand("set w j 0\r", "AOK"))
samux 2:8e54830d0df7 86 continue;
samux 2:8e54830d0df7 87
WiredHome 27:8509ec4a0a0a 88 // no echo
samux 2:8e54830d0df7 89 if (!sendCommand("set u m 1\r", "AOK"))
samux 2:8e54830d0df7 90 continue;
samux 2:8e54830d0df7 91
WiredHome 27:8509ec4a0a0a 92 // set comm time to flush (ms)
samux 4:0bcec6272784 93 if (!sendCommand("set c t 30\r", "AOK"))
samux 1:fb4494783863 94 continue;
samux 1:fb4494783863 95
WiredHome 27:8509ec4a0a0a 96 // set comm size to auto-send
WiredHome 27:8509ec4a0a0a 97 if (!sendCommand("set c s 1420\r", "AOK"))
samux 1:fb4494783863 98 continue;
samux 1:fb4494783863 99
WiredHome 29:49876a8c445b 100 // set comm idle time to auto-close (sec)
WiredHome 29:49876a8c445b 101 //if (!sendCommand("set c i 5\r", "AOK"))
WiredHome 29:49876a8c445b 102 // continue;
WiredHome 29:49876a8c445b 103
samux 1:fb4494783863 104 // red led on when tcp connection active
samux 1:fb4494783863 105 if (!sendCommand("set s i 0x40\r", "AOK"))
samux 1:fb4494783863 106 continue;
samux 1:fb4494783863 107
WiredHome 27:8509ec4a0a0a 108 // no hello string sent to the tcp client
samux 1:fb4494783863 109 if (!sendCommand("set c r 0\r", "AOK"))
samux 1:fb4494783863 110 continue;
samux 1:fb4494783863 111
samux 1:fb4494783863 112 // tcp protocol
samux 1:fb4494783863 113 if (!sendCommand("set i p 2\r", "AOK"))
samux 1:fb4494783863 114 continue;
samux 1:fb4494783863 115
WiredHome 27:8509ec4a0a0a 116 // tcp retry (retry enabled, Nagle alg, retain link)
samux 1:fb4494783863 117 if (!sendCommand("set i f 0x7\r", "AOK"))
samux 1:fb4494783863 118 continue;
WiredHome 20:906b0f951bc3 119
WiredHome 25:a740eb74a86a 120 #ifdef INCREASE_SECURITY
WiredHome 25:a740eb74a86a 121 // tcp-mode 0x10 = disable remote configuration
WiredHome 25:a740eb74a86a 122 // only in SW 2.27 and higher (see 2.3.39)
WiredHome 25:a740eb74a86a 123 if ((swVersion >= 2.27) && (!sendCommand("set i t 0x10\r", "AOK")))
WiredHome 25:a740eb74a86a 124 continue;
WiredHome 25:a740eb74a86a 125 #endif
WiredHome 25:a740eb74a86a 126
samux 2:8e54830d0df7 127 // set dns server
samux 2:8e54830d0df7 128 if (!sendCommand("set d n rn.microchip.com\r", "AOK"))
samux 1:fb4494783863 129 continue;
samux 1:fb4494783863 130
samux 1:fb4494783863 131 //dhcp
samux 1:fb4494783863 132 sprintf(cmd, "set i d %d\r", (state.dhcp) ? 1 : 0);
samux 1:fb4494783863 133 if (!sendCommand(cmd, "AOK"))
samux 1:fb4494783863 134 continue;
samux 1:fb4494783863 135
samux 1:fb4494783863 136 // ssid
samux 1:fb4494783863 137 sprintf(cmd, "set w s %s\r", ssid);
samux 1:fb4494783863 138 if (!sendCommand(cmd, "AOK"))
samux 1:fb4494783863 139 continue;
samux 1:fb4494783863 140
samux 1:fb4494783863 141 //auth
samux 1:fb4494783863 142 sprintf(cmd, "set w a %d\r", state.sec);
samux 1:fb4494783863 143 if (!sendCommand(cmd, "AOK"))
samux 1:fb4494783863 144 continue;
samux 1:fb4494783863 145
samux 1:fb4494783863 146 // if no dhcp, set ip, netmask and gateway
samux 1:fb4494783863 147 if (!state.dhcp) {
WiredHome 20:906b0f951bc3 148 DBG("not dhcp");
samux 1:fb4494783863 149
samux 1:fb4494783863 150 sprintf(cmd, "set i a %s\r\n", ip);
samux 1:fb4494783863 151 if (!sendCommand(cmd, "AOK"))
samux 1:fb4494783863 152 continue;
samux 1:fb4494783863 153
samux 1:fb4494783863 154 sprintf(cmd, "set i n %s\r", netmask);
samux 1:fb4494783863 155 if (!sendCommand(cmd, "AOK"))
samux 1:fb4494783863 156 continue;
samux 1:fb4494783863 157
samux 1:fb4494783863 158 sprintf(cmd, "set i g %s\r", gateway);
samux 1:fb4494783863 159 if (!sendCommand(cmd, "AOK"))
samux 1:fb4494783863 160 continue;
samux 1:fb4494783863 161 }
samux 1:fb4494783863 162
samux 1:fb4494783863 163 //key step
WiredHome 30:f500260463b7 164 cmd[0] = '\0';
WiredHome 30:f500260463b7 165 switch (state.sec) {
WiredHome 30:f500260463b7 166 case WPE_64: // google searching suggests this is a typo and should be WEP_64
WiredHome 30:f500260463b7 167 case WEP_128:
samux 1:fb4494783863 168 sprintf(cmd, "set w k %s\r", phrase);
WiredHome 30:f500260463b7 169 break;
WiredHome 30:f500260463b7 170 case WPA1:
WiredHome 30:f500260463b7 171 case WPA_MIXED: // alias WPA
WiredHome 30:f500260463b7 172 case WPA2_PSK:
WiredHome 30:f500260463b7 173 sprintf(cmd, "set w p %s\r", phrase);
WiredHome 30:f500260463b7 174 break;
WiredHome 30:f500260463b7 175 case ADHOC:
WiredHome 30:f500260463b7 176 case NONE:
WiredHome 30:f500260463b7 177 default:
WiredHome 30:f500260463b7 178 break;
samux 1:fb4494783863 179 }
WiredHome 30:f500260463b7 180 if (cmd[0] && !sendCommand(cmd, "AOK"))
WiredHome 30:f500260463b7 181 continue;
samux 1:fb4494783863 182
samux 2:8e54830d0df7 183 //join the network (10s timeout)
samux 1:fb4494783863 184 if (state.dhcp) {
samux 2:8e54830d0df7 185 if (!sendCommand("join\r", "DHCP=ON", NULL, 10000))
samux 2:8e54830d0df7 186 continue;
samux 2:8e54830d0df7 187 } else {
samux 2:8e54830d0df7 188 if (!sendCommand("join\r", "Associated", NULL, 10000))
samux 1:fb4494783863 189 continue;
samux 1:fb4494783863 190 }
samux 1:fb4494783863 191
samux 2:8e54830d0df7 192 if (!sendCommand("save\r", "Stor"))
samux 2:8e54830d0df7 193 continue;
samux 2:8e54830d0df7 194
samux 1:fb4494783863 195 exit();
samux 1:fb4494783863 196
samux 1:fb4494783863 197 state.associated = true;
WiredHome 30:f500260463b7 198 // Don't advertise this info
WiredHome 30:f500260463b7 199 //INFO("\r\nssid: %s\r\nphrase: %s\r\nsecurity: %s\r\n\r\n", this->ssid, this->phrase, getStringSecurity());
samux 1:fb4494783863 200 return true;
samux 1:fb4494783863 201 }
samux 1:fb4494783863 202 return false;
samux 1:fb4494783863 203 }
samux 1:fb4494783863 204
samux 1:fb4494783863 205
samux 1:fb4494783863 206 bool Wifly::setProtocol(Protocol p)
samux 1:fb4494783863 207 {
samux 1:fb4494783863 208 // use udp auto pairing
samux 1:fb4494783863 209 char cmd[20];
samux 1:fb4494783863 210 sprintf(cmd, "set i p %d\r", p);
samux 1:fb4494783863 211 if (!sendCommand(cmd, "AOK"))
samux 1:fb4494783863 212 return false;
samux 1:fb4494783863 213
samux 1:fb4494783863 214 switch(p) {
samux 1:fb4494783863 215 case TCP:
samux 1:fb4494783863 216 // set ip flags: tcp retry enabled
samux 1:fb4494783863 217 if (!sendCommand("set i f 0x07\r", "AOK"))
samux 1:fb4494783863 218 return false;
samux 1:fb4494783863 219 break;
samux 1:fb4494783863 220 case UDP:
samux 1:fb4494783863 221 // set ip flags: udp auto pairing enabled
samux 1:fb4494783863 222 if (!sendCommand("set i h 0.0.0.0\r", "AOK"))
samux 1:fb4494783863 223 return false;
samux 4:0bcec6272784 224 if (!sendCommand("set i f 0x40\r", "AOK"))
samux 1:fb4494783863 225 return false;
samux 1:fb4494783863 226 break;
samux 1:fb4494783863 227 }
samux 1:fb4494783863 228 state.proto = p;
samux 1:fb4494783863 229 return true;
samux 1:fb4494783863 230 }
samux 1:fb4494783863 231
WiredHome 25:a740eb74a86a 232
samux 1:fb4494783863 233 char * Wifly::getStringSecurity()
samux 1:fb4494783863 234 {
samux 1:fb4494783863 235 switch(state.sec) {
WiredHome 30:f500260463b7 236 case NONE: // 0
samux 1:fb4494783863 237 return "NONE";
WiredHome 30:f500260463b7 238 case WEP_128: // 1
samux 1:fb4494783863 239 return "WEP_128";
WiredHome 30:f500260463b7 240 case WPA1: // 2
WiredHome 30:f500260463b7 241 return "WPA1";
WiredHome 30:f500260463b7 242 case WPA: // 3
samux 1:fb4494783863 243 return "WPA";
WiredHome 30:f500260463b7 244 case WPA2_PSK: // 4
WiredHome 30:f500260463b7 245 return "WPA2_PSK";
WiredHome 30:f500260463b7 246 case ADHOC: // 6
WiredHome 30:f500260463b7 247 return "ADHOC";
WiredHome 30:f500260463b7 248 case WPE_64: // 8
WiredHome 30:f500260463b7 249 return "WPE_64";
WiredHome 30:f500260463b7 250 default: // ?
WiredHome 30:f500260463b7 251 return "UNKNOWN";
samux 1:fb4494783863 252 }
samux 1:fb4494783863 253 }
samux 1:fb4494783863 254
WiredHome 25:a740eb74a86a 255
samux 1:fb4494783863 256 bool Wifly::connect(const char * host, int port)
samux 1:fb4494783863 257 {
samux 1:fb4494783863 258 char rcv[20];
samux 1:fb4494783863 259 char cmd[20];
samux 1:fb4494783863 260
samux 2:8e54830d0df7 261 // try to open
samux 2:8e54830d0df7 262 sprintf(cmd, "open %s %d\r", host, port);
samux 2:8e54830d0df7 263 if (sendCommand(cmd, "OPEN", NULL, 10000)) {
samux 2:8e54830d0df7 264 state.tcp = true;
WiredHome 25:a740eb74a86a 265 exit();
samux 2:8e54830d0df7 266 return true;
samux 1:fb4494783863 267 }
samux 1:fb4494783863 268
samux 2:8e54830d0df7 269 // if failed, retry and parse the response
samux 2:8e54830d0df7 270 if (sendCommand(cmd, NULL, rcv, 5000)) {
samux 1:fb4494783863 271 if (strstr(rcv, "OPEN") == NULL) {
samux 1:fb4494783863 272 if (strstr(rcv, "Connected") != NULL) {
samux 1:fb4494783863 273 if (!sendCommand("close\r", "CLOS"))
samux 1:fb4494783863 274 return false;
samux 2:8e54830d0df7 275 if (!sendCommand(cmd, "OPEN", NULL, 10000))
samux 1:fb4494783863 276 return false;
samux 1:fb4494783863 277 } else {
samux 1:fb4494783863 278 return false;
samux 1:fb4494783863 279 }
samux 1:fb4494783863 280 }
samux 1:fb4494783863 281 } else {
samux 1:fb4494783863 282 return false;
samux 1:fb4494783863 283 }
samux 2:8e54830d0df7 284
samux 1:fb4494783863 285 state.tcp = true;
WiredHome 25:a740eb74a86a 286 exit();
samux 1:fb4494783863 287 return true;
samux 1:fb4494783863 288 }
samux 1:fb4494783863 289
samux 1:fb4494783863 290
samux 1:fb4494783863 291 bool Wifly::gethostbyname(const char * host, char * ip)
samux 1:fb4494783863 292 {
samux 1:fb4494783863 293 string h = host;
samux 1:fb4494783863 294 char cmd[30], rcv[100];
samux 1:fb4494783863 295 int l = 0;
samux 1:fb4494783863 296 char * point;
samux 1:fb4494783863 297 int nb_digits = 0;
samux 1:fb4494783863 298
samux 1:fb4494783863 299 // no dns needed
samux 1:fb4494783863 300 int pos = h.find(".");
samux 1:fb4494783863 301 if (pos != string::npos) {
samux 1:fb4494783863 302 string sub = h.substr(0, h.find("."));
samux 1:fb4494783863 303 nb_digits = atoi(sub.c_str());
samux 1:fb4494783863 304 }
samux 1:fb4494783863 305 //printf("substrL %s\r\n", sub.c_str());
samux 1:fb4494783863 306 if (count(h.begin(), h.end(), '.') == 3 && nb_digits > 0) {
samux 1:fb4494783863 307 strcpy(ip, host);
samux 1:fb4494783863 308 }
samux 1:fb4494783863 309 // dns needed
samux 1:fb4494783863 310 else {
samux 1:fb4494783863 311 nb_digits = 0;
samux 1:fb4494783863 312 sprintf(cmd, "lookup %s\r", host);
samux 1:fb4494783863 313 if (!sendCommand(cmd, NULL, rcv))
samux 1:fb4494783863 314 return false;
samux 1:fb4494783863 315
samux 1:fb4494783863 316 // look for the ip address
samux 1:fb4494783863 317 char * begin = strstr(rcv, "=") + 1;
samux 1:fb4494783863 318 for (int i = 0; i < 3; i++) {
samux 1:fb4494783863 319 point = strstr(begin + l, ".");
WiredHome 29:49876a8c445b 320 INFO("str: %s", begin + l);
samux 1:fb4494783863 321 l += point - (begin + l) + 1;
samux 1:fb4494783863 322 }
WiredHome 29:49876a8c445b 323 INFO("str: %s", begin + l);
samux 1:fb4494783863 324 while(*(begin + l + nb_digits) >= '0' && *(begin + l + nb_digits) <= '9') {
WiredHome 29:49876a8c445b 325 INFO("digit: %c", *(begin + l + nb_digits));
samux 1:fb4494783863 326 nb_digits++;
samux 1:fb4494783863 327 }
samux 1:fb4494783863 328 memcpy(ip, begin, l + nb_digits);
samux 1:fb4494783863 329 ip[l+nb_digits] = 0;
WiredHome 29:49876a8c445b 330 INFO("ip from dns: %s", ip);
samux 1:fb4494783863 331 }
samux 1:fb4494783863 332 return true;
samux 1:fb4494783863 333 }
samux 1:fb4494783863 334
samux 1:fb4494783863 335
samux 1:fb4494783863 336 void Wifly::flush()
samux 1:fb4494783863 337 {
WiredHome 29:49876a8c445b 338 #ifdef DEBUG
WiredHome 29:49876a8c445b 339 char chatter[500];
WiredHome 29:49876a8c445b 340 int count = 0;
WiredHome 29:49876a8c445b 341 char c;
WiredHome 29:49876a8c445b 342
WiredHome 29:49876a8c445b 343 while (buf_wifly.available()) {
WiredHome 29:49876a8c445b 344 buf_wifly.dequeue(&c);
WiredHome 29:49876a8c445b 345 chatter[count++] = c;
WiredHome 29:49876a8c445b 346 }
WiredHome 29:49876a8c445b 347 chatter[count] = '\0';
WiredHome 29:49876a8c445b 348 if (count)
WiredHome 29:49876a8c445b 349 DBG("Wifly::flush {%s}", chatter);
WiredHome 29:49876a8c445b 350 #endif
samux 1:fb4494783863 351 buf_wifly.flush();
samux 1:fb4494783863 352 }
samux 1:fb4494783863 353
WiredHome 25:a740eb74a86a 354
samux 1:fb4494783863 355 bool Wifly::sendCommand(const char * cmd, const char * ack, char * res, int timeout)
samux 1:fb4494783863 356 {
WiredHome 20:906b0f951bc3 357 int tries = 1;
WiredHome 29:49876a8c445b 358
WiredHome 20:906b0f951bc3 359 while (tries <= 2) {
WiredHome 29:49876a8c445b 360 cmdMode(); // some influences to the wifi module sometimes kick it out
WiredHome 20:906b0f951bc3 361 if (send(cmd, strlen(cmd), ack, res, timeout) >= 0) {
WiredHome 20:906b0f951bc3 362 return true;
WiredHome 20:906b0f951bc3 363 }
WiredHome 29:49876a8c445b 364 state.cmd_mode = false; // must not really be in cmd mode
WiredHome 29:49876a8c445b 365 ERR("sendCommand: failure %d when sending: %s", tries, cmd);
WiredHome 20:906b0f951bc3 366 tries++;
samux 1:fb4494783863 367 }
WiredHome 17:213844a1864f 368 return false;
samux 1:fb4494783863 369 }
samux 1:fb4494783863 370
WiredHome 25:a740eb74a86a 371
samux 1:fb4494783863 372 bool Wifly::cmdMode()
samux 1:fb4494783863 373 {
samux 1:fb4494783863 374 // if already in cmd mode, return
WiredHome 29:49876a8c445b 375 if (state.cmd_mode) {
WiredHome 29:49876a8c445b 376 // Quick verify to ensure we really are in cmd mode
WiredHome 29:49876a8c445b 377 flushIn(0);
WiredHome 29:49876a8c445b 378 if (send("\r", 1, ">") == 1) {
WiredHome 29:49876a8c445b 379 INFO(" cmdMode = true\r\n");
WiredHome 29:49876a8c445b 380 return true;
WiredHome 29:49876a8c445b 381 } else
WiredHome 29:49876a8c445b 382 state.cmd_mode = false;
WiredHome 29:49876a8c445b 383 }
WiredHome 29:49876a8c445b 384 wait_ms(260); // manual 1.2.1 (250 msec before and after)
samux 1:fb4494783863 385 if (send("$$$", 3, "CMD") == -1) {
samux 1:fb4494783863 386 ERR("cannot enter in cmd mode\r\n");
samux 1:fb4494783863 387 return false;
samux 1:fb4494783863 388 }
samux 1:fb4494783863 389 state.cmd_mode = true;
WiredHome 29:49876a8c445b 390 INFO(" cmdMode set to true\r\n");
samux 1:fb4494783863 391 return true;
samux 1:fb4494783863 392 }
samux 1:fb4494783863 393
WiredHome 25:a740eb74a86a 394
samux 1:fb4494783863 395 bool Wifly::disconnect()
samux 1:fb4494783863 396 {
samux 1:fb4494783863 397 // if already disconnected, return
samux 1:fb4494783863 398 if (!state.associated)
samux 1:fb4494783863 399 return true;
samux 2:8e54830d0df7 400
samux 1:fb4494783863 401 if (!sendCommand("leave\r", "DeAuth"))
samux 1:fb4494783863 402 return false;
samux 1:fb4494783863 403 exit();
samux 2:8e54830d0df7 404
samux 1:fb4494783863 405 state.associated = false;
samux 1:fb4494783863 406 return true;
samux 1:fb4494783863 407 }
samux 1:fb4494783863 408
WiredHome 25:a740eb74a86a 409
samux 1:fb4494783863 410 bool Wifly::is_connected()
samux 1:fb4494783863 411 {
samux 1:fb4494783863 412 return (tcp_status.read() == 1) ? true : false;
samux 1:fb4494783863 413 }
samux 1:fb4494783863 414
samux 1:fb4494783863 415
samux 1:fb4494783863 416 void Wifly::reset()
samux 1:fb4494783863 417 {
samux 1:fb4494783863 418 reset_pin = 0;
WiredHome 25:a740eb74a86a 419 wifi.baud(9600);
WiredHome 25:a740eb74a86a 420 wait_ms(200);
samux 1:fb4494783863 421 reset_pin = 1;
WiredHome 25:a740eb74a86a 422 GatherLogonInfo();
samux 1:fb4494783863 423 }
samux 1:fb4494783863 424
WiredHome 25:a740eb74a86a 425
samux 3:9aa05e19c62e 426 bool Wifly::reboot()
samux 3:9aa05e19c62e 427 {
WiredHome 26:78a1a09afdc9 428 if (sendCommand("reboot\r", "Reboot")) {
WiredHome 26:78a1a09afdc9 429 state.cmd_mode = false;
WiredHome 26:78a1a09afdc9 430 wait_ms(500);
WiredHome 26:78a1a09afdc9 431 wifi.baud(9600);
WiredHome 26:78a1a09afdc9 432 baud(baudrate);
WiredHome 26:78a1a09afdc9 433 exit();
WiredHome 26:78a1a09afdc9 434 return true;
WiredHome 26:78a1a09afdc9 435 } else {
samux 3:9aa05e19c62e 436 return false;
WiredHome 26:78a1a09afdc9 437 }
samux 3:9aa05e19c62e 438 }
samux 3:9aa05e19c62e 439
WiredHome 25:a740eb74a86a 440
samux 1:fb4494783863 441 bool Wifly::close()
samux 1:fb4494783863 442 {
WiredHome 29:49876a8c445b 443 //wait_ms(100); // we don't know how long to wait, but not waiting long enough truncates outbound data
samux 1:fb4494783863 444 if (!state.tcp)
samux 1:fb4494783863 445 return true;
WiredHome 29:49876a8c445b 446 if (!sendCommand("close\r", "*CLOS*", NULL, 1000))
samux 1:fb4494783863 447 return false;
WiredHome 29:49876a8c445b 448 //exit();
samux 1:fb4494783863 449 state.tcp = false;
samux 1:fb4494783863 450 return true;
samux 1:fb4494783863 451 }
samux 1:fb4494783863 452
samux 1:fb4494783863 453
samux 1:fb4494783863 454 int Wifly::putc(char c)
samux 1:fb4494783863 455 {
WiredHome 25:a740eb74a86a 456 while (!wifi.writeable())
WiredHome 25:a740eb74a86a 457 ;
samux 1:fb4494783863 458 return wifi.putc(c);
samux 1:fb4494783863 459 }
samux 1:fb4494783863 460
samux 1:fb4494783863 461
samux 1:fb4494783863 462 bool Wifly::exit()
samux 1:fb4494783863 463 {
samux 1:fb4494783863 464 if (!sendCommand("exit\r", "EXIT"))
samux 1:fb4494783863 465 return false;
samux 1:fb4494783863 466 state.cmd_mode = false;
WiredHome 29:49876a8c445b 467 DBG("exit()\r\n");
samux 1:fb4494783863 468 return true;
samux 1:fb4494783863 469 }
samux 1:fb4494783863 470
samux 1:fb4494783863 471
samux 1:fb4494783863 472 int Wifly::readable()
samux 1:fb4494783863 473 {
samux 1:fb4494783863 474 return buf_wifly.available();
samux 1:fb4494783863 475 }
samux 1:fb4494783863 476
WiredHome 25:a740eb74a86a 477
samux 1:fb4494783863 478 int Wifly::writeable()
samux 1:fb4494783863 479 {
samux 1:fb4494783863 480 return wifi.writeable();
samux 1:fb4494783863 481 }
samux 1:fb4494783863 482
WiredHome 25:a740eb74a86a 483
samux 1:fb4494783863 484 char Wifly::getc()
samux 1:fb4494783863 485 {
samux 1:fb4494783863 486 char c;
WiredHome 25:a740eb74a86a 487 while (!buf_wifly.available())
WiredHome 25:a740eb74a86a 488 ;
samux 1:fb4494783863 489 buf_wifly.dequeue(&c);
samux 1:fb4494783863 490 return c;
samux 1:fb4494783863 491 }
samux 1:fb4494783863 492
WiredHome 25:a740eb74a86a 493
samux 1:fb4494783863 494 void Wifly::handler_rx(void)
samux 1:fb4494783863 495 {
samux 1:fb4494783863 496 //read characters
samux 1:fb4494783863 497 while (wifi.readable())
samux 1:fb4494783863 498 buf_wifly.queue(wifi.getc());
samux 1:fb4494783863 499 }
samux 1:fb4494783863 500
WiredHome 25:a740eb74a86a 501
samux 1:fb4494783863 502 void Wifly::attach_rx(bool callback)
samux 1:fb4494783863 503 {
samux 1:fb4494783863 504 if (!callback)
samux 1:fb4494783863 505 wifi.attach(NULL);
samux 1:fb4494783863 506 else
samux 1:fb4494783863 507 wifi.attach(this, &Wifly::handler_rx);
samux 1:fb4494783863 508 }
samux 1:fb4494783863 509
samux 1:fb4494783863 510
samux 1:fb4494783863 511 int Wifly::send(const char * str, int len, const char * ACK, char * res, int timeout)
samux 1:fb4494783863 512 {
samux 1:fb4494783863 513 char read;
samux 1:fb4494783863 514 size_t found = string::npos;
samux 1:fb4494783863 515 string checking;
samux 1:fb4494783863 516 Timer tmr;
samux 1:fb4494783863 517 int result = 0;
samux 1:fb4494783863 518
WiredHome 29:49876a8c445b 519 //DBG("send w/timeout %d ms this: %s", timeout, str);
samux 1:fb4494783863 520 attach_rx(false);
WiredHome 29:49876a8c445b 521 flushIn(0);
WiredHome 20:906b0f951bc3 522 tmr.start();
samux 1:fb4494783863 523 if (!ACK || !strcmp(ACK, "NO")) {
samux 1:fb4494783863 524 for (int i = 0; i < len; i++)
samux 1:fb4494783863 525 result = (putc(str[i]) == str[i]) ? result + 1 : result;
samux 1:fb4494783863 526 } else {
samux 1:fb4494783863 527 for (int i = 0; i < len; i++)
samux 1:fb4494783863 528 result = (putc(str[i]) == str[i]) ? result + 1 : result;
samux 1:fb4494783863 529
samux 1:fb4494783863 530 while (1) {
samux 1:fb4494783863 531 if (tmr.read_ms() > timeout) {
WiredHome 18:18ab3993d00d 532 flushIn();
WiredHome 29:49876a8c445b 533 WARN("Can't find [%s] in [%s]", ACK, checking.c_str());
samux 1:fb4494783863 534 attach_rx(true);
samux 1:fb4494783863 535 return -1;
samux 1:fb4494783863 536 } else if (wifi.readable()) {
samux 1:fb4494783863 537 read = wifi.getc();
samux 1:fb4494783863 538 if ( read != '\r' && read != '\n') {
samux 1:fb4494783863 539 checking += read;
samux 1:fb4494783863 540 found = checking.find(ACK);
samux 1:fb4494783863 541 if (found != string::npos) {
WiredHome 29:49876a8c445b 542 flushIn(5);
samux 1:fb4494783863 543 break;
samux 1:fb4494783863 544 }
samux 1:fb4494783863 545 }
samux 1:fb4494783863 546 }
samux 1:fb4494783863 547 }
WiredHome 29:49876a8c445b 548 DBG(" found: {%s}", checking.c_str());
samux 1:fb4494783863 549 attach_rx(true);
samux 1:fb4494783863 550 return result;
samux 1:fb4494783863 551 }
samux 1:fb4494783863 552
samux 1:fb4494783863 553 //the user wants the result from the command (ACK == NULL, res != NULL)
samux 1:fb4494783863 554 if ( res != NULL) {
samux 1:fb4494783863 555 int i = 0;
samux 1:fb4494783863 556 while (1) {
WiredHome 19:b0c2488222a3 557 if (tmr.read_ms() > timeout) {
WiredHome 19:b0c2488222a3 558 res[i] = '\0';
samux 1:fb4494783863 559 if (i == 0) {
samux 1:fb4494783863 560 res = NULL;
samux 1:fb4494783863 561 }
WiredHome 29:49876a8c445b 562 ERR("timeout w/o response to %s", str);
samux 1:fb4494783863 563 break;
samux 1:fb4494783863 564 } else {
samux 1:fb4494783863 565 if (wifi.readable()) {
samux 1:fb4494783863 566 read = wifi.getc();
WiredHome 25:a740eb74a86a 567 // we drop \r and \n, but should we since it is for user code...
samux 1:fb4494783863 568 if ( read != '\r' && read != '\n') {
samux 1:fb4494783863 569 res[i++] = read;
samux 1:fb4494783863 570 }
samux 1:fb4494783863 571 }
samux 1:fb4494783863 572 }
samux 1:fb4494783863 573 }
WiredHome 26:78a1a09afdc9 574 DBG("user str: {%s}", res);
samux 1:fb4494783863 575 }
samux 1:fb4494783863 576
WiredHome 18:18ab3993d00d 577 flushIn();
samux 1:fb4494783863 578 attach_rx(true);
samux 1:fb4494783863 579 return result;
WiredHome 18:18ab3993d00d 580 }
WiredHome 18:18ab3993d00d 581
WiredHome 19:b0c2488222a3 582
WiredHome 18:18ab3993d00d 583 void Wifly::flushIn(int timeout_ms)
WiredHome 18:18ab3993d00d 584 {
WiredHome 18:18ab3993d00d 585 Timer tmr;
WiredHome 18:18ab3993d00d 586 #ifdef DEBUG
WiredHome 18:18ab3993d00d 587 char chatter[500];
WiredHome 18:18ab3993d00d 588 int count = 0;
WiredHome 18:18ab3993d00d 589 int c;
WiredHome 18:18ab3993d00d 590 #endif
WiredHome 18:18ab3993d00d 591
WiredHome 29:49876a8c445b 592 if (timeout_ms < 0) {
WiredHome 25:a740eb74a86a 593 timeout_ms = 2 * 10000 / baudrate; // compute minimal timeout
WiredHome 29:49876a8c445b 594 if (timeout_ms < 5)
WiredHome 29:49876a8c445b 595 timeout_ms = 5;
WiredHome 18:18ab3993d00d 596 }
WiredHome 18:18ab3993d00d 597 tmr.start();
WiredHome 18:18ab3993d00d 598 while (wifi.readable() || (tmr.read_ms() < timeout_ms)) {
WiredHome 18:18ab3993d00d 599 if (wifi.readable()) {
WiredHome 29:49876a8c445b 600 #ifdef DEBUG
WiredHome 29:49876a8c445b 601 c = wifi.getc();
WiredHome 29:49876a8c445b 602 chatter[count++] = c;
WiredHome 18:18ab3993d00d 603 #else
WiredHome 29:49876a8c445b 604 wifi.getc();
WiredHome 18:18ab3993d00d 605 #endif
WiredHome 18:18ab3993d00d 606 tmr.reset();
WiredHome 18:18ab3993d00d 607 tmr.start(); // start should not be necessary
WiredHome 18:18ab3993d00d 608 }
WiredHome 18:18ab3993d00d 609 }
WiredHome 18:18ab3993d00d 610 #ifdef DEBUG
WiredHome 18:18ab3993d00d 611 chatter[count] = '\0';
WiredHome 29:49876a8c445b 612 if (count)
WiredHome 29:49876a8c445b 613 DBG("Wifly::flushIn(%d) {%s}", timeout_ms, chatter);
WiredHome 18:18ab3993d00d 614 #endif
WiredHome 18:18ab3993d00d 615 }
WiredHome 20:906b0f951bc3 616
WiredHome 20:906b0f951bc3 617
WiredHome 20:906b0f951bc3 618 // The ARM uart and the Wifly uart have to be in sync or we get
WiredHome 20:906b0f951bc3 619 // no meaningful response, so then have to try the possibilities.
WiredHome 20:906b0f951bc3 620 //
WiredHome 20:906b0f951bc3 621 // First try is at the currently configured ARM uart baud, if
WiredHome 20:906b0f951bc3 622 // that fails then it shifts the ARM uart baud through the probable
WiredHome 20:906b0f951bc3 623 // speeds, trying to establish contact with the Wifly module.
WiredHome 20:906b0f951bc3 624 // Once contact is demonstrated (response to the 'ver' command),
WiredHome 20:906b0f951bc3 625 // then it sets the Wifly module and then the ARM uart.
WiredHome 20:906b0f951bc3 626 bool Wifly::baud(int _targetBaud)
WiredHome 20:906b0f951bc3 627 {
WiredHome 20:906b0f951bc3 628 // in testing, 460800 and 921600 may change the Wifly module where you can't
WiredHome 20:906b0f951bc3 629 // change it back w/o a reset. So, we won't even permit those speeds.
WiredHome 20:906b0f951bc3 630 const int baudrates[] = {2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}; //, 460800, 921600};
WiredHome 20:906b0f951bc3 631 #define BRCOUNT (sizeof(baudrates)/sizeof(baudrates[0]))
WiredHome 20:906b0f951bc3 632 char cmd[20]; // sized for "set u i 460800\r" [15+1], plus margin [4]
WiredHome 20:906b0f951bc3 633 int tryIndex = 0;
WiredHome 20:906b0f951bc3 634 bool res = false;
WiredHome 20:906b0f951bc3 635 int userIndex;
WiredHome 20:906b0f951bc3 636
WiredHome 20:906b0f951bc3 637 sprintf(cmd, "set u i %d\r", _targetBaud);
WiredHome 20:906b0f951bc3 638 // set u i # should cause it to exit command mode (manual 2.3.64),
WiredHome 20:906b0f951bc3 639 // but testing indicates that it does not.
WiredHome 20:906b0f951bc3 640 for (userIndex=0; userIndex < BRCOUNT; userIndex++) {
WiredHome 20:906b0f951bc3 641 if (_targetBaud == baudrates[userIndex]) {
WiredHome 20:906b0f951bc3 642 while (tryIndex <= BRCOUNT) {
WiredHome 26:78a1a09afdc9 643 DBG("baud() try: %d", tryIndex);
WiredHome 20:906b0f951bc3 644 sendCommand(cmd); // shift Wifly to desired speed [it may not respond (see 2.3.64)]
WiredHome 20:906b0f951bc3 645 // state.cmd_mode = false; // see note above why this is disabled
WiredHome 20:906b0f951bc3 646 wifi.baud(_targetBaud); // shift the ARM uart to match
WiredHome 20:906b0f951bc3 647 if (sendCommand("ver\r", "wifly", NULL, timeToRespond(4))) { // use this to verify communications
WiredHome 20:906b0f951bc3 648 baudrate = _targetBaud;
WiredHome 20:906b0f951bc3 649 res = true;
WiredHome 20:906b0f951bc3 650 break; // success
WiredHome 20:906b0f951bc3 651 }
WiredHome 20:906b0f951bc3 652 // keep trying baudrates between ARM and WiFly
WiredHome 20:906b0f951bc3 653 if (tryIndex < BRCOUNT) {
WiredHome 29:49876a8c445b 654 WARN(" baud() set to %d", baudrates[tryIndex]);
WiredHome 20:906b0f951bc3 655 wifi.baud(baudrates[tryIndex]);
WiredHome 20:906b0f951bc3 656 }
WiredHome 20:906b0f951bc3 657 tryIndex++;
WiredHome 20:906b0f951bc3 658 }
WiredHome 20:906b0f951bc3 659 break; // if they selected a legitimate baud, try no others
WiredHome 20:906b0f951bc3 660 }
WiredHome 20:906b0f951bc3 661 }
WiredHome 26:78a1a09afdc9 662 DBG(" baud() result: %d", res);
WiredHome 20:906b0f951bc3 663 return res;
WiredHome 20:906b0f951bc3 664 }
WiredHome 20:906b0f951bc3 665
WiredHome 25:a740eb74a86a 666
WiredHome 29:49876a8c445b 667 int Wifly::timeToRespond(int stringLen)
WiredHome 20:906b0f951bc3 668 {
WiredHome 20:906b0f951bc3 669 return 150 + (1 | 10000/baudrate) * stringLen;
WiredHome 21:97294686b4a1 670 }
WiredHome 23:6e77c65ced00 671
WiredHome 24:5012a535b1d5 672
WiredHome 24:5012a535b1d5 673 void Wifly::FixPhrase(char ** dst, const char * src)
WiredHome 24:5012a535b1d5 674 {
WiredHome 24:5012a535b1d5 675 // change all ' ' in '$' in the ssid and the passphrase
WiredHome 24:5012a535b1d5 676 *dst = (char *)malloc(strlen(src)+1);
WiredHome 24:5012a535b1d5 677 if (*dst) {
WiredHome 24:5012a535b1d5 678 strcpy(*dst, src);
WiredHome 24:5012a535b1d5 679 for (int i = 0; i < strlen(*dst); i++) {
WiredHome 24:5012a535b1d5 680 if ((*dst)[i] == ' ')
WiredHome 24:5012a535b1d5 681 (*dst)[i] = '$';
WiredHome 24:5012a535b1d5 682 }
WiredHome 24:5012a535b1d5 683 } else {
WiredHome 24:5012a535b1d5 684 *dst = NULL;
WiredHome 24:5012a535b1d5 685 }
WiredHome 24:5012a535b1d5 686 }
WiredHome 25:a740eb74a86a 687
WiredHome 25:a740eb74a86a 688
WiredHome 25:a740eb74a86a 689 void Wifly::GatherLogonInfo()
WiredHome 25:a740eb74a86a 690 {
WiredHome 25:a740eb74a86a 691 Timer timer;
WiredHome 25:a740eb74a86a 692 char logonText[200];
WiredHome 25:a740eb74a86a 693 int i = 0;
WiredHome 25:a740eb74a86a 694 char *p;
WiredHome 25:a740eb74a86a 695
WiredHome 25:a740eb74a86a 696 timer.start();
WiredHome 25:a740eb74a86a 697 if (wiflyVersionString) {
WiredHome 25:a740eb74a86a 698 free(wiflyVersionString);
WiredHome 25:a740eb74a86a 699 wiflyVersionString = NULL;
WiredHome 25:a740eb74a86a 700 }
WiredHome 25:a740eb74a86a 701 logonText[i] = '\0';
WiredHome 25:a740eb74a86a 702 while (timer.read_ms() < 500) {
WiredHome 25:a740eb74a86a 703 while (wifi.readable()) {
WiredHome 25:a740eb74a86a 704 logonText[i++] = wifi.getc();
WiredHome 25:a740eb74a86a 705 }
WiredHome 25:a740eb74a86a 706 }
WiredHome 25:a740eb74a86a 707 logonText[i] = '\0';
WiredHome 25:a740eb74a86a 708 p = strchr(logonText, '\r');
WiredHome 25:a740eb74a86a 709 if (p)
WiredHome 25:a740eb74a86a 710 *p = '\0';
WiredHome 25:a740eb74a86a 711 wiflyVersionString = (char *)malloc(strlen(logonText)+1);
WiredHome 25:a740eb74a86a 712 if (wiflyVersionString)
WiredHome 25:a740eb74a86a 713 strcpy(wiflyVersionString, logonText);
WiredHome 25:a740eb74a86a 714 p = strstr(logonText, "Ver ");
WiredHome 25:a740eb74a86a 715 if (p) {
WiredHome 25:a740eb74a86a 716 p += 4;
WiredHome 25:a740eb74a86a 717 swVersion = atof(p);
WiredHome 25:a740eb74a86a 718 }
WiredHome 29:49876a8c445b 719 INFO("swVersion: %3.2f, versionString: {%s}", swVersion, wiflyVersionString);
WiredHome 25:a740eb74a86a 720 }
WiredHome 25:a740eb74a86a 721
WiredHome 25:a740eb74a86a 722
WiredHome 25:a740eb74a86a 723 float Wifly::getWiflyVersion()
WiredHome 25:a740eb74a86a 724 {
WiredHome 25:a740eb74a86a 725 return swVersion;
WiredHome 25:a740eb74a86a 726 }
WiredHome 25:a740eb74a86a 727
WiredHome 25:a740eb74a86a 728
WiredHome 25:a740eb74a86a 729 char * Wifly::getWiflyVersionString()
WiredHome 25:a740eb74a86a 730 {
WiredHome 25:a740eb74a86a 731 return wiflyVersionString;
WiredHome 25:a740eb74a86a 732 }
WiredHome 25:a740eb74a86a 733
WiredHome 26:78a1a09afdc9 734
WiredHome 26:78a1a09afdc9 735 void Wifly::setConnectionState(bool value)
WiredHome 26:78a1a09afdc9 736 {
WiredHome 26:78a1a09afdc9 737 state.tcp = value;
WiredHome 26:78a1a09afdc9 738 }
WiredHome 26:78a1a09afdc9 739