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:
Thu Oct 10 20:47:49 2013 +0000
Revision:
46:4722f7d72aab
Parent:
45:21b7bbaad62b
Child:
47:97303e1970c1
Security enhancements

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