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:
Fri Jan 03 21:06:46 2014 +0000
Revision:
56:eba4aabaad3e
Parent:
55:0729959263b7
Child:
58:f49aab8072ec
Minor comment change related to INCREASE_SECURITY SW version required.; Added a small guard on the Wifly module logonText extraction - have not seen a need for this however it is good safeguarding.

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